45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
commit b77816dea3e4c0f815510dea2a0ca9bcda6644dc
|
|
Author: Jason Cooper <jason@lakedaemon.net>
|
|
Date: Wed Mar 7 15:03:57 2012 +0000
|
|
|
|
ARM: kirkwood: fdt: use mrvl ticker symbol
|
|
|
|
Also, use inclusive register size for uart0.
|
|
|
|
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 8a5dff8..333f11b 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 771c6bb..702b955 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";
|
|
};
|
|
|