Merge tag 'soc-dt-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / arch / arm64 / boot / dts / rockchip / rk3399.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 40e7c4a700555afd6a7055a3ffd1b266b3606d9a..928948e7c7bbb4a4013d9c6e5eda65bfb702a76c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1954,7 +1954,7 @@
                };
        };
 
-       mipi_dsi: mipi@ff960000 {
+       mipi_dsi: dsi@ff960000 {
                compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
                reg = <0x0 0xff960000 0x0 0x8000>;
                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1982,15 +1982,20 @@
                                        reg = <0>;
                                        remote-endpoint = <&vopb_out_mipi>;
                                };
+
                                mipi_in_vopl: endpoint@1 {
                                        reg = <1>;
                                        remote-endpoint = <&vopl_out_mipi>;
                                };
                        };
+
+                       mipi_out: port@1 {
+                               reg = <1>;
+                       };
                };
        };
 
-       mipi_dsi1: mipi@ff968000 {
+       mipi_dsi1: dsi@ff968000 {
                compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
                reg = <0x0 0xff968000 0x0 0x8000>;
                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2025,10 +2030,14 @@
                                        remote-endpoint = <&vopl_out_mipi1>;
                                };
                        };
+
+                       mipi1_out: port@1 {
+                               reg = <1>;
+                       };
                };
        };
 
-       edp: edp@ff970000 {
+       edp: dp@ff970000 {
                compatible = "rockchip,rk3399-edp";
                reg = <0x0 0xff970000 0x0 0x8000>;
                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2045,6 +2054,7 @@
                ports {
                        #address-cells = <1>;
                        #size-cells = <0>;
+
                        edp_in: port@0 {
                                reg = <0>;
                                #address-cells = <1>;
@@ -2060,6 +2070,10 @@
                                        remote-endpoint = <&vopl_out_edp>;
                                };
                        };
+
+                       edp_out: port@1 {
+                               reg = <1>;
+                       };
                };
        };