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

[uclinux-h8/linux.git] / arch / arm64 / boot / dts / rockchip / rk3399-gru.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 204bdb9..18f546f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -516,10 +516,15 @@
                compatible = "rockchip,rk3399-gru-sound";
                rockchip,cpu = <&i2s0 &i2s2>;
                rockchip,codec = <&max98357a &headsetcodec
-                                 &codec &wacky_spi_audio>;
+                                 &codec &wacky_spi_audio &cdn_dp>;
        };
 };
 
+&cdn_dp {
+       status = "okay";
+       extcon = <&usbc_extcon0>, <&usbc_extcon1>;
+};
+
 /*
  * Set some suspend operating points to avoid OVP in suspend
  *
@@ -582,7 +587,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 =
                <600000000>, <800000000>,
                <1000000000>,
@@ -590,7 +596,8 @@
                <37500000>,
                <100000000>, <100000000>,
                <50000000>, <800000000>,
-               <100000000>, <50000000>;
+               <100000000>, <50000000>,
+               <400000000>;
 };
 
 &emmc_phy {