From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Sep 2014 16:13:49 +0000 (+0200)
Subject: Merge tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripar... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'sunxi-dt-for-3.18' of git://git./linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner DT Additions for 3.18" from Maxime Ripard:

Mostly:
  - A23 bringup ongoing
  - New boards: HSG H702, Merrii A20 Hummingbird
  - sun(4|5|7)i DMA support
  - DT relicensing to a dual GPL/X11 license

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (30 commits)
  ARM: dts: sun8i: Add DMA controller node
  ARM: dts: sun5i: Add DT for HSG H702 tablet board
  ARM: dts: sunxi: Add fixed 5V regulator
  ARM: sun8i: Relicense the A23 DTSI under GPLv2/X11
  ARM: sun7i: Relicense the A20 DTSI under GPLv2/X11
  ARM: sun6i: Relicense the A31 DTSI under GPLv2/X11
  ARM: sun7i: Add support for Olimex A20-OLinuXino-LIME
  ARM: dts: sun7i: Add Merrii A20 Hummingbird board
  ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux
  ARM: dt: sunxi: Remove i2c controller clock-frequency that matches default
  ARM: dts: sun8i: Enable i2c controllers on ippo-q8h-v5
  ARM: dts: sun8i: Add i2c controller nodes
  ARM: dts: sun8i: Add pin-muxing info for the i2c controllers
  ARM: dts: sun8i: Enable mmc controller on ippo-q8h-v5
  ARM: dts: sun8i: Add mmc controller nodes
  ARM: dts: sun8i: Add pin-muxing info for the mmc controllers
  ARM: dts: sun8i: Add mmc clocks to the dtsi
  ARM: dts: sun8i: ippo-q8h: Add pinctrl properties for R_UART
  ARM: dts: sun8i: Add pin muxing option for R_UART
  ARM: dts: sun8i: Add pinmux set for uart0
  ...
---

cd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7
diff --cc arch/arm/boot/dts/sun6i-a31.dtsi
index e06fbfc55bb7,eb686e78f225..543f895d18d3
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -657,11 -693,8 +693,10 @@@
  			reg = <0x01c2ac00 0x400>;
  			interrupts = <0 6 4>;
  			clocks = <&apb2_gates 0>;
- 			clock-frequency = <100000>;
  			resets = <&apb2_rst 0>;
  			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
  		};
  
  		i2c1: i2c@01c2b000 {
@@@ -669,11 -702,8 +704,10 @@@
  			reg = <0x01c2b000 0x400>;
  			interrupts = <0 7 4>;
  			clocks = <&apb2_gates 1>;
- 			clock-frequency = <100000>;
  			resets = <&apb2_rst 1>;
  			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
  		};
  
  		i2c2: i2c@01c2b400 {
@@@ -681,11 -711,8 +715,10 @@@
  			reg = <0x01c2b400 0x400>;
  			interrupts = <0 8 4>;
  			clocks = <&apb2_gates 2>;
- 			clock-frequency = <100000>;
  			resets = <&apb2_rst 2>;
  			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
  		};
  
  		i2c3: i2c@01c2b800 {
@@@ -693,11 -720,8 +726,10 @@@
  			reg = <0x01c2b800 0x400>;
  			interrupts = <0 9 4>;
  			clocks = <&apb2_gates 3>;
- 			clock-frequency = <100000>;
  			resets = <&apb2_rst 3>;
  			status = "disabled";
 +			#address-cells = <1>;
 +			#size-cells = <0>;
  		};
  
  		gmac: ethernet@01c30000 {