Commit cd7555ae authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-3.18' of... 

Merge tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/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: default avatarArnd 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
  ...
parents 45c636b4 d07fe967

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ 
dtb-$(CONFIG_MACH_SUN5I) += \

	sun5i-a10s-olinuxino-micro.dtb \

	sun5i-a10s-r7-tv-dongle.dtb \

	sun5i-a13-hsg-h702.dtb \

	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb

dtb-$(CONFIG_MACH_SUN6I) += \
@@ -430,7 +431,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \ 
dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-hummingbird.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-olinuxino-lime.dtb \

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-pcduino3.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

arch/arm/boot/dts/sun4i-a10.dtsi

+16 −3
Original line number Diff line number Diff line
@@ -339,12 +339,22 @@ 
		#size-cells = <1>;

		ranges;



		dma: dma-controller@01c02000 {

			compatible = "allwinner,sun4i-a10-dma";

			reg = <0x01c02000 0x1000>;

			interrupts = <27>;

			clocks = <&ahb_gates 6>;

			#dma-cells = <2>;

		};



		spi0: spi@01c05000 {

			compatible = "allwinner,sun4i-a10-spi";

			reg = <0x01c05000 0x1000>;

			interrupts = <10>;

			clocks = <&ahb_gates 20>, <&spi0_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 27>, <&dma 1 26>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -356,6 +366,8 @@ 
			interrupts = <11>;

			clocks = <&ahb_gates 21>, <&spi1_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 9>, <&dma 1 8>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -451,6 +463,8 @@ 
			interrupts = <12>;

			clocks = <&ahb_gates 22>, <&spi2_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 29>, <&dma 1 28>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -490,6 +504,8 @@ 
			interrupts = <50>;

			clocks = <&ahb_gates 23>, <&spi3_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 31>, <&dma 1 30>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -749,7 +765,6 @@ 
			reg = <0x01c2ac00 0x400>;

			interrupts = <7>;

			clocks = <&apb1_gates 0>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -760,7 +775,6 @@ 
			reg = <0x01c2b000 0x400>;

			interrupts = <8>;

			clocks = <&apb1_gates 1>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -771,7 +785,6 @@ 
			reg = <0x01c2b400 0x400>;

			interrupts = <9>;

			clocks = <&apb1_gates 2>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/sun5i-a10s.dtsi

+14 −3
Original line number Diff line number Diff line
@@ -300,12 +300,22 @@ 
		#size-cells = <1>;

		ranges;



		dma: dma-controller@01c02000 {

			compatible = "allwinner,sun4i-a10-dma";

			reg = <0x01c02000 0x1000>;

			interrupts = <27>;

			clocks = <&ahb_gates 6>;

			#dma-cells = <2>;

		};



		spi0: spi@01c05000 {

			compatible = "allwinner,sun4i-a10-spi";

			reg = <0x01c05000 0x1000>;

			interrupts = <10>;

			clocks = <&ahb_gates 20>, <&spi0_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 27>, <&dma 1 26>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -317,6 +327,8 @@ 
			interrupts = <11>;

			clocks = <&ahb_gates 21>, <&spi1_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 9>, <&dma 1 8>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -403,6 +415,8 @@ 
			interrupts = <12>;

			clocks = <&ahb_gates 22>, <&spi2_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 29>, <&dma 1 28>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -564,7 +578,6 @@ 
			reg = <0x01c2ac00 0x400>;

			interrupts = <7>;

			clocks = <&apb1_gates 0>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -575,7 +588,6 @@ 
			reg = <0x01c2b000 0x400>;

			interrupts = <8>;

			clocks = <&apb1_gates 1>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -586,7 +598,6 @@ 
			reg = <0x01c2b400 0x400>;

			interrupts = <9>;

			clocks = <&apb1_gates 2>;

			clock-frequency = <100000>;

			status = "disabled";

		};

arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

0 → 100644
+130 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Chen-Yu Tsai <wens@csie.org>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 *     You should have received a copy of the GNU General Public

 *     License along with this library; if not, write to the Free

 *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,

 *     MA 02110-1301 USA

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;

/include/ "sun5i-a13.dtsi"

/include/ "sunxi-common-regulators.dtsi"



/ {

	model = "HSG H702";

	compatible = "hsg,h702", "allwinner,sun5i-a13";



	soc@01c00000 {

		mmc0: mmc@01c0f000 {

			pinctrl-names = "default";

			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 6 0 0>; /* PG0 */

			cd-inverted;

			status = "okay";

		};



		usbphy: phy@01c13400 {

			/*

			 * There doesn't seem to be a GPIO for controlling

			 * usb1 vbus, despite the fex file saying otherwise.

			 */

			usb1_vbus-supply = <&reg_vcc5v0>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};



		ohci0: usb@01c14400 {

			status = "okay";

		};



		pinctrl@01c20800 {

			mmc0_cd_pin_h702: mmc0_cd_pin@0 {

				allwinner,pins = "PG0";

				allwinner,function = "gpio_in";

				allwinner,drive = <0>;

				allwinner,pull = <1>;

			};

		};



		uart1: serial@01c28400 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart1_pins_b>;

			status = "okay";

		};



		i2c0: i2c@01c2ac00 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins_a>;

			status = "okay";



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupts = <0>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};

		};



		i2c1: i2c@01c2b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c1_pins_a>;

			status = "okay";



			pcf8563: rtc@51 {

				compatible = "nxp,pcf8563";

				reg = <0x51>;

			};

		};



		i2c2: i2c@01c2b400 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c2_pins_a>;

			status = "okay";

		};

	};

};

arch/arm/boot/dts/sun5i-a13.dtsi

+14 −3
Original line number Diff line number Diff line
@@ -298,12 +298,22 @@ 
		#size-cells = <1>;

		ranges;



		dma: dma-controller@01c02000 {

			compatible = "allwinner,sun4i-a10-dma";

			reg = <0x01c02000 0x1000>;

			interrupts = <27>;

			clocks = <&ahb_gates 6>;

			#dma-cells = <2>;

		};



		spi0: spi@01c05000 {

			compatible = "allwinner,sun4i-a10-spi";

			reg = <0x01c05000 0x1000>;

			interrupts = <10>;

			clocks = <&ahb_gates 20>, <&spi0_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 27>, <&dma 1 26>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -315,6 +325,8 @@ 
			interrupts = <11>;

			clocks = <&ahb_gates 21>, <&spi1_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 9>, <&dma 1 8>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -376,6 +388,8 @@ 
			interrupts = <12>;

			clocks = <&ahb_gates 22>, <&spi2_clk>;

			clock-names = "ahb", "mod";

			dmas = <&dma 1 29>, <&dma 1 28>;

			dma-names = "rx", "tx";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -490,7 +504,6 @@ 
			reg = <0x01c2ac00 0x400>;

			interrupts = <7>;

			clocks = <&apb1_gates 0>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -501,7 +514,6 @@ 
			reg = <0x01c2b000 0x400>;

			interrupts = <8>;

			clocks = <&apb1_gates 1>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -512,7 +524,6 @@ 
			reg = <0x01c2b400 0x400>;

			interrupts = <9>;

			clocks = <&apb1_gates 2>;

			clock-frequency = <100000>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE