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

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

Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:

  - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
  - Addition of the I2C for the A31
  - Addition USB Host mode for the A10, A10s, A13 and A20
  - Addition of SATA support for the A10 and A20
  - Change of compatible for the watchdog

* tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux

: (23 commits)
  ARM: sunxi: dt: Update the watchdog compatibles
  ARM: sun6i: colombus: Enable the I2C controllers
  ARM: sun6i: Enable the I2C muxing options
  ARM: sun6i: Enable the I2C controllers
  ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
  ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
  ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
  ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
  ARM: sun7i: dt: Add USB host nodes to cubietruck dts
  ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
  ARM: sun4i: dt: Add USB host nodes to pcduino.dts
  ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
  ARM: sun4i: dt: Add USB host nodes to hackberry dts
  ARM: sun4i: dt: Add USB host nodes to cubieboard dts
  ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
  ARM: sun7i: dt: Add USB host bindings
  ARM: sun5i: dt: Add USB host bindings
  ARM: sun4i: dt: Add USB host bindings
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 542798cd ca5d04d9

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ 
	sun4i-a10-cubieboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-hackberry.dtb \

	sun4i-a10-inet97fv2.dtb \

	sun4i-a10-olinuxino-lime.dtb \

	sun4i-a10-pcduino.dtb \

	sun5i-a10s-olinuxino-micro.dtb \

	sun5i-a13-olinuxino.dtb \

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

+35 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


/dts-v1/;

/include/ "sun4i-a10.dtsi"

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



/ {

	model = "Mele A1000";
@@ -35,6 +36,32 @@ 
			};

		};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};



		ohci0: usb@01c14400 {

			status = "okay";

		};



		ahci: sata@01c18000 {

			status = "okay";

		};



		ehci1: usb@01c1c000 {

			status = "okay";

		};



		ohci1: usb@01c1c400 {

			status = "okay";

		};



		pinctrl@01c20800 {

			emac_power_pin_a1000: emac_power_pin@0 {

				allwinner,pins = "PH15";
@@ -90,4 +117,12 @@ 
		enable-active-high;

		gpio = <&pio 7 15 0>;

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	};



	reg_usb2_vbus: usb2-vbus {

		status = "okay";

	};

};

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

+40 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


/dts-v1/;

/include/ "sun4i-a10.dtsi"

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



/ {

	model = "Cubietech Cubieboard";
@@ -33,6 +34,33 @@ 
			};

		};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};



		ohci0: usb@01c14400 {

			status = "okay";

		};



		ahci: sata@01c18000 {

			target-supply = <&reg_ahci_5v>;

			status = "okay";

		};



		ehci1: usb@01c1c000 {

			status = "okay";

		};



		ohci1: usb@01c1c400 {

			status = "okay";

		};



		pinctrl@01c20800 {

			led_pins_cubieboard: led_pins@0 {

				allwinner,pins = "PH20", "PH21";
@@ -77,4 +105,16 @@ 
			linux,default-trigger = "heartbeat";

		};

	};



	reg_ahci_5v: ahci-5v {

		status = "okay";

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	};



	reg_usb2_vbus: usb2-vbus {

		status = "okay";

	};

};

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

+40 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


/dts-v1/;

/include/ "sun4i-a10.dtsi"

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



/ {

	model = "Miniand Hackberry";
@@ -35,6 +36,28 @@ 
			};

		};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};



		ohci0: usb@01c14400 {

			status = "okay";

		};



		ehci1: usb@01c1c000 {

			status = "okay";

		};



		ohci1: usb@01c1c400 {

			status = "okay";

		};



		pio: pinctrl@01c20800 {

			pinctrl-names = "default";

			pinctrl-0 = <&hackberry_hogs>;
@@ -45,6 +68,13 @@ 
				allwinner,drive = <0>;

				allwinner,pull = <0>;

			};



			usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {

					allwinner,pins = "PH12";

					allwinner,function = "gpio_out";

					allwinner,drive = <0>;

					allwinner,pull = <0>;

			};

		};



		uart0: serial@01c28000 {
@@ -62,4 +92,14 @@ 
		enable-active-high;

		gpio = <&pio 7 19 0>;

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	};



	reg_usb2_vbus: usb2-vbus {

		pinctrl-0 = <&usb2_vbus_pin_hackberry>;

		gpio = <&pio 7 12 0>;

		status = "okay";

	};

};

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

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

 * Copyright 2014 Open Source Support GmbH

 *

 * David Lanzendrfer <david.lanzendoerfer@o2s.ch>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "sun4i-a10.dtsi"

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



/ {

	model = "INet-97F Rev 02";

	compatible = "primux,inet97fv2", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	soc@01c00000 {

		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

			status = "okay";

		};



		i2c0: i2c@01c2ac00 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins_a>;

			status = "okay";

		};



		usbphy: phy@01c13400 {

			usb1_vbus-supply = <&reg_usb1_vbus>;

			usb2_vbus-supply = <&reg_usb2_vbus>;

			status = "okay";

		};



		ehci0: usb@01c14000 {

			status = "okay";

		};



		ohci0: usb@01c14400 {

			status = "okay";

		};



		ehci1: usb@01c1c000 {

			status = "okay";

		};



		ohci1: usb@01c1c400 {

			status = "okay";

		};

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	};



	reg_usb2_vbus: usb2-vbus {

		status = "okay";

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE