Skip to contentSkip to conversation

mx5: rename mx51_map_io to mx5_map_io

RFC PATCH New Rob Herring 2 participants 2 messages Apr 16, 2010 – Apr 18, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

RFC PATCH 6/10 mx5: rename mx51_map_io to mx5_map_io

Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/mach-mx5/board-mx51_babbage.c  |    2 +-
 arch/arm/mach-mx5/mm.c                  |    2 +-
 arch/arm/plat-mxc/include/mach/common.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx5/board-mx51_babbage.c +1 -1
index ee67a71..5c15d6e 100644
@@ -91,7 +91,7 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
 	.phys_io = MX51_AIPS1_BASE_ADDR,
 	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params = PHYS_OFFSET + 0x100,
-	.map_io = mx51_map_io,
+	.map_io = mx5_map_io,
 	.init_irq = mx51_init_irq,
 	.init_machine = mxc_board_init,
 	.timer = &mxc_timer,
arch/arm/mach-mx5/mm.c +1 -1
index fedacac..8ad1d0c 100644
@@ -38,7 +38,7 @@ static struct map_desc mxc_io_desc[] __initdata = {
  * system startup to create static physical to virtual memory mappings
  * for the IO modules.
  */
-void __init mx51_map_io(void)
+void __init mx5_map_io(void)
 {
 	void __iomem *base;
arch/arm/plat-mxc/include/mach/common.h +1 -1
index 2941472..0766746 100644
@@ -20,7 +20,7 @@ extern void mx25_map_io(void);
 extern void mx27_map_io(void);
 extern void mx31_map_io(void);
 extern void mx35_map_io(void);
-extern void mx51_map_io(void);
+extern void mx5_map_io(void);
 extern void mxc91231_map_io(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
Signature · 1 line
1.6.0.4
maintainer
#1 lore raw

RFC PATCH 6/10 mx5: rename mx51_map_io to mx5_map_io

Quoted 12 lines · Rob Herring
Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/mach-mx5/board-mx51_babbage.c  |    2 +-
 arch/arm/mach-mx5/mm.c                  |    2 +-
 arch/arm/plat-mxc/include/mach/common.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx5/board-mx51_babbage.c +0 -0
index ee67a71..5c15d6e 100644

arch/arm/mach-mx5/board-mx51_babbage.c MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board") · line 94

Quoted 5 lines
arch/arm/mach-mx5/board-mx51_babbage.c +1 -1
@@ -91,7 +91,7 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
 	.phys_io = MX51_AIPS1_BASE_ADDR,
 	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params = PHYS_OFFSET + 0x100,
-	.map_io = mx51_map_io,
+	.map_io = mx5_map_io,

I think we should leave this as is and use a mx53_map_io for i.MX53. Then we can skip the somewhat mystical CPU detection later in this series.

Quoted 33 lines
arch/arm/mach-mx5/board-mx51_babbage.c +0 -0
 	.init_irq = mx51_init_irq,
 	.init_machine = mxc_board_init,
 	.timer = &mxc_timer,
arch/arm/mach-mx5/mm.c +1 -1
index fedacac..8ad1d0c 100644
@@ -38,7 +38,7 @@ static struct map_desc mxc_io_desc[] __initdata = {
  * system startup to create static physical to virtual memory mappings
  * for the IO modules.
  */
-void __init mx51_map_io(void)
+void __init mx5_map_io(void)
 {
 	void __iomem *base;
arch/arm/plat-mxc/include/mach/common.h +1 -1
index 2941472..0766746 100644
@@ -20,7 +20,7 @@ extern void mx25_map_io(void);
 extern void mx27_map_io(void);
 extern void mx31_map_io(void);
 extern void mx35_map_io(void);
-extern void mx51_map_io(void);
+extern void mx5_map_io(void);
 extern void mxc91231_map_io(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
Signature · 1 line
1.6.0.4
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 |