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

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / dra7xx-clocks.dtsi

diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 3b933f74d000cd039b3ecf441928c114dca0e124..357bedeebfac45e451a57ca736cf993bd2698c24 100644 (file)
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -1531,6 +1531,7 @@
                clocks = <&dpll_per_h12x2_ck>;
                ti,bit-shift = <8>;
                reg = <0x1120>;
+               ti,set-rate-parent;
        };
 
        dss_hdmi_clk: dss_hdmi_clk {
@@ -2136,3 +2137,13 @@
                clocks = <&dpll_usb_ck>;
        };
 };
+
+&scm_conf_clocks {
+       dss_deshdcp_clk: dss_deshdcp_clk {
+               #clock-cells = <0>;
+               compatible = "ti,gate-clock";
+               clocks = <&l3_iclk_div>;
+               ti,bit-shift = <0>;
+               reg = <0x558>;
+       };
+};