riscv: dts: enable hdmi dts config in uboot

hdmi can show a bitmap logo while uboot start
and the default resolution is 1920x1080@60fps

Signed-off-by: keith.zhao<keith.zhao@statfivetech.com>

2 files changed, 13 insertions, 46 deletions

diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi
index 9e5b0576f9..cf9a1eebb2 100644
--- a/arch/riscv/dts/jh7110.dtsi
+++ b/arch/riscv/dts/jh7110.dtsi
@@ -1335,38 +1335,20 @@
 					remote-endpoint = <&hdmi_in_vopb>;
 				};
 
-				vopb_out_lvds: endpoint@2 {
-					reg = <2>;
-					remote-endpoint = <&lvds_in_vopb>;
-				};
-
-				vopb_out_edp: endpoint@3 {
-					reg = <3>;
-					remote-endpoint = <&edp_in_vopb>;
-				};
-			};
-		};
-
-		edp: edp@29600000 {
-			compatible = "rockchip,rk3288-edp";
-			reg = <0x0 0x29600000 0x0 0x4000>;
-			status = "okay";
-			ports {
-				edp_in: port {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					edp_in_vopb: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&vopb_out_edp>;
-					};
-				};
 			};
 		};
 
 		hdmi: hdmi@29590000 {
-			compatible = "rockchip,rk3288-dw-hdmi";
+			compatible = "starfive,inno-hdmi";
 			reg = <0x0 0x29590000 0x0 0x4000>;
 			status = "okay";
+			clocks = <&clkvout JH7110_U0_HDMI_TX_CLK_SYS>,
+				 <&clkvout JH7110_U0_HDMI_TX_CLK_MCLK>,
+				 <&clkvout JH7110_U0_HDMI_TX_CLK_BCLK>;
+			clock-names = "sysclk", "mclk","bclk";
+			resets = <&rstgen RSTN_U0_HDMI_TX_HDMI>;
+			reset-names = "hdmi_tx";
+
 			ports {
 				hdmi_in: port {
 					#address-cells = <1>;
@@ -1379,25 +1361,6 @@
 			};
 		};
 
-		lvds: lvds@ff96c000 {
-			compatible = "rockchip,rk3288-lvds";
-			reg = <0x0 0xff96c000 0x0 0x4000>;
-			status = "okay";
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				lvds_in: port@0 {
-					reg = <0>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-					lvds_in_vopb: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&vopb_out_lvds>;
-					};
-				};
-			};
-		};
-
 		mipi_dsi0: mipi@295d0000 {
 			compatible = "starfive,sf_mipi_dsi";
 			reg = <0x0 0x295d0000 0x0 0x10000>,
diff --git a/arch/riscv/dts/starfive_evb.dts b/arch/riscv/dts/starfive_evb.dts
index dcccb48a39..6f865f7094 100644
--- a/arch/riscv/dts/starfive_evb.dts
+++ b/arch/riscv/dts/starfive_evb.dts
@@ -340,7 +340,6 @@
 
 
 &mipi_dsi0 {
-
 	status = "okay";
 	rockchip,panel = <&rm68200_panel>;
 	data-lanes-num = <1>;
@@ -365,6 +364,11 @@
 
 };
 
+&hdmi{
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdmi_pins>;
+	status = "okay";
+};
 
 &i2c2 {
 	clock-frequency = <100000>;