aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood.dtsi
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-07-18 13:22:54 -0400
committerAndrew Lunn <andrew@lunn.ch>2012-07-25 11:06:23 -0400
commit778435045a416da71f1757a80e37200a5ea5af70 (patch)
treeb1e91a6458fa6c07567a764029d1d539a1e68db0 /arch/arm/boot/dts/kirkwood.dtsi
parentbaffab28b13120694fa3ebab08d3e99667a851d2 (diff)
ARM: Kirkwood: Replace mrvl with marvell
It has been decided to use marvell, not mrvl, in the compatibility property. Search & replace. Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 926528b81baa..f95dbc190ab6 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,7 +1,7 @@
1/include/ "skeleton.dtsi" 1/include/ "skeleton.dtsi"
2 2
3/ { 3/ {
4 compatible = "mrvl,kirkwood"; 4 compatible = "marvell,kirkwood";
5 5
6 ocp@f1000000 { 6 ocp@f1000000 {
7 compatible = "simple-bus"; 7 compatible = "simple-bus";
@@ -28,7 +28,7 @@
28 }; 28 };
29 29
30 rtc@10300 { 30 rtc@10300 {
31 compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc"; 31 compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
32 reg = <0x10300 0x20>; 32 reg = <0x10300 0x20>;
33 interrupts = <53>; 33 interrupts = <53>;
34 }; 34 };
@@ -39,7 +39,7 @@
39 cle = <0>; 39 cle = <0>;
40 ale = <1>; 40 ale = <1>;
41 bank-width = <1>; 41 bank-width = <1>;
42 compatible = "mrvl,orion-nand"; 42 compatible = "marvell,orion-nand";
43 reg = <0x3000000 0x400>; 43 reg = <0x3000000 0x400>;
44 chip-delay = <25>; 44 chip-delay = <25>;
45 /* set partition map and/or chip-delay in board dts */ 45 /* set partition map and/or chip-delay in board dts */