diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-26 21:42:54 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-26 21:42:54 +0200 |
| commit | 237e6b1d01e8d7c04788f47874f01ea8659928a9 (patch) | |
| tree | 101dd84435d0c9d05a16f122b509b47d1bf9fc70 /arch/arm/boot/dts/kirkwood.dtsi | |
| parent | 8299aea70206e8c42630e3121ce6ff60c9ba188d (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
| download | linux-237e6b1d01e8d7c04788f47874f01ea8659928a9.tar.gz | |
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v2
Merge in fixes, which are needed when testing the DT branch.
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 6 |
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 @@ /include/ "skeleton.dtsi" / { - compatible = "mrvl,kirkwood"; + compatible = "marvell,kirkwood"; ocp@f1000000 { compatible = "simple-bus"; @@ -28,7 +28,7 @@ }; rtc@10300 { - compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc"; + compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; reg = <0x10300 0x20>; interrupts = <53>; }; @@ -39,7 +39,7 @@ cle = <0>; ale = <1>; bank-width = <1>; - compatible = "mrvl,orion-nand"; + compatible = "marvell,orion-nand"; reg = <0x3000000 0x400>; chip-delay = <25>; /* set partition map and/or chip-delay in board dts */ |