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

Commit 1a66b851 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-4.9-3' of... 

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

Pull "Allwinner DT changes for 4.9, late edition" from Maxime Ripard:

Here is a bunch of late changes for the 4.9 merge window, mostly:
  - Added a bunch of touchscreens nodes to tablets
  - Added support for the AXP806 PMIC found in the A80 boards
  - Enabled a few pinmux options for the H3

* tag 'sunxi-dt-for-4.9-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun8i: Add accelerometer to polaroid-mid2407pxe03
  ARM: dts: sun8i: enable UART1 for iNet D978 Rev2 board
  ARM: dts: sun8i: add pinmux for UART1 at PG
  dts: sun8i-h3: add I2C0-2 peripherals to H3 SOC
  dts: sun8i-h3: add pinmux definitions for I2C0-2
  dts: sun8i-h3: associate exposed UARTs on Orange Pi Boards
  dts: sun8i-h3: split off RTS/CTS for UART1 in seperate pinmux
  dts: sun8i-h3: add pinmux definitions for UART2-3
  ARM: dts: sun9i: a80-optimus: Disable EHCI1
  ARM: dts: sun9i: cubieboard4: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: a80-optimus: Add AXP806 PMIC device node and regulators
  ARM: dts: sun9i: cubieboard4: Declare AXP809 SW regulator as unused
  ARM: dts: sun9i: a80-optimus: Declare AXP809 SW regulator as unused
  ARM: dts: sun8i: Add touchscreen node for sun8i-a33-ga10h
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2809pxe04
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-polaroid-mid2407pxe03
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-inet86dz
  ARM: dts: sun8i: Add touchscreen node for sun8i-a23-gt90h
parents c3a66272 90cb4b8c

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -279,6 +279,16 @@ 
				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

			};



			uart1_pins_a: uart1@0 {

				allwinner,pins = "PG6", "PG7";

				allwinner,function = "uart1";

			};



			uart1_pins_cts_rts_a: uart1-cts-rts@0 {

				allwinner,pins = "PG8", "PG9";

				allwinner,function = "uart1";

			};



			mmc0_pins_a: mmc0@0 {

				allwinner,pins = "PF0", "PF1", "PF2",

						 "PF3", "PF4", "PF5";

arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ 
	status = "okay";

};



&touchscreen {

	reg = <0x40>;

	compatible = "silead,gsl3675";

	firmware-name = "gsl3675-gt90h.fw";

	touchscreen-size-x = <1792>;

	touchscreen-size-y = <1024>;

	status = "okay";

};



&lradc {

	button@600 {

		label = "Back";

arch/arm/boot/dts/sun8i-a23-inet86dz.dts

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ 
	status = "okay";

};



&touchscreen {

	reg = <0x40>;

	compatible = "silead,gsl1680";

	firmware-name = "gsl1680-inet86dz.fw";

	touchscreen-size-x = <960>;

	touchscreen-size-y = <640>;

	status = "okay";

};



&usbphy {

	usb1_vbus-supply = <&reg_dldo1>;

};

arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts

+26 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ 
	};

};



&i2c1 {

	mma7660: accelerometer@4c {

		reg = <0x4c>;

		compatible = "fsl,mma7660";

	};

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins_a>;
@@ -90,3 +97,22 @@ 
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&reg_ldo_io1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-touchscreen";

	status = "okay";

};



&touchscreen {

	reg = <0x40>;

	compatible = "silead,gsl1680";

	firmware-name = "gsl1680-polaroid-mid2407pxe03.fw";

	touchscreen-size-x = <960>;

	touchscreen-size-y = <640>;

	touchscreen-inverted-x;

	touchscreen-inverted-y;

	vddio-supply = <&reg_ldo_io1>;

	status = "okay";

};

arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts

+9 −0
Original line number Diff line number Diff line
@@ -90,3 +90,12 @@ 
		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&touchscreen {

	reg = <0x40>;

	compatible = "silead,gsl3670";

	firmware-name = "gsl3670-polaroid-mid2809pxe04.fw";

	touchscreen-size-x = <1660>;

	touchscreen-size-y = <890>;

	status = "okay";

};