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

Merge tag 'sunxi-dt-for-5.1-2' of... 

Merge tag 'sunxi-dt-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

Allwinner DT changes for 5.1, take 2

Our usual bunch of DT changes for the Allwinner arm SoCs:
  - LCD support for the Q8 A13 tablets
  - GMAC support for the A80
  - PMIC power supplies for the A83t

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

:
  ARM: dts: sun8i: a83t: Enable PMIC power supplies on various boards
  ARM: dts: sun9i: cubieboard4: Enable GMAC
  ARM: dts: sun9i: a80-optimus: Enable GMAC
  ARM: dts: sun9i: Add A80 GMAC RGMII pinmux setting
  ARM: dts: sun9i: Add A80 GMAC gigabit ethernet controller node
  ARM: dts: sun9i: Add GMAC clock node
  ARM: dts: sun9i: cubieboard4: Add GPIO pin-bank regulator supplies
  ARM: dts: sun9i: a80-optimus: Add GPIO pin-bank regulator supplies
  ARM: dts: sun9i: a80-optimus: Add node for AXP809's unused dc1sw regulator
  ARM: dts: sun5i: q8-tablet: Use bananapi,s070wv20-ct16 panel compatible
  ARM: dts: sun5i: q8-tablet: Add LCD Panel power supply
  ARM: dts: sun5i: q8-tablet: Add LCD Panel enable GPIO
  ARM: dts: sun5i: q8-tablet: Move panel properties to correct node level
  ARM: dts: sun5i: Add backlight GPIO for reference design tablet

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 175a366f 185401e1

arch/arm/boot/dts/sun5i-a13-q8-tablet.dts

+4 −3
Original line number Diff line number Diff line
@@ -49,14 +49,15 @@ 
	compatible = "allwinner,q8-a13", "allwinner,sun5i-a13";



	panel: panel {

		compatible = "urt,umsh-8596md-t", "simple-panel";

		compatible = "bananapi,s070wv20-ct16", "simple-panel";

		power-supply = <&reg_vcc3v3>;

		enable-gpios = <&axp_gpio 0 GPIO_ACTIVE_HIGH>; /* AXP GPIO0 */

		backlight = <&backlight>;

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;

			/* TODO: lcd panel uses axp gpio0 as enable pin */

			backlight = <&backlight>;

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;

		default-brightness-level = <8>;

		/* TODO: backlight uses axp gpio1 as enable pin */

		enable-gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>; /* AXP GPIO1 */

	};



	chosen {

arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ 


#include "axp81x.dtsi"



&ac_power_supply {

	status = "okay";

};



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,14 @@ 


#include "axp81x.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts

+8 −0
Original line number Diff line number Diff line
@@ -247,6 +247,14 @@ 


#include "axp81x.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE