Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39cd0fbe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-3.10' of git://github.com/mripard/linux into next/dt 

From Maxime Ripard <maxime.ripard@free-electrons.com>:

Allwinner sunxi DT additions for 3.10

* tag 'sunxi-dt-for-3.10' of git://github.com/mripard/linux

:
  arm: sunxi: Add clock definitions for the new clock driver
  ARM: sunxi: dt: Add support for the PineRiver Mini X-plus
  sunxi: a10-cubieboard: Add user LEDs to the device tree
  sunxi: a13-olinuxino: Add user LED to the device tree
  sunxi: dts: Report the pinctrl nodes as gpio-controllers

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42dd8d53 2c3b4d7a

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

+26 −0
Original line number Diff line number Diff line
@@ -27,6 +27,15 @@ 
	};



	soc {

		pinctrl@01c20800 {

			led_pins_cubieboard: led_pins@0 {

				allwinner,pins = "PH20", "PH21";

				allwinner,function = "gpio_out";

				allwinner,drive = <1>;

				allwinner,pull = <0>;

			};

		};



		uart0: uart@01c28000 {

			status = "okay";

		};
@@ -35,4 +44,21 @@ 
			status = "okay";

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_cubieboard>;



		blue {

			label = "cubieboard::blue";

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

		};



		green {

			label = "cubieboard::green";

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

			linux,default-trigger = "heartbeat";

		};

	};

};

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

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

 * Copyright 2012 Maxime Ripard

 *

 * Maxime Ripard <maxime.ripard@free-electrons.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"



/ {

	model = "PineRiver Mini X-Plus";

	compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";



	chosen {

		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc {

		uart0: uart@01c28000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins_a>;

			status = "okay";

		};

	};

};

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

+3 −1
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ 
	};



	soc {

		pinctrl@01c20800 {

		pio: pinctrl@01c20800 {

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

			reg = <0x01c20800 0x400>;

			gpio-controller;

			#address-cells = <1>;

			#size-cells = <0>;

			#gpio-cells = <3>;



			uart0_pins_a: uart0@0 {

				allwinner,pins = "PB22", "PB23";

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

+20 −0
Original line number Diff line number Diff line
@@ -23,10 +23,30 @@ 
	};



	soc {

		pinctrl@01c20800 {

			led_pins_olinuxino: led_pins@0 {

				allwinner,pins = "PG9";

				allwinner,function = "gpio_out";

				allwinner,drive = <1>;

				allwinner,pull = <0>;

			};

		};



		uart1: uart@01c28400 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart1_pins_b>;

			status = "okay";

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_olinuxino>;



		power {

			gpios = <&pio 6 9 0>;

			default-state = "on";

		};

	};

};

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

+3 −1
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ 
	};



	soc {

		pinctrl@01c20800 {

		pio: pinctrl@01c20800 {

			compatible = "allwinner,sun5i-a13-pinctrl";

			reg = <0x01c20800 0x400>;

			gpio-controller;

			#address-cells = <1>;

			#size-cells = <0>;

			#gpio-cells = <3>;



			uart1_pins_a: uart1@0 {

				allwinner,pins = "PE10", "PE11";