Skip to contentSkip to conversation

ARM: imx: remove imx_scu_standby_enable()

PATCH New Shawn Guo 1 participant 2 messages Sep 1, 2014

Subsystems (3)
lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

PATCH 1/1 ARM: imx: remove imx_scu_standby_enable()

With commit c716483c3db1 ("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.

---
 arch/arm/mach-imx/common.h        | 2 --
 arch/arm/mach-imx/cpuidle-imx6q.c | 4 ----
 arch/arm/mach-imx/platsmp.c       | 8 --------
 3 files changed, 14 deletions(-)
arch/arm/mach-imx/common.h +0 -2
index 22ba8973bcb9..1dabf435c592 100644
@@ -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);
arch/arm/mach-imx/cpuidle-imx6q.c +0 -4
index 10844d3bb926..aa935787b743 100644
@@ -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);
 
arch/arm/mach-imx/platsmp.c +0 -8
index 5b57c17c06bd..31edbcd70c27 100644
@@ -45,14 +45,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);
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 ARM: imx: remove imx_scu_standby_enable()

Quoted 47 lines · Shawn Guo

With commit c716483c3db1 ("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.

---
 arch/arm/mach-imx/common.h        | 2 --
 arch/arm/mach-imx/cpuidle-imx6q.c | 4 ----
 arch/arm/mach-imx/platsmp.c       | 8 --------
 3 files changed, 14 deletions(-)
arch/arm/mach-imx/common.h +0 -2
index 22ba8973bcb9..1dabf435c592 100644
@@ -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);
arch/arm/mach-imx/cpuidle-imx6q.c +0 -4
index 10844d3bb926..aa935787b743 100644
@@ -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);
 
arch/arm/mach-imx/platsmp.c +0 -0
index 5b57c17c06bd..31edbcd70c27 100644

arch/arm/mach-imx/platsmp.c void __init imx_scu_map_io(void) · line 52

Quoted 8 lines
arch/arm/mach-imx/platsmp.c +0 -5
@@ -45,14 +45,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;

The following trunk is missed, since SCU_STANDBY_ENABLE is unused after the change.

Shawn

arch/arm/mach-imx/platsmp.c +0 -2
index 5b57c17c06bd..771bd25c1025 100644
@@ -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;