diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 21:01:40 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 21:01:40 +0400 |
| commit | 6cbe0e1feaf8f8516ee863e5c37144bafb84c17d (patch) | |
| tree | 2330961e07164d13745b530520b9179b56a32070 /arch/arm/boot/dts/armada-xp.dtsi | |
| parent | d519049cb17b63604149431496460ff9cf00845d (diff) | |
| parent | 5d3b883071763e6448386b875f04fcb201b6e12d (diff) | |
| download | linux-6cbe0e1feaf8f8516ee863e5c37144bafb84c17d.tar.xz | |
Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc
From Jason Cooper:
mvebu dt changes for v3.12
- kirkwood
- add ZyXEL NSA310 board, fan for ReadyNAS Duo v2
- mvebu
- add ReadyNAS 102 board
- misc dts updates and changes.
v2:
- dropped mv64xxx-i2c change
* tag 'dt-3.12' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix the Armada 370/XP timer compatible strings
ARM: mvebu: use dts pre-processor for readynas 102
ARM: kirkwood: use dts pre-processor for nsa310 boards
ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells
ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
ARM: mvebu: Add Netgear ReadyNAS 102 board
arm: kirkwood: readynas duo v2: Add GMT G762 Fan Controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/kirkwood-nsa310.dts
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 7ba99ce107bb..def125c0eeaa 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -69,7 +69,7 @@ }; timer@20300 { - marvell,timer-25Mhz; + compatible = "marvell,armada-xp-timer"; }; coreclk: mvebu-sar@18230 { |