Commit ef2fd3b1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux into late/all 

From Maxime Ripard:
Allwinner DT changes for 3.12, take 3 and 4

These patches add support for:
  - The cubieboard2 board
  - The pinctrl driver that got merged for the A20 and A31
  - The associated muxing for the A20 and A31 boards already supported
  - Enables the gated clocks on the A10s, A20 and A31 DTSI.

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

:
  ARM: sun7i: Enable the A20 clocks in the DTSI
  ARM: sun6i: Enable clock support in the DTSI
  ARM: sun5i: dt: Use the A10s gates in the DTSI
  ARM: sun7i: Add Cubieboard2 Device Tree
  ARM: sun7i: a20-olinuxino: Enable the user LED
  ARM: sun7i: a20-olinuxino: Enable UARTs muxing
  ARM: sun7i: DT: Add UART muxing options to the DTSI
  ARM: sun7i: Add the PIO controller node to the DTSI
  ARM: sun6i: colombus: Add uart0 muxing
  ARM: sun6i: Add UART0 muxing options
  ARM: sunxi: dt: Add PIO controller to A31 DTSI

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6229f0fc de7dc935

arch/arm/boot/dts/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -207,11 +207,15 @@ dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \ 
	stih415-b2020.dtb \

	stih416-b2020.dtb

dtb-$(CONFIG_ARCH_SUNXI) += \

	sun4i-a10-a1000.dtb \

	sun4i-a10-cubieboard.dtb \

	sun4i-a10-mini-xplus.dtb \

	sun4i-a10-hackberry.dtb \

	sun5i-a10s-olinuxino-micro.dtb \

	sun5i-a13-olinuxino.dtb

	sun5i-a13-olinuxino.dtb \

	sun6i-a31-colombus.dtb \

	sun7i-a20-cubieboard2.dtb \

	sun7i-a20-olinuxino-micro.dtb

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

	tegra20-iris-512.dtb \

	tegra20-medcom-wide.dtb \

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

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

 * Copyright 2013 Emilio López

 *

 * Emilio López <emilio@elopez.com.ar>

 *

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



/ {

	model = "Mele A1000";

	compatible = "mele,a1000", "allwinner,sun4i-a10";



	aliases {

		serial0 = &uart0;

	};



	soc@01c00000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&emac_pins_a>;

			phy = <&phy1>;

			status = "okay";

		};



		mdio@01c0b080 {

			phy-supply = <&reg_emac_3v3>;

			status = "okay";



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};



		pinctrl@01c20800 {

			emac_power_pin_a1000: emac_power_pin@0 {

				allwinner,pins = "PH15";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

			};



			led_pins_a1000: led_pins@0 {

				allwinner,pins = "PH10", "PH20";

				allwinner,function = "gpio_out";

				allwinner,drive = <0>;

				allwinner,pull = <0>;

			};

		};



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

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_a1000>;



		red {

			label = "a1000:red:usr";

			gpios = <&pio 7 10 0>;

		};



		blue {

			label = "a1000:blue:usr";

			gpios = <&pio 7 20 0>;

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_emac_3v3: emac-3v3 {

			compatible = "regulator-fixed";

			pinctrl-names = "default";

			pinctrl-0 = <&emac_power_pin_a1000>;

			regulator-name = "emac-3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			enable-active-high;

			gpio = <&pio 7 15 0>;

		};

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc@01c20000 {

	soc@01c00000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&emac_pins_a>;
@@ -76,12 +76,12 @@ 
		pinctrl-0 = <&led_pins_cubieboard>;



		blue {

			label = "cubieboard::blue";

			label = "cubieboard:blue:usr";

			gpios = <&pio 7 21 0>; /* LED1 */

		};



		green {

			label = "cubieboard::green";

			label = "cubieboard:green:usr";

			gpios = <&pio 7 20 0>; /* LED2 */

			linux,default-trigger = "heartbeat";

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc@01c20000 {

	soc@01c00000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&emac_pins_a>;

arch/arm/boot/dts/sun4i-a10-mini-xplus.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc@01c20000 {

	soc@01c00000 {

		uart0: serial@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE