Commit 3264c72d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt64-for-5.3-201906210808' of... 

Merge tag 'sunxi-dt64-for-5.3-201906210808' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

Our usual bunch of arm64 DT changes, this time with:
  - Some fixes for the DT schemas that were added during this release
  - Wifi support for the H6
  - LRADC suppport for the A64
  - Some background work on A64 boards, to enable various devices such
    as touchscreens, PMIC, audio, wifi, etc.

* tag 'sunxi-dt64-for-5.3-201906210808' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: dts: allwinner: h6: Add DMA node
  arm64: dts: allwinner: a64: Add lradc node
  dt-bindings: input: sun4i-lradc-keys: Add A64 compatible
  arm64: dts: allwinner: h6: add r_watchog node
  arm64: dts: allwinner: h6: add watchdog node
  dt-bindings: watchdog: add Allwinner H6 watchdog
  arm64: dts: allwinner: a64: Enable audio on Teres-I
  arm64: dts: allwinner: a64: bananapi-m64: Enable PMIC USB power supply
  arm64: dts: allwinner: axp803: add USB power supply node
  arm64: dts: allwinner: a64: Add pinmux for RGB666 LCD
  arm64: dts: allwinner: a64: orangepi-win: Add wifi and bluetooth nodes
  arm64: dts: allwinner: h6: add PIO VCC bank supplies for Pine H64
  arm64: dts: allwinner: a64-oceanic-5205-5inmfd: Enable GT911 CTP
  arm64: dts: allwinner: a64-amarula-relic: Add GT5663 CTP node
  arm64: dts: allwinner: a64: move I2C pinctrl to dtsi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d12a73cf 9164665a

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
 - compatible: should be one of the following string:

		"allwinner,sun4i-a10-lradc-keys"

		"allwinner,sun8i-a83t-r-lradc"

		"allwinner,sun50i-a64-lradc", "allwinner,sun8i-a83t-r-lradc"

 - reg: mmio address range of the chip

 - interrupts: interrupt to which the chip is connected

 - vref-supply: powersupply for the lradc reference voltage

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"allwinner,sun4i-a10-wdt"

	"allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-h6-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"

- reg : Specifies base physical address and size of the registers.

arch/arm64/boot/dts/allwinner/axp803.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -185,4 +185,10 @@ 
			status = "disabled";

		};

	};



	usb_power_supply: usb-power-supply {

		compatible = "x-powers,axp803-usb-power-supply",

			     "x-powers,axp813-usb-power-supply";

		status = "disabled";

	};

};

arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts

+23 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ 
};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	status = "okay";



	sensor@48 {
@@ -99,6 +97,22 @@ 
	bias-pull-up;

};



&i2c1 {

	status = "okay";



	touchscreen@5d {

		compatible = "goodix,gt5663";

		reg = <0x5d>;

		AVDD28-supply = <&reg_ldo_io0>;			/* VCC-CTP: GPIO0-LDO */

		interrupt-parent = <&pio>;

		interrupts = <7 4 IRQ_TYPE_EDGE_FALLING>;

		irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>;	/* CTP-INT: PH4 */

		reset-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>;	/* CTP-RST: PH8 */

		touchscreen-inverted-x;

		touchscreen-inverted-y;

	};

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;
@@ -262,6 +276,13 @@ 
	regulator-name = "vdd-cpus";

};



&reg_ldo_io0 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-name = "vcc-ctp";

	status = "okay";

};



&reg_rtc_ldo {

	regulator-name = "vcc-rtc";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+5 −2
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

};
@@ -394,8 +392,13 @@ 
	status = "okay";

};



&usb_power_supply {

	status = "okay";

};



&usbphy {

	usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */

	usb0_vbus_power-supply = <&usb_power_supply>;

	usb0_vbus-supply = <&reg_drivevbus>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE