summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-03-07 15:03:57 +0000
committerJason Cooper <jason@lakedaemon.net>2012-03-16 04:28:41 +0000
commitb77816dea3e4c0f815510dea2a0ca9bcda6644dc (patch)
tree91b15accf3b3a78ad59226d7ed973bd31f97d09a
parenta855a7ced4f572dcd1038db06b532df3ba9f227c (diff)
ARM: kirkwood: fdt: use mrvl ticker symbol
Also, use inclusive register size for uart0. Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/kirkwood-dreamplug.dts4
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi2
2 files changed, 3 insertions, 3 deletions
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>;
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";
};