Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk...

[sfrench/cifs-2.6.git] / drivers / clk / ti / clk-7xx.c

diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 8b827219d454e3994975ebb2dfa750fb9d7ee8ad..9b5b289e633456206e81268d00bc212a7f9f62cc 100644 (file)
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -306,13 +306,14 @@ 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 },
 };
 
 int __init dra7xx_dt_clk_init(void)
 {
        int rc;
-       struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck;
+       struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck, *hdcp_ck;
 
        ti_dt_clocks_register(dra7xx_clks);
 
@@ -348,5 +349,10 @@ int __init dra7xx_dt_clk_init(void)
        if (rc)
                pr_err("%s: failed to set USB_DPLL M2 OUT\n", __func__);
 
+       hdcp_ck = clk_get_sys(NULL, "dss_deshdcp_clk");
+       rc = clk_prepare_enable(hdcp_ck);
+       if (rc)
+               pr_err("%s: failed to set dss_deshdcp_clk\n", __func__);
+
        return rc;
 }