From d50220fc67b78e5a775451a4ba6e71dccea89ae1 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Mon, 27 Feb 2012 16:07:14 +0000 Subject: [PATCH] --- yaml --- r: 295886 b: refs/heads/master c: 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +++++++ trunk/arch/arm/mach-kirkwood/board-dt.c | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ca5ee8f4c3c..2f2a121bc2e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d468b6d6052293ad3b8538b8277077981c28286 +refs/heads/master: 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 diff --git a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts index 0424d9931a3d..8a5dff807b45 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/trunk/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/trunk/arch/arm/mach-kirkwood/board-dt.c b/trunk/arch/arm/mach-kirkwood/board-dt.c index 76392af791de..fbe6405602ed 100644 --- a/trunk/arch/arm/mach-kirkwood/board-dt.c +++ b/trunk/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();