]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 23 Sep 2025 20:26:59 +0000 (22:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 23 Sep 2025 20:26:59 +0000 (22:26 +0200)
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

1  2 
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi

index 217954767845a73c7462a71c27c724f1309144eb,f16ff0064309ae0d88d82d2d7deec15c9ceb8cdb..c1763835f53d485d06fa2fd51a11e1599f72da16
        };
  
        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>;
 +              };
        };
  };