From d62fb9e0be1b6776df8545e0e19103eda039fc8f Mon Sep 17 00:00:00 2001 From: "keith.zhao" Date: Mon, 31 Oct 2022 17:50:48 +0800 Subject: [PATCH] riscv:linux:vout:mipi mipi dsi driver add 800*1280 panel: update dts and config Signed-off-by: keith --- arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 14 ++++++ .../boot/dts/starfive/jh7110-visionfive-v2.dtsi | 50 ++++++++++++++++++++-- arch/riscv/boot/dts/starfive/jh7110.dtsi | 13 ------ arch/riscv/configs/starfive_visionfive2_defconfig | 1 + 4 files changed, 61 insertions(+), 17 deletions(-) mode change 100644 => 100755 arch/riscv/boot/dts/starfive/jh7110-common.dtsi mode change 100644 => 100755 arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi mode change 100644 => 100755 arch/riscv/configs/starfive_visionfive2_defconfig diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi old mode 100644 new mode 100755 index 933f000..a399acf --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -706,6 +706,20 @@ &mipi_dsi { status = "okay"; + + port { + dsi_out_port: endpoint@0 { + remote-endpoint = <&panel_dsi_port>; + }; + dsi_in_port: endpoint@1 { + remote-endpoint = <&mipi_out>; + }; + }; + + mipi_panel: panel@0 { + /*compatible = "";*/ + status = "okay"; + }; }; &mipi_dphy { diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi old mode 100644 new mode 100755 index 53706a5..a666fd0 --- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi @@ -400,12 +400,25 @@ reg = <0x45>; port { - panel_dsi_port: endpoint { - remote-endpoint = <&dsi_out_port>; + panel_out0: endpoint { + remote-endpoint = <&dsi0_output>; }; }; }; + panel_radxa@22 { + compatible ="starfive_jadard"; + reg = <0x22>; + reset-gpio = <&gpio 23 0>; + enable-gpio = <&gpio 22 0>; + + port { + panel_out1: endpoint { + remote-endpoint = <&dsi1_output>; + }; + }; + }; + }; &i2c5 { @@ -700,7 +713,7 @@ }; &rgb_output { - status = "okay"; + status = "disabled"; ports { #address-cells = <1>; @@ -733,7 +746,7 @@ port@1 { reg = <1>; - mipi_out: endpoint { + sf_dpi_output: endpoint { remote-endpoint = <&dsi_in_port>; }; }; @@ -742,6 +755,35 @@ &mipi_dsi { status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + dsi0_output: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_out0>; + }; + + dsi1_output: endpoint@1 { + reg = <1>; + remote-endpoint = <&panel_out1>; + }; + }; + + port@1{ + reg = <1>; + dsi_in_port: endpoint { + remote-endpoint = <&sf_dpi_output>; + }; + }; + + }; }; &mipi_dphy { diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 756006d..ce323e0 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -1663,19 +1663,6 @@ phy-names = "dphy"; status = "disabled"; - port { - dsi_out_port: endpoint@0 { - remote-endpoint = <&panel_dsi_port>; - }; - dsi_in_port: endpoint@1 { - remote-endpoint = <&mipi_out>; - }; - }; - - mipi_panel: panel@0 { - /*compatible = "";*/ - status = "okay"; - }; }; hdmi: hdmi@29590000 { diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig old mode 100644 new mode 100755 index 3d6b739..c256890 --- a/arch/riscv/configs/starfive_visionfive2_defconfig +++ b/arch/riscv/configs/starfive_visionfive2_defconfig @@ -188,6 +188,7 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_STF_VIN=y CONFIG_VIN_SENSOR_IMX219=y +CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=y CONFIG_DRM_VERISILICON=y CONFIG_STARFIVE_INNO_HDMI=y CONFIG_STARFIVE_DSI=y -- 2.7.4