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

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

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

From Maxime Ripard:
Allwinner sunXi DT additions for 3.9

* tag 'sunxi-dt-for-3.9' of https://github.com/mripard/linux:
  sunxi: a13-olinuxino: Add user LED to the device tree
  sunxi: a10-cubieboard: Add user LEDs to the device tree
  ARM: sunxi: Add device tree for Miniand Hackberry
parents dd8b5c8d 867dc8be

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ 
	spear320-hmi.dtb

	spear320-hmi.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \

	sun4i-a10-hackberry.dtb \

	sun5i-a13-olinuxino.dtb

	sun5i-a13-olinuxino.dtb

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

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

	tegra20-iris-512.dtb \

	tegra20-iris-512.dtb \

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

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

	};





	soc {

	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 {

		uart0: uart@01c28000 {

			status = "okay";

			status = "okay";

		};

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

			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-hackberry.dts

0 → 100644
+30 −0
Original line number Original line 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 = "Miniand Hackberry";

	compatible = "miniand,hackberry", "allwinner,sun4i-a10";



	chosen {

		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc {

		uart0: uart@01c28000 {

			status = "okay";

		};

	};

};

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

+20 −0
Original line number Original line Diff line number Diff line
@@ -23,8 +23,28 @@ 
	};

	};





	soc {

	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 {

		uart1: uart@01c28400 {

			status = "okay";

			status = "okay";

		};

		};

	};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_olinuxino>;



		power {

			gpios = <&pio 6 9 0>;

			default-state = "on";

		};

	};

};
 
};