From: Olof Johansson <olof@lixom.net>
Date: Sun, 9 Mar 2014 18:40:13 +0000 (-0700)
Subject: Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1809136044bde55f70198c97de86296682c85413;p=linux-beck.git

Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dt

Allwinner DT patches for 3.15, take 1 from Maxime Ripard:
  - Add SPI controllers for all the SoCs
  - Add various missing aliases
  - Add USB clocks nodes
  - Addition of the GMAC support
  - Introduction of the pcDuino board
  - A few DT cleanup patches: change of compatibles,

* tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux: (33 commits)
  ARM: sun6i: dt: Fix mod0 compatible
  ARM: dts: sun7i: Enable the SPI controllers of the A20-olinuxino-micro
  ARM: dt: sun7i: Add SPI muxing options
  ARM: dt: sun5i: Add A13 SPI controller nodes
  ARM: dt: sun5i: Add A10s SPI controller nodes
  ARM: dt: sun4i: Add A10 SPI controller nodes
  ARM: dt: sun7i: Add A20 SPI controller nodes
  ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators
  ARM: sunxi: dt: Convert to the new clock compatibles
  ARM: sun7i: add arch timer node
  ARM: sun7i: dt: Add bindings for USB clocks
  ARM: sun5i: dt: Add bindings for USB clocks
  ARM: sun4i: dt: Add bindings for USB clocks
  ARM: dts: sun7i: Add ethernet alias for GMAC
  ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of EMAC
  ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC
  ARM: dts: sun7i: cubietruck: Enable the GMAC
  ARM: dts: sun7i: Add pin muxing options for the GMAC
  ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI
  ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI
  ...

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

1809136044bde55f70198c97de86296682c85413
diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
index 10666ca8aee1,2c01b0b77de2..a850482c69f1
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@@ -314,8 -339,30 +339,30 @@@
  		#size-cells = <1>;
  		ranges;
  
+ 		spi0: spi@01c05000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c05000 0x1000>;
+ 			interrupts = <10>;
+ 			clocks = <&ahb_gates 20>, <&spi0_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
+ 		spi1: spi@01c06000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c06000 0x1000>;
+ 			interrupts = <11>;
+ 			clocks = <&ahb_gates 21>, <&spi1_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
  		emac: ethernet@01c0b000 {
 -			compatible = "allwinner,sun4i-emac";
 +			compatible = "allwinner,sun4i-a10-emac";
  			reg = <0x01c0b000 0x1000>;
  			interrupts = <55>;
  			clocks = <&ahb_gates 17>;
diff --cc arch/arm/boot/dts/sun5i-a10s.dtsi
index 64961595e8d6,503b099a10f5..a7198b615afd
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@@ -277,8 -300,30 +300,30 @@@
  		#size-cells = <1>;
  		ranges;
  
+ 		spi0: spi@01c05000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c05000 0x1000>;
+ 			interrupts = <10>;
+ 			clocks = <&ahb_gates 20>, <&spi0_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
+ 		spi1: spi@01c06000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c06000 0x1000>;
+ 			interrupts = <11>;
+ 			clocks = <&ahb_gates 21>, <&spi1_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
  		emac: ethernet@01c0b000 {
 -			compatible = "allwinner,sun4i-emac";
 +			compatible = "allwinner,sun4i-a10-emac";
  			reg = <0x01c0b000 0x1000>;
  			interrupts = <55>;
  			clocks = <&ahb_gates 17>;
diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
index 9ff09484847b,fa0e5f8c4483..52507e4e3a91
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@@ -339,8 -401,30 +401,30 @@@
  		#size-cells = <1>;
  		ranges;
  
+ 		spi0: spi@01c05000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c05000 0x1000>;
+ 			interrupts = <0 10 4>;
+ 			clocks = <&ahb_gates 20>, <&spi0_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
+ 		spi1: spi@01c06000 {
+ 			compatible = "allwinner,sun4i-a10-spi";
+ 			reg = <0x01c06000 0x1000>;
+ 			interrupts = <0 11 4>;
+ 			clocks = <&ahb_gates 21>, <&spi1_clk>;
+ 			clock-names = "ahb", "mod";
+ 			status = "disabled";
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 		};
+ 
  		emac: ethernet@01c0b000 {
 -			compatible = "allwinner,sun4i-emac";
 +			compatible = "allwinner,sun4i-a10-emac";
  			reg = <0x01c0b000 0x1000>;
  			interrupts = <0 55 4>;
  			clocks = <&ahb_gates 17>;