From: Olof Johansson <olof@lixom.net>
Date: Thu, 2 Jan 2014 19:17:05 +0000 (-0800)
Subject: Merge tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu into next/dt
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~15127^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dee4bd4c7ed2eac16f55806e0e49d34dfb3c79fd;p=mirror_ubuntu-focal-kernel.git

Merge tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu into next/dt

From Jason Cooper:
mvebu DT changes for v3.14 (incremental #5)

 - mvebu
    - add rtc chip isl12057 node to ReadyNAS boards
    - fix register length in Armada XP pmsu

 - kirkwood
    - sort ocp nodes by address in 6282 dtsi file
    - add 6192 dtsi file
    - add LaPlug board
    - add sata phy node

 - dove
    - add sata phy node

* tag 'mvebu-dt-3.14-5' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: DT board setup for LaPlug
  ARM: Kirkwood: Add 6192 DTSI file
  ARM: mvebu: fix register length for Armada XP PMSU
  ARM: kirkwood: 6282: sort DT nodes by address
  Phy: Add DT nodes on kirkwood and Dove for the SATA PHY
  ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 2120 .dts file
  ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 104 .dts file
  ARM: mvebu: Enable ISL12057 RTC chip in ReadyNAS 102 .dts file

Signed-off-by: Olof Johansson <olof@lixom.net>
---

dee4bd4c7ed2eac16f55806e0e49d34dfb3c79fd