github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Another missing supply and a wrong headphone gpio level.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmjMiVUQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgcRXB/994AOVcP5KR5Xtl9De+9IcQBAaGouGIHG7
 w7DDB0yRo4YFNK2bE1u7q3ap/jpbQAezv85xkGkh4+RwxolYDW7KI7FjYyuNEC0n
 C6dqgzPV/zb0xuBbuAV8z9UYqb/Fu7tWXp/cGr4TmUpSzJdXByOuuefnJjuu0vOR
 wAeOLfplI+s8aEMaLaB1d5Huz0IlRS27eyOAjE07NKHsuVtDqZ0voO8S+QTd/7W+
 cUZo0BTAuitRWItAKRq1Bxv12jEnkvkGnw8l+iDbQwS2nRJ2NuPJ+/GQUFn53qPP
 ZjGFnOMiduJ20WbxXUHSmZfKOH7O8Dz+UQEWYfBfyLcQZ73M3ffB
 =cBeN
 -----END PGP SIGNATURE-----

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

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
This commit is contained in:
Arnd Bergmann 2025-09-23 22:32:48 +02:00
commit 6866b78566
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
View File

@ -731,6 +731,7 @@ flash@0 {
spi-max-frequency = <104000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <1>;
vcc-supply = <&vcc_1v8_s3>;
};
};

3
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
View File

@ -42,9 +42,8 @@ analog-sound {
simple-audio-card,bitclock-master = <&masterdai>;
simple-audio-card,format = "i2s";
simple-audio-card,frame-master = <&masterdai>;
simple-audio-card,hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
simple-audio-card,hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
simple-audio-card,mclk-fs = <256>;
simple-audio-card,pin-switches = "Headphones";
simple-audio-card,routing =
"Headphones", "LOUT1",
"Headphones", "ROUT1",