aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-02-23 05:53:56 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-03 07:23:25 -0400
commit2d5a3c803deedfa60014be8c0d933591c53db419 (patch)
treeaec38a9bfe306eeb25c2af39ac1fdfe7b04487c0
parentc65b99f046843d2455aa231747b5a07a999a9f3d (diff)
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>
-rw-r--r--arch/arm/boot/dts/dra7.dtsi5
-rw-r--r--arch/arm/boot/dts/dra7xx-clocks.dtsi10
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c1
-rw-r--r--drivers/clk/ti/clk-7xx.c1
4 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index f03a091cd076..387c76ca41f9 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -131,6 +131,11 @@
131 regulator-max-microvolt = <3000000>; 131 regulator-max-microvolt = <3000000>;
132 }; 132 };
133 }; 133 };
134
135 scm_conf_clocks: clocks {
136 #address-cells = <1>;
137 #size-cells = <0>;
138 };
134 }; 139 };
135 140
136 dra7_pmx_core: pinmux@1400 { 141 dra7_pmx_core: pinmux@1400 {
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 3b933f74d000..470f39c4e326 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -2136,3 +2136,13 @@
2136 clocks = <&dpll_usb_ck>; 2136 clocks = <&dpll_usb_ck>;
2137 }; 2137 };
2138}; 2138};
2139
2140&scm_conf_clocks {
2141 dss_deshdcp_clk: dss_deshdcp_clk {
2142 #clock-cells = <0>;
2143 compatible = "ti,gate-clock";
2144 clocks = <&l3_iclk_div>;
2145 ti,bit-shift = <0>;
2146 reg = <0x558>;
2147 };
2148};
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 0e64c2fac0b5..817dbd87ce67 100644
--- 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[] = {
438 { .role = "video2_clk", .clk = "dss_video2_clk" }, 438 { .role = "video2_clk", .clk = "dss_video2_clk" },
439 { .role = "video1_clk", .clk = "dss_video1_clk" }, 439 { .role = "video1_clk", .clk = "dss_video1_clk" },
440 { .role = "hdmi_clk", .clk = "dss_hdmi_clk" }, 440 { .role = "hdmi_clk", .clk = "dss_hdmi_clk" },
441 { .role = "hdcp_clk", .clk = "dss_deshdcp_clk" },
441}; 442};
442 443
443static struct omap_hwmod dra7xx_dss_hwmod = { 444static struct omap_hwmod dra7xx_dss_hwmod = {
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 5d2217ae4478..2dd956b9affa 100644
--- 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[] = {
305 DT_CLK("4882c000.timer", "timer_sys_ck", "timer_sys_clk_div"), 305 DT_CLK("4882c000.timer", "timer_sys_ck", "timer_sys_clk_div"),
306 DT_CLK("4882e000.timer", "timer_sys_ck", "timer_sys_clk_div"), 306 DT_CLK("4882e000.timer", "timer_sys_ck", "timer_sys_clk_div"),
307 DT_CLK(NULL, "sys_clkin", "sys_clkin1"), 307 DT_CLK(NULL, "sys_clkin", "sys_clkin1"),
308 DT_CLK(NULL, "dss_deshdcp_clk", "dss_deshdcp_clk"),
308 { .node_name = NULL }, 309 { .node_name = NULL },
309}; 310};
310 311