From 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Mon, 27 Feb 2012 16:07:14 +0000 Subject: [PATCH] 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 Reviewed-by: Arnd Bergmann Acked-by: Nicolas Pitre Signed-off-by: Arnd Bergmann --- 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 0424d9931a3d..8a5dff807b45 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 76392af791de..fbe6405602ed 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(); -- 2.34.1