Commit 6866b785 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.17-rockchip-dtsfixes2' of... 

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
parents ea38dfdd 0f860eef

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

+1 −0
Original line number Diff line number Diff line
@@ -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>;

	};

};

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

+1 −2
Original line number Diff line number Diff line
@@ -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",