[PATCH v2 1/2] ARM: imx: system: Do not declare imx_init_l2cache() as static

[PATCH v2 1/2] ARM: imx: system: Do not declare imx_init_l2cache() as static

[Fabio Estevam]

commit 879ec1cee (ARM: imx: let L2 initialization be a common function) breaks 
the build when CONFIG_CACHE_L2X0=y:

arch/arm/mach-imx/system.c:101:20: error: static declaration of 'imx_init_l2cache' follows non-static declaration
In file included from arch/arm/mach-imx/system.c:32:0:
arch/arm/mach-imx/common.h:165:13: note: previous declaration of 'imx_init_l2cache' was here
arch/arm/mach-imx/system.c:101:20: warning: 'imx_init_l2cache' defined but not used [-Wunused-function]

imx_init_l2cache() is a common function now, so it cannot be declared as static 
anymore.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Newly introduced in this series

 arch/arm/mach-imx/system.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index e5592ca..64ff37e 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -98,7 +98,7 @@ void __init mxc_arch_reset_init_dt(void)
 }
 
 #ifdef CONFIG_CACHE_L2X0
-static void __init imx_init_l2cache(void)
+void __init imx_init_l2cache(void)
 {
 	void __iomem *l2x0_base;
 	struct device_node *np;
-- 
1.8.1.2

[PATCH v2 2/2] ARM: imx: Select MIGHT_HAVE_CACHE_L2X0

[Fabio Estevam]

Select MIGHT_HAVE_CACHE_L2X0 for mx31/35/51/53/6q/6sl/vf610

By selecting MIGHT_HAVE_CACHE_L2X0, the user still has the possibility to 
disable CACHE_L2X0 selection via menuconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Use MIGHT_HAVE_CACHE_L2X0 instead of CACHE_L2X0, to allow users to still
disable L2 cache via menuconfig if they want to
- Also select L2 cache for vf610

 arch/arm/mach-imx/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index f546560..cc6961d 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -125,6 +125,7 @@ config SOC_IMX31
 	select COMMON_CLK
 	select CPU_V6
 	select IMX_HAVE_PLATFORM_MXC_RNGA
+	select MIGHT_HAVE_CACHE_L2X0
 	select MXC_AVIC
 	select SMP_ON_UP if SMP
 
@@ -134,6 +135,7 @@ config SOC_IMX35
 	select COMMON_CLK
 	select CPU_V6K
 	select HAVE_EPIT
+	select MIGHT_HAVE_CACHE_L2X0
 	select MXC_AVIC
 	select SMP_ON_UP if SMP
 
@@ -144,6 +146,7 @@ config SOC_IMX5
 	select ARCH_MXC_IOMUX_V3
 	select COMMON_CLK
 	select CPU_V7
+	select MIGHT_HAVE_CACHE_L2X0
 	select MXC_TZIC
 
 config	SOC_IMX51
@@ -799,6 +802,7 @@ config SOC_IMX6Q
 	select HAVE_IMX_MMDC
 	select HAVE_IMX_SRC
 	select HAVE_SMP
+	select MIGHT_HAVE_CACHE_L2X0
 	select MFD_SYSCON
 	select PINCTRL
 	select PINCTRL_IMX6Q
@@ -820,6 +824,7 @@ config SOC_IMX6SL
 	select HAVE_IMX_GPC
 	select HAVE_IMX_MMDC
 	select HAVE_IMX_SRC
+	select MIGHT_HAVE_CACHE_L2X0
 	select MFD_SYSCON
 	select PINCTRL
 	select PINCTRL_IMX6SL
@@ -835,6 +840,7 @@ config SOC_VF610
 	select CPU_V7
 	select ARM_GIC
 	select CLKSRC_OF
+	select MIGHT_HAVE_CACHE_L2X0
 	select PINCTRL
 	select PINCTRL_VF610
 	select VF_PIT_TIMER
-- 
1.8.1.2

[PATCH v2 1/2] ARM: imx: system: Do not declare imx_init_l2cache() as static

[Shawn Guo]

On Wed, Jul 10, 2013 at 10:10:13AM -0300, Fabio Estevam wrote:
> commit 879ec1cee (ARM: imx: let L2 initialization be a common function) breaks 
> the build when CONFIG_CACHE_L2X0=y:
> 
> arch/arm/mach-imx/system.c:101:20: error: static declaration of 'imx_init_l2cache' follows non-static declaration
> In file included from arch/arm/mach-imx/system.c:32:0:
> arch/arm/mach-imx/common.h:165:13: note: previous declaration of 'imx_init_l2cache' was here
> arch/arm/mach-imx/system.c:101:20: warning: 'imx_init_l2cache' defined but not used [-Wunused-function]
> 
> imx_init_l2cache() is a common function now, so it cannot be declared as static 
> anymore.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Thanks for the fixing.  I just applied a fix [1] from Vincent.

Shawn

[1]
http://www.mail-archive.com/linux-kernel at vger.kernel.org/msg465491.html

> ---
> Changes since v1:
> - Newly introduced in this series
> 
>  arch/arm/mach-imx/system.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
> index e5592ca..64ff37e 100644
> --- a/arch/arm/mach-imx/system.c
> +++ b/arch/arm/mach-imx/system.c
> @@ -98,7 +98,7 @@ void __init mxc_arch_reset_init_dt(void)
>  }
>  
>  #ifdef CONFIG_CACHE_L2X0
> -static void __init imx_init_l2cache(void)
> +void __init imx_init_l2cache(void)
>  {
>  	void __iomem *l2x0_base;
>  	struct device_node *np;
> -- 
> 1.8.1.2
> 
> 

[PATCH v2 2/2] ARM: imx: Select MIGHT_HAVE_CACHE_L2X0

[Shawn Guo]

On Wed, Jul 10, 2013 at 10:10:14AM -0300, Fabio Estevam wrote:
> Select MIGHT_HAVE_CACHE_L2X0 for mx31/35/51/53/6q/6sl/vf610
> 
So maybe we can just do the following for config ARCH_MXC?

	select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7

Shawn

> By selecting MIGHT_HAVE_CACHE_L2X0, the user still has the possibility to 
> disable CACHE_L2X0 selection via menuconfig.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Use MIGHT_HAVE_CACHE_L2X0 instead of CACHE_L2X0, to allow users to still
> disable L2 cache via menuconfig if they want to
> - Also select L2 cache for vf610
> 
>  arch/arm/mach-imx/Kconfig | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index f546560..cc6961d 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -125,6 +125,7 @@ config SOC_IMX31
>  	select COMMON_CLK
>  	select CPU_V6
>  	select IMX_HAVE_PLATFORM_MXC_RNGA
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select MXC_AVIC
>  	select SMP_ON_UP if SMP
>  
> @@ -134,6 +135,7 @@ config SOC_IMX35
>  	select COMMON_CLK
>  	select CPU_V6K
>  	select HAVE_EPIT
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select MXC_AVIC
>  	select SMP_ON_UP if SMP
>  
> @@ -144,6 +146,7 @@ config SOC_IMX5
>  	select ARCH_MXC_IOMUX_V3
>  	select COMMON_CLK
>  	select CPU_V7
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select MXC_TZIC
>  
>  config	SOC_IMX51
> @@ -799,6 +802,7 @@ config SOC_IMX6Q
>  	select HAVE_IMX_MMDC
>  	select HAVE_IMX_SRC
>  	select HAVE_SMP
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select MFD_SYSCON
>  	select PINCTRL
>  	select PINCTRL_IMX6Q
> @@ -820,6 +824,7 @@ config SOC_IMX6SL
>  	select HAVE_IMX_GPC
>  	select HAVE_IMX_MMDC
>  	select HAVE_IMX_SRC
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select MFD_SYSCON
>  	select PINCTRL
>  	select PINCTRL_IMX6SL
> @@ -835,6 +840,7 @@ config SOC_VF610
>  	select CPU_V7
>  	select ARM_GIC
>  	select CLKSRC_OF
> +	select MIGHT_HAVE_CACHE_L2X0
>  	select PINCTRL
>  	select PINCTRL_VF610
>  	select VF_PIT_TIMER
> -- 
> 1.8.1.2
> 
>