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

[linux-2.6-microblaze.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 0b81ca1..4550c0f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -457,6 +457,42 @@
                };
        };
 
+       cdn_dp: dp@fec00000 {
+               compatible = "rockchip,rk3399-cdn-dp";
+               reg = <0x0 0xfec00000 0x0 0x100000>;
+               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
+               assigned-clocks = <&cru SCLK_DP_CORE>;
+               assigned-clock-rates = <100000000>;
+               clocks = <&cru SCLK_DP_CORE>, <&cru PCLK_DP_CTRL>,
+                        <&cru SCLK_SPDIF_REC_DPTX>, <&cru PCLK_VIO_GRF>;
+               clock-names = "core-clk", "pclk", "spdif", "grf";
+               phys = <&tcphy0_dp>, <&tcphy1_dp>;
+               power-domains = <&power RK3399_PD_HDCP>;
+               resets = <&cru SRST_DPTX_SPDIF_REC>, <&cru SRST_P_UPHY0_DPTX>,
+                        <&cru SRST_P_UPHY0_APB>, <&cru SRST_DP_CORE>;
+               reset-names = "spdif", "dptx", "apb", "core";
+               rockchip,grf = <&grf>;
+               #sound-dai-cells = <1>;
+               status = "disabled";
+
+               ports {
+                       dp_in: port {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               dp_in_vopb: endpoint@0 {
+                                       reg = <0>;
+                                       remote-endpoint = <&vopb_out_dp>;
+                               };
+
+                               dp_in_vopl: endpoint@1 {
+                                       reg = <1>;
+                                       remote-endpoint = <&vopl_out_dp>;
+                               };
+                       };
+               };
+       };
+
        gic: interrupt-controller@fee00000 {
                compatible = "arm,gic-v3";
                #interrupt-cells = <4>;
@@ -1286,7 +1322,8 @@
                        <&cru PCLK_PERIHP>,
                        <&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
                        <&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
-                       <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
+                       <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
+                       <&cru ACLK_VIO>;
                assigned-clock-rates =
                         <594000000>,  <800000000>,
                        <1000000000>,
@@ -1294,7 +1331,8 @@
                          <37500000>,
                         <100000000>,  <100000000>,
                          <50000000>, <600000000>,
-                        <100000000>,   <50000000>;
+                        <100000000>,   <50000000>,
+                        <400000000>;
        };
 
        grf: syscon@ff770000 {
@@ -1547,6 +1585,11 @@
                                reg = <3>;
                                remote-endpoint = <&mipi1_in_vopl>;
                        };
+
+                       vopl_out_dp: endpoint@4 {
+                               reg = <4>;
+                               remote-endpoint = <&dp_in_vopl>;
+                       };
                };
        };
 
@@ -1599,6 +1642,11 @@
                                reg = <3>;
                                remote-endpoint = <&mipi1_in_vopb>;
                        };
+
+                       vopb_out_dp: endpoint@4 {
+                               reg = <4>;
+                               remote-endpoint = <&dp_in_vopb>;
+                       };
                };
        };
 
@@ -2043,6 +2091,16 @@
                };
 
                i2s0 {
+                       i2s0_2ch_bus: i2s0-2ch-bus {
+                               rockchip,pins =
+                                       <3 24 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 25 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 26 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 27 RK_FUNC_1 &pcfg_pull_none>,
+                                       <3 31 RK_FUNC_1 &pcfg_pull_none>,
+                                       <4 0 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+
                        i2s0_8ch_bus: i2s0-8ch-bus {
                                rockchip,pins =
                                        <3 24 RK_FUNC_1 &pcfg_pull_none>,
@@ -2293,6 +2351,23 @@
                        };
                };
 
+               testclk {
+                       test_clkout0: test-clkout0 {
+                               rockchip,pins =
+                                       <0 0 RK_FUNC_1 &pcfg_pull_none>;
+                       };
+
+                       test_clkout1: test-clkout1 {
+                               rockchip,pins =
+                                       <2 25 RK_FUNC_2 &pcfg_pull_none>;
+                       };
+
+                       test_clkout2: test-clkout2 {
+                               rockchip,pins =
+                                       <0 8 RK_FUNC_3 &pcfg_pull_none>;
+                       };
+               };
+
                tsadc {
                        otp_gpio: otp-gpio {
                                rockchip,pins = <1 6 RK_FUNC_GPIO &pcfg_pull_none>;