From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 23 Sep 2025 20:26:59 +0000 (+0200)
Subject: Merge tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18-rc1~147^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f1bbcc46ecdee8fa4fa10b31db839dcc750282f;p=thirdparty%2Flinux.git

Merge tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

Another missing supply and a wrong headphone gpio level.

* tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix the headphone detection on the orangepi 5
  arm64: dts: rockchip: Add vcc supply for SPI Flash on NanoPC-T6
  arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
  arm64: dts: rockchip: fix USB on RADXA ROCK 5T
  arm64: dts: rockchip: Add vcc-supply to SPI flash on Pinephone Pro
  arm64: dts: rockchip: fix es8388 address on rk3588s-roc-pc
  arm64: dts: rockchip: Fix Bluetooth interrupts flag on Neardi LBA3368
  arm64: dts: rockchip: correct network description on Sige5
  arm64: dts: rockchip: Minor whitespace cleanup
  ARM: dts: rockchip: Minor whitespace cleanup
  arm64: dts: rockchip: Add supplies for eMMC on rk3588-orangepi-5
  arm64: dts: rockchip: Fix the headphone detection on the orangepi 5 plus
  arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-pinebook-pro
  arm64: dts: rockchip: mark eeprom as read-only for Radxa E52C
---

9f1bbcc46ecdee8fa4fa10b31db839dcc750282f
diff --cc arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
index 217954767845a,f16ff0064309a..c1763835f53d4
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
@@@ -97,10 -119,9 +119,14 @@@
  	};
  
  	usb {
+ 		vcc5v0_host_en: vcc5v0-host-en {
+ 			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+ 		};
++
 +		usbc_sbu_dc: usbc-sbu-dc {
 +			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
 +					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
 +		};
  	};
  };