72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
commit 163f2cea673a4ae831ad2cd26d8f01977c3add93
|
|
Author: Jason Cooper <jason@lakedaemon.net>
|
|
Date: Thu Mar 15 01:00:27 2012 +0000
|
|
|
|
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 <jason@lakedaemon.net>
|
|
|
|
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
index 333f11b..a5376b8 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";
|
|
+ };
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
|
|
index 702b955..825310b 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";
|
|
+ };
|
|
+ };
|
|
+};
|