Skip to contentSkip to conversation

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

PATCH New Daniel Mack 3 participants 4 messages Oct 21, 2009 – Oct 22, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

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

---
 arch/arm/mach-mx3/mm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/mach-mx3/mm.c +7 -5
index ad5a112..c8acd60 100644
@@ -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)
Signature · 1 line
1.6.5
#1 lore raw

PATCH 1/1 ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

Quoted 2 lines · Daniel Mack

From: Daniel Mack <[email protected]>
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

#2 lore raw

PATCH 1/1 ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

Quoted 4 lines · Fabio Estevam
Quoted 2 lines

From: Daniel Mack <[email protected]>
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

#3 lore raw

PATCH 1/1 ARM: NX3: do not reference mxc_iomux_v3_init() for !CONFIG_ARCH_MX35

In reply to Daniel Mack
Quoted 2 lines · Daniel Mack

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

Quoted 45 lines
---
 arch/arm/mach-mx3/mm.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/mach-mx3/mm.c +7 -5
index ad5a112..c8acd60 100644
@@ -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)
Signature · 1 line
1.6.5
Signature · 4 lines
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 |