diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opi5pro-lcd.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opi5pro-lcd.dts index 04ece31f0970..074a7355dcb4 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3588-opi5pro-lcd.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3588-opi5pro-lcd.dts @@ -22,67 +22,4 @@ status = "okay"; }; }; - - fragment@3 { - target = <&hdmi0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@4 { - target = <&hdmi0_sound>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@5 { - target = <&hdptxphy_hdmi0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@6 { - target = <&route_hdmi0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@7 { - target = <&dp0>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@8 { - target = <&dp0_in_vp1>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@9 { - target = <&dp0_in_vp2>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@10 { - target = <&dp0_sound>; - __overlay__ { - status = "disabled"; - }; - }; - - fragment@11 { - target = <&spdif_tx2>; - __overlay__ { - status = "disabled"; - }; - }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro-camera1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro-camera1.dtsi index 177dce0f2a2e..6f4231e157a2 100755 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro-camera1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro-camera1.dtsi @@ -4,10 +4,6 @@ * */ -&csi2_dphy0_hw { - status = "disabled"; -}; - &csi2_dphy0 { status = "disabled"; ports { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts index fb03bad0c9e2..6df11ebd1477 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts @@ -712,7 +712,7 @@ status = "okay"; #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; - reg = <0x10>; + reg = <0x11>; clocks = <&mclkout_i2s2>; clock-names = "mclk"; assigned-clocks = <&mclkout_i2s2>; @@ -749,9 +749,9 @@ compatible = "goodix,gt9271"; reg = <0x14>; interrupt-parent = <&gpio0>; - interrupts = ; - irq-gpios = <&gpio0 RK_PD3 IRQ_TYPE_LEVEL_LOW>; - reset-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + interrupts = ; + irq-gpios = <&gpio0 RK_PD4 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; touchscreen-inverted-x; //touchscreen-inverted-y; touchscreen-swapped-x-y; @@ -763,6 +763,10 @@ &i2s2_2ch { status = "okay"; + pinctrl-0 = <&i2s2m1_lrck + &i2s2m1_sclk + &i2s2m1_sdi + &i2s2m1_sdo>; }; &i2s5_8ch {