From d49e66360ca32775082cd01203caadaf54f399a3 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 15 Dec 2008 16:11:42 +0000
Subject: [PATCH] move machine setup code

SVN-Revision: 13656
---
 .../mips/include/asm/mach-ar71xx/platform.h   |  8 ++++++++
 .../ar71xx/files/arch/mips/ar71xx/platform.c  | 20 ++-----------------
 .../ar71xx/files/arch/mips/ar71xx/setup.c     | 14 +++++++++++++
 .../include/asm-mips/mach-ar71xx/platform.h   |  8 ++++++++
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/platform.h b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/platform.h
index 750418a79089..a82d621a4873 100644
--- a/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/platform.h
+++ b/target/linux/ar71xx/files-2.6.28/arch/mips/include/asm/mach-ar71xx/platform.h
@@ -74,4 +74,12 @@ extern void ar71xx_add_device_gpio_buttons(int id,
 				   unsigned nbuttons,
 				   struct gpio_button *buttons) __init;
 
+#ifdef CONFIG_AR71XX_EARLY_SERIAL
+static inline void ar71xx_add_device_uart(void) {}
+#else
+extern void ar71xx_add_device_uart(void) __init;
+#endif
+
+extern void ar71xx_add_device_wdt(void) __init;
+
 #endif /* __ASM_MACH_AR71XX_PLATFORM_H */
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
index 5c8791be283f..ab9cabb1b74f 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
@@ -18,7 +18,6 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/platform.h>
 
@@ -138,9 +137,7 @@ void __init ar71xx_add_device_usb(void)
 	}
 }
 
-#ifdef CONFIG_AR71XX_EARLY_SERIAL
-static void __init ar71xx_add_device_uart(void) {};
-#else
+#ifndef CONFIG_AR71XX_EARLY_SERIAL
 static struct resource ar71xx_uart_resources[] = {
 	{
 		.start	= AR71XX_UART_BASE,
@@ -172,7 +169,7 @@ static struct platform_device ar71xx_uart_device = {
 	},
 };
 
-static void __init ar71xx_add_device_uart(void)
+void __init ar71xx_add_device_uart(void)
 {
 	ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
 	platform_device_register(&ar71xx_uart_device);
@@ -597,16 +594,3 @@ void __init ar71xx_parse_mac_addr(char *mac_str)
 		printk(KERN_DEBUG "ar71xx: failed to parse mac address "
 				"\"%s\"\n", mac_str);
 }
-
-static int __init ar71xx_machine_setup(void)
-{
-	ar71xx_gpio_init();
-
-	ar71xx_add_device_uart();
-	ar71xx_add_device_wdt();
-
-	mips_machine_setup(ar71xx_mach_type);
-	return 0;
-}
-
-arch_initcall(ar71xx_machine_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
index 5d3f2a8e4248..25ef3ded55dd 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@@ -23,6 +23,7 @@
 #include <asm/traps.h>
 #include <asm/time.h>		/* for mips_hpt_frequency */
 #include <asm/reboot.h>		/* for _machine_{restart,halt} */
+#include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
@@ -270,3 +271,16 @@ void __init plat_time_init(void)
 {
 	mips_hpt_frequency = ar71xx_cpu_freq / 2;
 }
+
+static int __init ar71xx_machine_setup(void)
+{
+	ar71xx_gpio_init();
+
+	ar71xx_add_device_uart();
+	ar71xx_add_device_wdt();
+
+	mips_machine_setup(ar71xx_mach_type);
+	return 0;
+}
+
+arch_initcall(ar71xx_machine_setup);
diff --git a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
index 750418a79089..a82d621a4873 100644
--- a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
+++ b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
@@ -74,4 +74,12 @@ extern void ar71xx_add_device_gpio_buttons(int id,
 				   unsigned nbuttons,
 				   struct gpio_button *buttons) __init;
 
+#ifdef CONFIG_AR71XX_EARLY_SERIAL
+static inline void ar71xx_add_device_uart(void) {}
+#else
+extern void ar71xx_add_device_uart(void) __init;
+#endif
+
+extern void ar71xx_add_device_wdt(void) __init;
+
 #endif /* __ASM_MACH_AR71XX_PLATFORM_H */
-- 
2.30.2