Title: [7422] trunk/arch/blackfin: Task[#3704] Forgot to register early device info at arch setup.
- Revision
- 7422
- Author
- sonicz
- Date
- 2009-09-23 04:06:25 -0400 (Wed, 23 Sep 2009)
Log Message
Task[#3704] Forgot to register early device info at arch setup.
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/setup.c (7421 => 7422)
--- trunk/arch/blackfin/kernel/setup.c 2009-09-23 05:09:28 UTC (rev 7421)
+++ trunk/arch/blackfin/kernel/setup.c 2009-09-23 08:06:25 UTC (rev 7422)
@@ -808,10 +808,17 @@
BUG();
}
+__attribute__((weak))
+void __init native_machine_early_platform_add_devices(void)
+{
+}
+
void __init setup_arch(char **cmdline_p)
{
unsigned long sclk, cclk;
+ native_machine_early_platform_add_devices();
+
enable_shadow_console();
/* Check to make sure we are running on the right processor */
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (7421 => 7422)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-09-23 05:09:28 UTC (rev 7421)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-09-23 08:06:25 UTC (rev 7422)
@@ -1887,7 +1887,7 @@
static struct platform_device *stamp_early_devices[] __initdata = {
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if defined(CONFIG_SERIAL_BFIN_CONSOLE) && defined(CONFIG_SERIAL_BFIN)
#ifdef CONFIG_SERIAL_BFIN_UART0
&bfin_uart0_device,
#endif
@@ -1896,7 +1896,7 @@
#endif
#endif
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE) && defined(CONFIG_SERIAL_BFIN_SPORT)
#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
&bfin_sport0_uart_device,
#endif
Modified: trunk/arch/blackfin/mach-bf548/boards/ezkit.c (7421 => 7422)
--- trunk/arch/blackfin/mach-bf548/boards/ezkit.c 2009-09-23 05:09:28 UTC (rev 7421)
+++ trunk/arch/blackfin/mach-bf548/boards/ezkit.c 2009-09-23 08:06:25 UTC (rev 7422)
@@ -1400,7 +1400,7 @@
arch_initcall(ezkit_init);
static struct platform_device *ezkit_early_devices[] __initdata = {
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if defined(CONFIG_SERIAL_BFIN_CONSOLE) && defined(CONFIG_SERIAL_BFIN)
#ifdef CONFIG_SERIAL_BFIN_UART0
&bfin_uart0_device,
#endif
@@ -1415,7 +1415,7 @@
#endif
#endif
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE) && defined(CONFIG_SERIAL_BFIN_SPORT)
#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
&bfin_sport0_uart_device,
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
