diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-07-24 06:09:15 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-07-30 23:40:48 -0400 |
commit | 9f271369f5cf0a1f58709e6c753a6fa4d8c355d3 (patch) | |
tree | 1705a669653efda3cd49f6d59884f0ad818cd8f9 | |
parent | b38a5040a66dc4337ed9a06cc7495a42dd684028 (diff) |
clk: exynos4: Add clock entries for TMU
Added clock entries for thermal management unit (TMU) for
Exynos4 SoCs.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/clock/exynos4-clock.txt | 1 | ||||
-rw-r--r-- | drivers/clk/samsung/clk-exynos4.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos4-clock.txt b/Documentation/devicetree/bindings/clock/exynos4-clock.txt index 14d5c2af26f4..c6bf8a6c8f52 100644 --- a/Documentation/devicetree/bindings/clock/exynos4-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos4-clock.txt | |||
@@ -236,6 +236,7 @@ Exynos4 SoC and this is specified where applicable. | |||
236 | spi0_isp_sclk 380 Exynos4x12 | 236 | spi0_isp_sclk 380 Exynos4x12 |
237 | spi1_isp_sclk 381 Exynos4x12 | 237 | spi1_isp_sclk 381 Exynos4x12 |
238 | uart_isp_sclk 382 Exynos4x12 | 238 | uart_isp_sclk 382 Exynos4x12 |
239 | tmu_apbif 383 | ||
239 | 240 | ||
240 | [Mux Clocks] | 241 | [Mux Clocks] |
241 | 242 | ||
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index 75635eb8a808..cee297daec4b 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c | |||
@@ -169,7 +169,7 @@ enum exynos4_clks { | |||
169 | gicisp, smmu_isp, smmu_drc, smmu_fd, smmu_lite0, smmu_lite1, mcuctl_isp, | 169 | gicisp, smmu_isp, smmu_drc, smmu_fd, smmu_lite0, smmu_lite1, mcuctl_isp, |
170 | mpwm_isp, i2c0_isp, i2c1_isp, mtcadc_isp, pwm_isp, wdt_isp, uart_isp, | 170 | mpwm_isp, i2c0_isp, i2c1_isp, mtcadc_isp, pwm_isp, wdt_isp, uart_isp, |
171 | asyncaxim, smmu_ispcx, spi0_isp, spi1_isp, pwm_isp_sclk, spi0_isp_sclk, | 171 | asyncaxim, smmu_ispcx, spi0_isp, spi1_isp, pwm_isp_sclk, spi0_isp_sclk, |
172 | spi1_isp_sclk, uart_isp_sclk, | 172 | spi1_isp_sclk, uart_isp_sclk, tmu_apbif, |
173 | 173 | ||
174 | /* mux clocks */ | 174 | /* mux clocks */ |
175 | mout_fimc0 = 384, mout_fimc1, mout_fimc2, mout_fimc3, mout_cam0, | 175 | mout_fimc0 = 384, mout_fimc1, mout_fimc2, mout_fimc3, mout_cam0, |
@@ -814,6 +814,7 @@ static struct samsung_gate_clock exynos4210_gate_clks[] __initdata = { | |||
814 | GATE_A(keyif, "keyif", "aclk100", E4210_GATE_IP_PERIR, 16, 0, 0, "keypad"), | 814 | GATE_A(keyif, "keyif", "aclk100", E4210_GATE_IP_PERIR, 16, 0, 0, "keypad"), |
815 | GATE_DA(sclk_fimd1, "exynos4-fb.1", "sclk_fimd1", "div_fimd1", | 815 | GATE_DA(sclk_fimd1, "exynos4-fb.1", "sclk_fimd1", "div_fimd1", |
816 | E4210_SRC_MASK_LCD1, 0, CLK_SET_RATE_PARENT, 0, "sclk_fimd"), | 816 | E4210_SRC_MASK_LCD1, 0, CLK_SET_RATE_PARENT, 0, "sclk_fimd"), |
817 | GATE(tmu_apbif, "tmu_apbif", "aclk100", E4210_GATE_IP_PERIR, 17, 0, 0), | ||
817 | }; | 818 | }; |
818 | 819 | ||
819 | /* list of gate clocks supported in exynos4x12 soc */ | 820 | /* list of gate clocks supported in exynos4x12 soc */ |
@@ -915,6 +916,7 @@ static struct samsung_gate_clock exynos4x12_gate_clks[] __initdata = { | |||
915 | GATE(spi1_isp, "spi1_isp", "aclk200", E4X12_GATE_ISP1, 13, | 916 | GATE(spi1_isp, "spi1_isp", "aclk200", E4X12_GATE_ISP1, 13, |
916 | CLK_IGNORE_UNUSED, 0), | 917 | CLK_IGNORE_UNUSED, 0), |
917 | GATE(g2d, "g2d", "aclk200", GATE_IP_DMC, 23, 0, 0), | 918 | GATE(g2d, "g2d", "aclk200", GATE_IP_DMC, 23, 0, 0), |
919 | GATE(tmu_apbif, "tmu_apbif", "aclk100", E4X12_GATE_IP_PERIR, 17, 0, 0), | ||
918 | }; | 920 | }; |
919 | 921 | ||
920 | /* | 922 | /* |