Commit 15bebad6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Merge "Allwinner DT additions for 3.17" from Maxime Ripard:

Among the few patches that we have so far, there's a few noticeable changes:
 - Introduction of the Allwinner A23 SoC
 - Support for the GMAC on the A31. This is only available so far on the
   boards which bootloader enable the PHY regulator.
 - Addition of the infrared receiver

* tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

: (22 commits)
  ARM: dts: sun6i: Add Merrii A31 Hummingbird support
  ARM: dts: sun6i: Add ethernet alias for GMAC
  ARM: dts: sun6i: Add A31 GMAC gigabit ethernet controller node
  ARM: dts: sun6i: Add GMAC clock node to the A31 dtsi
  ARM: dts: sun6i: Add pin muxing options for GMAC
  ARM: sun8i: Add PRCM clock and reset controller nodes to the DTSI
  ARM: sun8i: Add reset controller nodes to the DTSI
  ARM: sun8i: Add basic clock nodes to the DTSI
  ARM: dts: sun4i: Add ir node to various boards
  ARM: dts: sun4i: Add ir controller nodes and pinmux
  ARM: dts: sun4i: Add new ba10-tvbox board
  ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3
  ARM: dts: sun7i: Add ir receiver support to a20-i12-tvbox
  ARM: dts: sun7i: Rename sun7i-a20-ir to sun4i-a10-ir
  ARM: dts: sun7i: Add AXP209 support to various boards
  ARM: dts: sun4i: Add AXP209 support to various boards
  ARM: dts: sunxi: Add #interrupt-cells to pinctrl nodes
  ARM: sun8i: dt: Add Ippo-q8h v5 support
  ARM: sunxi: Add Allwinner A23 dtsi
  ARM: sunxi: Add IR controllers on A20 to dtsi
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 73034623 c220aec2

arch/arm/boot/dts/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \ 
	stih416-b2020e.dtb

dtb-$(CONFIG_MACH_SUN4I) += \

	sun4i-a10-a1000.dtb \

	sun4i-a10-ba10-tvbox.dtb \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-hackberry.dtb \
@@ -395,12 +396,16 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
dtb-$(CONFIG_MACH_SUN6I) += \

	sun6i-a31-app4-evb1.dtb \

	sun6i-a31-colombus.dtb \

	sun6i-a31-hummingbird.dtb \

	sun6i-a31-m9.dtb

dtb-$(CONFIG_MACH_SUN7I) += \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-cubietruck.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-olinuxino-micro.dtb

	sun7i-a20-olinuxino-micro.dtb \

	sun7i-a20-pcduino3.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-ippo-q8h-v5.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

	tegra20-iris-512.dtb \

	tegra20-medcom-wide.dtb \

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

+15 −0
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@ 
			};

		};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;
@@ -98,6 +104,15 @@ 
			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>;

			};

		};

	};

arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

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

 * Copyright 2014 Hans de Goede <hdegoede@redhat.com>

 *

 * 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 = "BA10 tvbox";

	compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10";



	soc@01c00000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&emac_pins_a>;

			phy = <&phy1>;

			status = "okay";

		};



		mdio@01c0b080 {

			status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};



		mmc0: mmc@01c0f000 {

			pinctrl-names = "default";

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

			vmmc-supply = <&reg_vcc3v3>;

			bus-width = <4>;

			cd-gpios = <&pio 7 1 0>; /* PH1 */

			cd-inverted;

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

		};



		pinctrl@01c20800 {

			usb2_vbus_pin_a: usb2_vbus_pin@0 {

				allwinner,pins = "PH12";

			};

		};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



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



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupts = <0>;



				interrupt-controller;

				#interrupt-cells = <1>;

			};

		};

	};



	reg_usb1_vbus: usb1-vbus {

		status = "okay";

	};



	reg_usb2_vbus: usb2-vbus {

		gpio = <&pio 7 12 0>;

		status = "okay";

	};

};

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

+15 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ 
			};

		};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;
@@ -90,6 +96,15 @@ 
			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 {

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

+21 −0
Original line number Diff line number Diff line
@@ -87,11 +87,32 @@ 
			};

		};



		ir0: ir@01c21800 {

			pinctrl-names = "default";

			pinctrl-0 = <&ir0_pins_a>;

			status = "okay";

		};



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



			axp209: pmic@34 {

				compatible = "x-powers,axp209";

				reg = <0x34>;

				interrupts = <0>;



				interrupt-controller;

				#interrupt-cells = <1>;

			};

		};

	};



	reg_emac_3v3: emac-3v3 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE