ARM: mx3+mx5: rename mxc_board_init to ${machine}_init

mxc_board_init is too generic to be useful.  Additionally change some
mxc_timer to ${machine}_timer, too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index 0f2305626e17a840631efdaa142a071ef12bcd2f..6db0520e8794ae00df86fa59696f2c56769b2a16 100644 (file)
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -156,7 +156,7 @@ __setup("otg_mode=", eukrea_cpuimx35_otg_mode);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init eukrea_cpuimx35_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx35_pads,
                        ARRAY_SIZE(eukrea_cpuimx35_pads));
@@ -199,5 +199,5 @@ MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
        .init_ext3_fs = imx35_init_early,
        .init_irq = mx35_init_irq,
        .timer = &eukrea_cpuimx35_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = eukrea_cpuimx35_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
index 52b8dd7192c627bbdf0dd43344f6944ec676d75a..d3cc7393a6b108c6b5cc1ca45fde3f056b67221e 100644 (file)
--- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
@@ -266,13 +266,9 @@ static void __init kzm_timer_init(void)
 }
 
 static struct sys_timer kzm_timer = {
-       .init   = kzm_timer_init,
+       .init = kzm_timer_init,
 };
 
-/*
- * The following uses standard kernel macros define in arch.h in order to
- * initialize __mach_desc_KZM_ARM11_01 data structure.
- */
 MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
        .boot_params = MX3x_PHYS_OFFSET + 0x100,
        .map_io = kzm_map_io,

diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 2d744b27f63cbdb346de2c08b7c5dffe44d0070d..0d24b3c63c832fff84558342ae11d3f16ae05df6 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -327,10 +327,7 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
        .flags = IMXUART_HAVE_RTSCTS,
 };
 
-/*!
- * Board specific initialization.
- */
-static void __init mxc_board_init(void)
+static void __init mx31_3ds_init(void)
 {
        mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),
                                      "mx31_3ds");
@@ -385,5 +382,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,
        .timer = &mx31_3ds_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = mx31_3ds_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index 787bdc4d6cc8e8eaa737b7d358f6e4edabdad18b..cb80b96382035aeab683fb6fa16f752dede2cfb9 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-mx3/mach-mx31ads.c
@@ -524,10 +524,7 @@ static void __init mx31ads_init_irq(void)
        mx31ads_init_expio();
 }
 
-/*!
- * Board specific initialization.
- */
-static void __init mxc_board_init(void)
+static void __init mx31ads_init(void)
 {
        mxc_init_extuart();
        mxc_init_imx_uart();
@@ -555,5 +552,5 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")
        .init_early = imx31_init_early,
        .init_irq = mx31ads_init_irq,
        .timer = &mx31ads_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = mx31ads_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c
index e146f1a72daa6a024185401278c8d2ebc99bb498..81021bf8f6b33a4c6fb24ebe9fb6f21077002ad5 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx31lite.c
+++ b/arch/arm/mach-mx3/mach-mx31lite.c
@@ -229,7 +229,7 @@ void __init mx31lite_map_io(void)
 static int mx31lite_baseboard;
 core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);
 
-static void __init mxc_board_init(void)
+static void __init mx31lite_init(void)
 {
        int ret;
 
@@ -288,5 +288,5 @@ MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,
        .timer = &mx31lite_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = mx31lite_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index ea880330e83943663c4da9ee054e8e784f650a5e..845d0b6b25395b73e47d25240ea9980a60d229a0 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -507,7 +507,7 @@ core_param(mx31moboard_baseboard, mx31moboard_baseboard, int, 0444);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init mx31moboard_init(void)
 {
        mxc_iomux_setup_multiple_pins(moboard_pins, ARRAY_SIZE(moboard_pins),
                "moboard");
@@ -573,5 +573,5 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,
        .timer = &mx31moboard_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = mx31moboard_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-mx3/mach-mx35_3ds.c
index dac1896a5b21e8f2807a6b44b2d5d869a6a8a95c..be12ac1d1954ba030a4a98458c70511bb0747a81 100644 (file)
--- a/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx35_3ds.c
@@ -166,7 +166,7 @@ __setup("otg_mode=", mx35_3ds_otg_mode);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init mx35_3ds_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(mx35pdk_pads, ARRAY_SIZE(mx35pdk_pads));
 
@@ -208,5 +208,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK")
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
        .timer = &mx35pdk_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = mx35_3ds_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 55f95d42f71c230a883450bd2aa3a8634500e6d9..783d31b8e8a7c1e3e85936c7f2e8aa3cdcdfb7bb 100644 (file)
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -578,7 +578,7 @@ __setup("otg_mode=", pcm037_otg_mode);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init pcm037_init(void)
 {
        int ret;
 
@@ -690,5 +690,5 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,
        .timer = &pcm037_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = pcm037_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index 4fa07142a9bb6a7738bd25b83a12efbc21dcf97b..6c662c73aaa3635ce80672ee58f81a10010b5b06 100644 (file)
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -351,7 +351,7 @@ __setup("otg_mode=", pcm043_otg_mode);
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init pcm043_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads));
 
@@ -418,5 +418,5 @@ MACHINE_START(PCM043, "Phytec Phycore pcm043")
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
        .timer = &pcm043_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = pcm043_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index 064f2db25f3956c48bb4c4a9a6a52b78cf41bb9a..002816347e67566f1dbed5fe2c84220d55725a64 100644 (file)
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -247,7 +247,7 @@ static void __init qong_init_fpga(void)
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init qong_init(void)
 {
        mxc_init_imx_uart();
        qong_init_nor_mtd();
@@ -275,5 +275,5 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,
        .timer = &qong_timer,
-       .init_machine = mxc_board_init,
+       .init_machine = qong_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index 01684708ef34af00084d0d24db1a1366ab1c1a7f..63dfbeafbc1e4e51a20b0326bb34cd6e8000c6c7 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -133,7 +133,7 @@ static struct spi_board_info mx51_3ds_spi_nor_device[] = {
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init mx51_3ds_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads,
                                        ARRAY_SIZE(mx51_3ds_pads));
@@ -160,8 +160,8 @@ static void __init mx51_3ds_timer_init(void)
        mx51_clocks_init(32768, 24000000, 22579200, 0);
 }
 
-static struct sys_timer mxc_timer = {
-       .init   = mx51_3ds_timer_init,
+static struct sys_timer mx51_3ds_timer = {
+       .init = mx51_3ds_timer_init,
 };
 
 MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
@@ -170,6 +170,6 @@ MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
        .map_io = mx51_map_io,
        .init_early = imx51_init_early,
        .init_irq = mx51_init_irq,
-       .timer = &mxc_timer,
-       .init_machine = mxc_board_init,
+       .timer = &mx51_3ds_timer,
+       .init_machine = mx51_3ds_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 7874bcd41db5ab3f067c5b68498ffe3a77a0e7c2..b2ecd194e76d6505f79820835117803d1ac8bf7a 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -341,7 +341,7 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = {
 /*
  * Board specific initialization.
  */
-static void __init mxc_board_init(void)
+static void __init mx51_babbage_init(void)
 {
        iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
        iomux_v3_cfg_t power_key = _MX51_PAD_EIM_A27__GPIO2_21 |
@@ -395,8 +395,8 @@ static void __init mx51_babbage_timer_init(void)
        mx51_clocks_init(32768, 24000000, 22579200, 0);
 }
 
-static struct sys_timer mxc_timer = {
-       .init   = mx51_babbage_timer_init,
+static struct sys_timer mx51_babbage_timer = {
+       .init = mx51_babbage_timer_init,
 };
 
 MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
@@ -405,6 +405,6 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
        .map_io = mx51_map_io,
        .init_early = imx51_init_early,
        .init_irq = mx51_init_irq,
-       .timer = &mxc_timer,
-       .init_machine = mxc_board_init,
+       .timer = &mx51_babbage_timer,
+       .init_machine = mx51_babbage_init,
 MACHINE_END

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index b0fa55327c37e29adcebb733ce5fc8bcf113796d..c4094fa5794f6dbd0da750f5895771adf3ace4cb 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -303,7 +303,7 @@ void mx51_efikamx_reset(void)
                gpio_direction_output(EFIKAMX_RESET, 0);
 }
 
-static void __init mxc_board_init(void)
+static void __init mx51_efikamx_init(void)
 {
        mxc_iomux_v3_setup_multiple_pads(mx51efikamx_pads,
                                        ARRAY_SIZE(mx51efikamx_pads));
@@ -341,8 +341,8 @@ static void __init mx51_efikamx_timer_init(void)
        mx51_clocks_init(32768, 24000000, 22579200, 24576000);
 }
 
-static struct sys_timer mxc_timer = {
-       .init   = mx51_efikamx_timer_init,
+static struct sys_timer mx51_efikamx_timer = {
+       .init = mx51_efikamx_timer_init,
 };
 
 MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
@@ -351,6 +351,6 @@ MACHINE_START(MX51_EFIKAMX, "Genesi EfikaMX nettop")
        .map_io = mx51_map_io,
        .init_early = imx51_init_early,
        .init_irq = mx51_init_irq,
-       .timer = &mxc_timer,
-       .init_machine =  mxc_board_init,
+       .timer = &mx51_efikamx_timer,
+       .init_machine = mx51_efikamx_init,
 MACHINE_END