44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
commit 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34
|
|
Author: Jason Cooper <jason@lakedaemon.net>
|
|
Date: Mon Feb 27 16:07:14 2012 +0000
|
|
|
|
ARM: kirkwood: convert uart0 to devicetree.
|
|
|
|
This uart is the primary console for the dreamplug. Removed
|
|
kirkwood_uart0_init() call from board-dt.c.
|
|
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
|
|
Acked-by: Nicolas Pitre <nico@linaro.org>
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
|
|
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
index 0424d99..8a5dff8 100644
|
|
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
@@ -15,4 +15,11 @@
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
};
|
|
|
|
+ serial@f1012000 {
|
|
+ compatible = "ns16550a";
|
|
+ reg = <0xf1012000 0xff>;
|
|
+ reg-shift = <2>;
|
|
+ interrupts = <33>;
|
|
+ clock-frequency = <200000000>;
|
|
+ };
|
|
};
|
|
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
|
|
index 76392af..fbe6405 100644
|
|
--- a/arch/arm/mach-kirkwood/board-dt.c
|
|
+++ b/arch/arm/mach-kirkwood/board-dt.c
|
|
@@ -140,8 +140,6 @@ static void __init dreamplug_init(void)
|
|
*/
|
|
kirkwood_mpp_conf(dreamplug_mpp_config);
|
|
|
|
- kirkwood_uart0_init();
|
|
-
|
|
spi_register_board_info(dreamplug_spi_slave_info,
|
|
ARRAY_SIZE(dreamplug_spi_slave_info));
|
|
kirkwood_spi_init();
|