Skip to content

Commit 6866b78

Browse files
committed
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
2 parents ea38dfd + 0f860ee commit 6866b78

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@
731731
spi-max-frequency = <104000000>;
732732
spi-rx-bus-width = <4>;
733733
spi-tx-bus-width = <1>;
734+
vcc-supply = <&vcc_1v8_s3>;
734735
};
735736
};
736737

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
simple-audio-card,bitclock-master = <&masterdai>;
4343
simple-audio-card,format = "i2s";
4444
simple-audio-card,frame-master = <&masterdai>;
45-
simple-audio-card,hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
45+
simple-audio-card,hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
4646
simple-audio-card,mclk-fs = <256>;
47-
simple-audio-card,pin-switches = "Headphones";
4847
simple-audio-card,routing =
4948
"Headphones", "LOUT1",
5049
"Headphones", "ROUT1",

0 commit comments

Comments
 (0)