[v2] arm64: dts: rockchip: add rk3399 hdmi nodes

Commit Message

Jacob Chen July 31, 2017, 3:58 p.m. UTC

Add an hdmi node, and also add hdmi endpoints to vopb and vopl
output port nodes.

changes in v2:
 - remove spare lines

Signed-off-by: Jacob Chen <[e-mail]>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Comments

Heiko Stuebner Aug. 6, 2017, 2:03 p.m. UTC | #1

Am Montag, 31. Juli 2017, 23:58:45 CEST schrieb Jacob Chen:
> Add an hdmi node, and also add hdmi endpoints to vopb and vopl
> output port nodes.
> 
> changes in v2:
>  - remove spare lines
> 
> Signed-off-by: Jacob Chen <[e-mail]>

applied for 4.14 with some property reordering


Thanks
Heiko

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 5c5c9d9..3906471 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1485,6 +1485,10 @@ 
 				remote-endpoint = <&edp_in_vopl>;
 			};
 
+			vopl_out_hdmi: endpoint@2 {
+				reg = <2>;
+				remote-endpoint = <&hdmi_in_vopl>;
+			};
 		};
 	};
 
@@ -1526,6 +1530,10 @@ 
 				remote-endpoint = <&mipi_in_vopb>;
 			};
 
+			vopb_out_hdmi: endpoint@2 {
+				reg = <2>;
+				remote-endpoint = <&hdmi_in_vopb>;
+			};
 		};
 	};
 
@@ -1541,6 +1549,33 @@ 
 		status = "disabled";
 	};
 
+	hdmi: hdmi@ff940000 {
+		compatible = "rockchip,rk3399-dw-hdmi";
+		reg = <0x0 0xff940000 0x0 0x20000>;
+		reg-io-width = <4>;
+		rockchip,grf = <&grf>;
+		power-domains = <&power RK3399_PD_HDCP>;
+		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
+		clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, <&cru PLL_VPLL>, <&cru PCLK_VIO_GRF>;
+		clock-names = "iahb", "isfr", "vpll", "grf";
+		status = "disabled";
+
+		ports {
+			hdmi_in: port {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				hdmi_in_vopb: endpoint@0 {
+					reg = <0>;
+					remote-endpoint = <&vopb_out_hdmi>;
+				};
+				hdmi_in_vopl: endpoint@1 {
+					reg = <1>;
+					remote-endpoint = <&vopl_out_hdmi>;
+				};
+			};
+		};
+	};
+
 	mipi_dsi: mipi@ff960000 {
 		compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
 		reg = <0x0 0xff960000 0x0 0x8000>;