[PATCH 06/14] ARM: kirkwood: convert uart0 to devicetree.
Jason Cooper
jason at lakedaemon.net
Tue Mar 6 22:44:47 EST 2012
This uart is the primary console for the dreamplug. Removed
kirkwood_uart0_init() call from board-dt.c.
Signed-off-by: Jason Cooper <jason at lakedaemon.net>
Reviewed-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Nicolas Pitre <nico at linaro.org>
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +++++++
arch/arm/mach-kirkwood/board-dt.c | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 578806d..ebb2c87 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 at 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 f9f446b..b55d25b 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -143,8 +143,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();
--
1.7.3.4
More information about the linux-arm-kernel
mailing list