Skip to content

Commit

Permalink
ARM: imx: remove imx_scu_standby_enable()
Browse files Browse the repository at this point in the history
With commit c716483 ("ARM: 8122/1: smp_scu: enable SCU standby
support"), the STANDBY bit of SCU is handled by core function
scu_enable().  So imx_scu_standby_enable() can be removed now.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
  • Loading branch information
Shawn Guo committed Sep 1, 2014
1 parent 1ca7070 commit ee295d7
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 16 deletions.
2 changes: 0 additions & 2 deletions arch/arm/mach-imx/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,9 @@ void imx_set_cpu_arg(int cpu, u32 arg);
void v7_secondary_startup(void);
void imx_scu_map_io(void);
void imx_smp_prepare(void);
void imx_scu_standby_enable(void);
#else
static inline void imx_scu_map_io(void) {}
static inline void imx_smp_prepare(void) {}
static inline void imx_scu_standby_enable(void) {}
#endif
void imx_src_init(void);
void imx_gpc_init(void);
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/mach-imx/cpuidle-imx6q.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {

int __init imx6q_cpuidle_init(void)
{
/* Need to enable SCU standby for entering WAIT modes */
if (!cpu_is_imx6sx())
imx_scu_standby_enable();

/* Set INT_MEM_CLK_LPM bit to get a reliable WAIT mode support */
imx6q_set_int_mem_clk_lpm(true);

Expand Down
10 changes: 0 additions & 10 deletions arch/arm/mach-imx/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#include "common.h"
#include "hardware.h"

#define SCU_STANDBY_ENABLE (1 << 5)

u32 g_diag_reg;
static void __iomem *scu_base;

Expand All @@ -45,14 +43,6 @@ void __init imx_scu_map_io(void)
scu_base = IMX_IO_ADDRESS(base);
}

void imx_scu_standby_enable(void)
{
u32 val = readl_relaxed(scu_base);

val |= SCU_STANDBY_ENABLE;
writel_relaxed(val, scu_base);
}

static int imx_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
imx_set_cpu_jump(cpu, v7_secondary_startup);
Expand Down

0 comments on commit ee295d7

Please sign in to comment.