From b77816dea3e4c0f815510dea2a0ca9bcda6644dc Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Wed, 7 Mar 2012 15:03:57 +0000 Subject: ARM: kirkwood: fdt: use mrvl ticker symbol Also, use inclusive register size for uart0. Signed-off-by: Jason Cooper --- arch/arm/boot/dts/kirkwood-dreamplug.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/boot/dts/kirkwood-dreamplug.dts') diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 8a5dff807b45..333f11b85504 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts @@ -4,7 +4,7 @@ / { model = "Globalscale Technologies Dreamplug"; - compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; + compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; memory { device_type = "memory"; @@ -17,7 +17,7 @@ serial@f1012000 { compatible = "ns16550a"; - reg = <0xf1012000 0xff>; + reg = <0xf1012000 0x100>; reg-shift = <2>; interrupts = <33>; clock-frequency = <200000000>; -- cgit From 163f2cea673a4ae831ad2cd26d8f01977c3add93 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Thu, 15 Mar 2012 01:00:27 +0000 Subject: ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0 Define both uarts in kirkwood.dtsi as they are common to all kirkwood SoCs. Each board may enable all or none of them, so they are disabled by default. uart0 is enabled for the dreamplug. tclk can vary for each board, so we leave it undefined in the kirkwood dtsi. Each board can then set it as appropriate when enabling the uart. Signed-off-by: Jason Cooper --- arch/arm/boot/dts/kirkwood-dreamplug.dts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'arch/arm/boot/dts/kirkwood-dreamplug.dts') diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 333f11b85504..a5376b84227f 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts @@ -15,11 +15,10 @@ bootargs = "console=ttyS0,115200n8 earlyprintk"; }; - serial@f1012000 { - compatible = "ns16550a"; - reg = <0xf1012000 0x100>; - reg-shift = <2>; - interrupts = <33>; - clock-frequency = <200000000>; + ocp@f1000000 { + serial@12000 { + clock-frequency = <200000000>; + status = "ok"; + }; }; }; -- cgit