arm: dra7: add DESHDCP clock

Add a new Linux clock for DRA7 based SoCs to control DESHDCP clock.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tero Kristo <t-kristo@ti.com>

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index f03a091cd0766b606d0f3a61a4ab03c870f3dfcf..387c76ca41f96f11dd218d28beadbd89a8ef855d 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -131,6 +131,11 @@
                                                        regulator-max-microvolt = <3000000>;
                                                };
                                        };
+
+                                       scm_conf_clocks: clocks {
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
+                                       };
                                };
 
                                dra7_pmx_core: pinmux@1400 {

diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 3b933f74d000cd039b3ecf441928c114dca0e124..470f39c4e326ab135ea4435f7e0fbb64b201b991 100644 (file)
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -2136,3 +2136,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>;
+       };
+};

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 0e64c2fac0b5fad2c92af76a2042a1080108fc04..817dbd87ce6742ae87e7a794d7f88e07c6266ecc 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -438,6 +438,7 @@ static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        { .role = "video2_clk", .clk = "dss_video2_clk" },
        { .role = "video1_clk", .clk = "dss_video1_clk" },
        { .role = "hdmi_clk", .clk = "dss_hdmi_clk" },
+       { .role = "hdcp_clk", .clk = "dss_deshdcp_clk" },
 };
 
 static struct omap_hwmod dra7xx_dss_hwmod = {

diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 5d2217ae447873656a9869649f0e89abe1028106..2dd956b9affae3b05ef9dc5be7bb3956a0160e8e 100644 (file)
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -305,6 +305,7 @@ static struct ti_dt_clk dra7xx_clks[] = {
        DT_CLK("4882c000.timer", "timer_sys_ck", "timer_sys_clk_div"),
        DT_CLK("4882e000.timer", "timer_sys_ck", "timer_sys_clk_div"),
        DT_CLK(NULL, "sys_clkin", "sys_clkin1"),
+       DT_CLK(NULL, "dss_deshdcp_clk", "dss_deshdcp_clk"),
        { .node_name = NULL },
 };