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.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/kirkwood.dtsi') diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 771c6bbeb29a..702b9555d019 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -1,6 +1,6 @@ /include/ "skeleton.dtsi" / { - compatible = "marvell,kirkwood"; + compatible = "mrvl,kirkwood"; }; -- cgit v1.2.3 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.dtsi | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/kirkwood.dtsi') diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 702b9555d019..825310b6d366 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -2,5 +2,29 @@ / { compatible = "mrvl,kirkwood"; -}; + ocp@f1000000 { + compatible = "simple-bus"; + ranges = <0 0xf1000000 0x1000000>; + #address-cells = <1>; + #size-cells = <1>; + + serial@12000 { + compatible = "ns16550a"; + reg = <0x12000 0x100>; + reg-shift = <2>; + interrupts = <33>; + /* set clock-frequency in board dts */ + status = "disabled"; + }; + + serial@12100 { + compatible = "ns16550a"; + reg = <0x12100 0x100>; + reg-shift = <2>; + interrupts = <34>; + /* set clock-frequency in board dts */ + status = "disabled"; + }; + }; +}; -- cgit v1.2.3 From e871b87a1e978e618c75acd4ceb6cd4699728691 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 6 Mar 2012 23:55:04 +0000 Subject: ARM: kirkwood: use devicetree for rtc-mv Signed-off-by: Jason Cooper Acked-by: Arnd Bergmann --- arch/arm/boot/dts/kirkwood.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm/boot/dts/kirkwood.dtsi') diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 825310b6d366..3474ef890945 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -26,5 +26,11 @@ /* set clock-frequency in board dts */ status = "disabled"; }; + + rtc@10300 { + compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc"; + reg = <0x10300 0x20>; + interrupts = <53>; + }; }; }; -- cgit v1.2.3