Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dee4bd4c authored Jan 02, 2014 by Olof Johansson

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>

parents c56569b3 2cc64b56

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
		kirkwood-iomega_ix2_200.dtb \
		kirkwood-is2.dtb \
		kirkwood-km_kirkwood.dtb \
		kirkwood-laplug.dtb \
		kirkwood-lschlv2.dtb \
		kirkwood-lsxhl.dtb \
		kirkwood-mplcec4.dtb \

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,11 @@
		clock-frequency = <100000>;
		status = "okay";

		isl12057: isl12057@68 {
		compatible = "isl,isl12057";
		reg = <0x68>;
		};

		g762: g762@3e {
		compatible = "gmt,g762";
		reg = <0x3e>;

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,11 @@
		clock-frequency = <100000>;
		status = "okay";

		isl12057: isl12057@68 {
		compatible = "isl,isl12057";
		reg = <0x68>;
		};

		g762: g762@3e {
		compatible = "gmt,g762";
		reg = <0x3e>;

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,11 @@
		clock-frequency = <400000>;
		status = "okay";

		isl12057: isl12057@68 {
		compatible = "isl,isl12057";
		reg = <0x68>;
		};

		/* Controller for rear fan #1 of 3 (Protechnic
		* MGT4012XB-O20, 8000RPM) near eSATA port */
		g762_fan1: g762@3e {

arch/arm/boot/dts/armada-xp.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@

		armada-370-xp-pmsu@22000 {
		compatible = "marvell,armada-370-xp-pmsu";
		reg = <0x22100 0x430>, <0x20800 0x20>;
		reg = <0x22100 0x400>, <0x20800 0x20>;
		};

		eth2: ethernet@30000 {