Unverified Commit d69af478 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-6.20' of... 

Merge tag 'sunxi-dt-for-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt

Allwinner device tree changes for 6.20

Not many changes this cycle.

- The A523 family of SoCs gained support for SPI controllers.
- Some cleanup of old ARM device tree files to fix DT binding validation
  errors.
- D1 and A100 SoCs gained support for their LED controller. This was
  from a couple years ago. The driver made it in, but the DT patches
  were missed.
- D1 and T113 SoCs gained support for the internal thermal sensor.

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

:
  riscv: dts: allwinner: d1: Add CPU thermal sensor and zone
  ARM: dts: allwinner: Replace status "failed" with "fail"
  riscv: dts: allwinner: d1: Add RGB LEDs to boards
  riscv: dts: allwinner: d1: Add LED controller node
  arm64: dts: allwinner: a100: Add LED controller node
  ARM: dts: allwinner: sun5i-a13-utoo-p66: delete "power-gpios" property
  arm64: dts: allwinner: t527: orangepi-4a: Enable SPI-NOR flash
  arm64: dts: allwinner: sun55i: Add SPI controllers

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 91e93edc f36e7385

arch/arm/boot/dts/allwinner/sun4i-a10-dserve-dsrv9703c.dts

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ axp209: pmic@34 { 


&i2c1 {

	/* pull-ups and devices require AXP209 LDO3 */

	status = "failed";

	status = "fail";

};



&i2c2 {

arch/arm/boot/dts/allwinner/sun4i-a10-pov-protab2-ips9.dts

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ axp209: pmic@34 { 


&i2c1 {

	/* pull-ups and devices require AXP209 LDO3 */

	status = "failed";

	status = "fail";

};



&i2c2 {

arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ &touchscreen { 
	/* The P66 uses a different EINT then the reference design */

	interrupts = <6 9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */

	/* The icn8318 binding expects wake-gpios instead of power-gpios */

	/delete-property/ power-gpios;

	wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */

	touchscreen-size-x = <800>;

	touchscreen-size-y = <480>;

arch/arm/boot/dts/allwinner/sun6i-a31-hummingbird.dts

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ hdmi_out_con: endpoint { 


&i2c0 {

	/* pull-ups and devices require AXP221 DLDO3 */

	status = "failed";

	status = "fail";

};



&i2c1 {

arch/arm/boot/dts/allwinner/sun6i-a31s-primo81.dts

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ hdmi_out_con: endpoint { 


&i2c0 {

	/* pull-ups and device VDDIO use AXP221 DLDO3 */

	status = "failed";

	status = "fail";

};



&i2c1 {