From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Aug 2013 17:01:40 +0000 (-0700)
Subject: Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc
X-Git-Tag: v3.12-rc1~115^2~3
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=6cbe0e1feaf8f8516ee863e5c37144bafb84c17d;p=cascardo%2Flinux.git

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
---

6cbe0e1feaf8f8516ee863e5c37144bafb84c17d
diff --cc arch/arm/boot/dts/Makefile
index 0537a23b9dcf,3d4b882a0e29..80b9d903cba9
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -100,8 -101,8 +101,9 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
  	msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
+ 	armada-370-netgear-rn102.dtb \
  	armada-370-rd.dtb \
 +	armada-xp-axpwifiap.dtb \
  	armada-xp-db.dtb \
  	armada-xp-gp.dtb \
  	armada-xp-openblocks-ax3-4.dtb
diff --cc arch/arm/boot/dts/armada-xp-mv78230.dtsi
index e45e363cc9b9,ab40f961384f..0358a33cba48
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@@ -192,9 -74,113 +192,9 @@@
  				gpio-controller;
  				#gpio-cells = <2>;
  				interrupt-controller;
- 				#interrupts-cells = <2>;
+ 				#interrupt-cells = <2>;
  				interrupts = <87>, <88>, <89>;
  			};
 -
 -			/*
 -			 * MV78230 has 2 PCIe units Gen2.0: One unit can be
 -			 * configured as x4 or quad x1 lanes. One unit is
 -			 * x4/x1.
 -			 */
 -			pcie-controller {
 -				compatible = "marvell,armada-xp-pcie";
 -				status = "disabled";
 -				device_type = "pci";
 -
 -#address-cells = <3>;
 -#size-cells = <2>;
 -
 -				bus-range = <0x00 0xff>;
 -
 -				ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
 -					0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
 -					0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
 -					0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
 -					0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
 -					0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
 -					0x81000000 0 0	  0xe8000000 0 0x00100000>; /* downstream I/O */
 -
 -				pcie@1,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
 -					reg = <0x0800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 58>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <0>;
 -					clocks = <&gateclk 5>;
 -					status = "disabled";
 -				};
 -
 -				pcie@2,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
 -					reg = <0x1000 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 59>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <1>;
 -					clocks = <&gateclk 6>;
 -					status = "disabled";
 -				};
 -
 -				pcie@3,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
 -					reg = <0x1800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 60>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <2>;
 -					clocks = <&gateclk 7>;
 -					status = "disabled";
 -				};
 -
 -				pcie@4,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
 -					reg = <0x2000 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 61>;
 -					marvell,pcie-port = <0>;
 -					marvell,pcie-lane = <3>;
 -					clocks = <&gateclk 8>;
 -					status = "disabled";
 -				};
 -
 -				pcie@9,0 {
 -					device_type = "pci";
 -					assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
 -					reg = <0x4800 0 0 0 0>;
 -					#address-cells = <3>;
 -					#size-cells = <2>;
 -					#interrupt-cells = <1>;
 -					ranges;
 -					interrupt-map-mask = <0 0 0 0>;
 -					interrupt-map = <0 0 0 0 &mpic 99>;
 -					marvell,pcie-port = <2>;
 -					marvell,pcie-lane = <0>;
 -					clocks = <&gateclk 26>;
 -					status = "disabled";
 -				};
 -			};
  		};
  	};
  };