[PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

[PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

[Daniel Mack]

Recent kernels for mx31 fail to link due to an undefined reference to
mxc_iomux_v3_init().

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-mx3/mm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
index ad5a112..c8acd60 100644
--- a/arch/arm/mach-mx3/mm.c
+++ b/arch/arm/mach-mx3/mm.c
@@ -81,6 +81,12 @@ void __init mx31_map_io(void)
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
 
+void __init mx31_init_irq(void)
+{
+	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
+}
+
+#ifdef CONFIG_ARCH_MX35
 void __init mx35_map_io(void)
 {
 	mxc_set_cpu_type(MXC_CPU_MX35);
@@ -90,15 +96,11 @@ void __init mx35_map_io(void)
 	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
 }
 
-void __init mx31_init_irq(void)
-{
-	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
-}
-
 void __init mx35_init_irq(void)
 {
 	mx31_init_irq();
 }
+#endif
 
 #ifdef CONFIG_CACHE_L2X0
 static int mxc_init_l2x0(void)
-- 
1.6.5

[PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

[Fabio Estevam]

--- On Wed, 10/21/09, Daniel Mack <daniel@caiaq.de> wrote:

> From: Daniel Mack <daniel@caiaq.de>
> Subject: [PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !\

There is a typo on the Subject: NX3 should be MX3.

Regards,

Fabio Estevam


      

[PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

[Daniel Mack]

On Wed, Oct 21, 2009 at 03:40:15PM -0700, Fabio Estevam wrote:
> > From: Daniel Mack <daniel@caiaq.de>
> > Subject: [PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !\
> 
> There is a typo on the Subject: NX3 should be MX3.

Indeed. Thanks!

Daniel

[PATCH] ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

[Sascha Hauer]

On Wed, Oct 21, 2009 at 08:29:43PM +0200, Daniel Mack wrote:
> Recent kernels for mx31 fail to link due to an undefined reference to
> mxc_iomux_v3_init().

There is already a fix for this from Guennadi included in my last pull
Request. I find this in rmks master branch, so I suspect Linus hasn't
pulled from him yet.

Sascha

> 
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/mach-mx3/mm.c |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
> index ad5a112..c8acd60 100644
> --- a/arch/arm/mach-mx3/mm.c
> +++ b/arch/arm/mach-mx3/mm.c
> @@ -81,6 +81,12 @@ void __init mx31_map_io(void)
>  	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
>  }
>  
> +void __init mx31_init_irq(void)
> +{
> +	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
> +}
> +
> +#ifdef CONFIG_ARCH_MX35
>  void __init mx35_map_io(void)
>  {
>  	mxc_set_cpu_type(MXC_CPU_MX35);
> @@ -90,15 +96,11 @@ void __init mx35_map_io(void)
>  	iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc));
>  }
>  
> -void __init mx31_init_irq(void)
> -{
> -	mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR));
> -}
> -
>  void __init mx35_init_irq(void)
>  {
>  	mx31_init_irq();
>  }
> +#endif
>  
>  #ifdef CONFIG_CACHE_L2X0
>  static int mxc_init_l2x0(void)
> -- 
> 1.6.5
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |