diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi index 33ee0046410c..22119d3b3c97 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -25,11 +25,19 @@ status = "okay"; }; +/* + * mipi_dphy0 needs to be enabled + * when dsi0 is enabled + */ &dsi0 { status = "okay"; }; -&dsi1 { +&dsi0_in_vp0 { + status = "okay"; +}; + +&dsi0_in_vp1 { status = "disabled"; }; @@ -40,6 +48,22 @@ pinctrl-0 = <&lcd0_rst_gpio>; }; +/* + * mipi_dphy1 needs to be enabled + * when dsi1 is enabled + */ +&dsi1 { + status = "disabled"; +}; + +&dsi1_in_vp0 { + status = "disabled"; +}; + +&dsi1_in_vp1 { + status = "disabled"; +}; + &dsi1_panel { power-supply = <&vcc3v3_lcd1_n>; reset-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>; @@ -101,6 +125,14 @@ }; }; +&mipi_dphy0 { + status = "okay"; +}; + +&mipi_dphy1 { + status = "disabled"; +}; + &pdm { status = "disabled"; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts index 975fca9062b1..a0f3fa43a618 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dts @@ -23,6 +23,52 @@ }; }; +/* + * mipi_dphy0 needs to be enabled + * when dsi0 is enabled + */ +&dsi0 { + status = "okay"; +}; + +&dsi0_in_vp0 { + status = "okay"; +}; + +&dsi0_in_vp1 { + status = "disabled"; +}; + +&dsi0_panel { + power-supply = <&vcc3v3_lcd0_n>; + reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&lcd0_rst_gpio>; +}; + +/* + * mipi_dphy1 needs to be enabled + * when dsi1 is enabled + */ +&dsi1 { + status = "disabled"; +}; + +&dsi1_in_vp0 { + status = "disabled"; +}; + +&dsi1_in_vp1 { + status = "disabled"; +}; + +&dsi1_panel { + power-supply = <&vcc3v3_lcd1_n>; + reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&lcd1_rst_gpio>; +}; + &gmac1 { phy-mode = "rgmii"; clock_in_out = "output"; @@ -53,27 +99,7 @@ }; }; -&dsi0 { - status = "okay"; -}; -&dsi1 { - status = "disabled"; -}; - -&dsi0_panel { - power-supply = <&vcc3v3_lcd0_n>; - reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd0_rst_gpio>; -}; - -&dsi1_panel { - power-supply = <&vcc3v3_lcd1_n>; - reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd1_rst_gpio>; -}; /* * power-supply should switche to vcc3v3_lcd1_n @@ -83,6 +109,14 @@ power-supply = <&vcc3v3_lcd0_n>; }; +&mipi_dphy0 { + status = "okay"; +}; + +&mipi_dphy1 { + status = "disabled"; +}; + &pinctrl { headphone { hp_det: hp-det { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts index bc1b5eab9b3f..f2fdf4abf02e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dts @@ -23,6 +23,22 @@ }; }; +/* + * mipi_dphy0 needs to be enabled + * when dsi0 is enabled + */ +&dsi0 { + status = "okay"; +}; + +&dsi0_in_vp0 { + status = "okay"; +}; + +&dsi0_in_vp1 { + status = "disabled"; +}; + &dsi0_panel { power-supply = <&vcc3v3_lcd0_n>; reset-gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>; @@ -49,6 +65,10 @@ &i2s3sdom1>; }; +&mipi_dphy0 { + status = "okay"; +}; + &rk809_codec { #sound-dai-cells = <0>; compatible = "rockchip,rk809-codec", "rockchip,rk817-codec"; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi index 6b60f8d01ad4..a4e0d1f8dc9e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -306,7 +306,7 @@ }; &dsi0 { - status = "okay"; + status = "disabled"; //rockchip,lane-rate = <1000>; dsi0_panel: panel@0 { status = "okay"; @@ -637,14 +637,6 @@ }; -&dsi0_in_vp0 { - status = "okay"; -}; - -&dsi0_in_vp1 { - status = "disabled"; -}; - &dsi1 { status = "disabled"; //rockchip,lane-rate = <1000>; @@ -977,14 +969,6 @@ }; -&dsi1_in_vp0 { - status = "disabled"; -}; - -&dsi1_in_vp1 { - status = "okay"; -}; - &gpu { mali-supply = <&vdd_gpu>; status = "okay"; @@ -1336,14 +1320,6 @@ status = "okay"; }; -&mipi_dphy0 { - status = "okay"; -}; - -&mipi_dphy1 { - status = "okay"; -}; - &nandc0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts index 67222c42ebb8..4a7b92af9803 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -88,18 +88,42 @@ status = "okay"; }; +/* + * mipi_dphy0 needs to be enabled + * when dsi0 is enabled + */ &dsi0 { status = "okay"; }; +&dsi0_in_vp0 { + status = "okay"; +}; + +&dsi0_in_vp1 { + status = "disabled"; +}; + &dsi0_panel { power-supply = <&vcc3v3_lcd0_n>; }; +/* + * mipi_dphy1 needs to be enabled + * when dsi1 is enabled + */ &dsi1 { status = "disabled"; }; +&dsi1_in_vp0 { + status = "disabled"; +}; + +&dsi1_in_vp1 { + status = "disabled"; +}; + &dsi1_panel { power-supply = <&vcc3v3_lcd1_n>; }; @@ -172,6 +196,14 @@ }; }; +&mipi_dphy0 { + status = "okay"; +}; + +&mipi_dphy1 { + status = "disabled"; +}; + &pcie2x1 { reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&pcie20_3v3>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts index e9f72c94b7b4..be8a681bcaff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dts @@ -51,11 +51,19 @@ }; }; +/* + * mipi_dphy0 needs to be enabled + * when dsi0 is enabled + */ &dsi0 { status = "okay"; }; -&dsi1 { +&dsi0_in_vp0 { + status = "okay"; +}; + +&dsi0_in_vp1 { status = "disabled"; }; @@ -63,6 +71,22 @@ power-supply = <&vcc3v3_lcd0_n>; }; +/* + * mipi_dphy1 needs to be enabled + * when dsi1 is enabled + */ +&dsi1 { + status = "disabled"; +}; + +&dsi1_in_vp0 { + status = "disabled"; +}; + +&dsi1_in_vp1 { + status = "disabled"; +}; + &dsi1_panel { power-supply = <&vcc3v3_lcd1_n>; }; @@ -75,6 +99,14 @@ power-supply = <&vcc3v3_lcd0_n>; }; +&mipi_dphy0 { + status = "okay"; +}; + +&mipi_dphy1 { + status = "disabled"; +}; + &pinctrl { headphone { hp_det: hp-det {