diff options
author | Rahul Sharma <rahul.sharma@samsung.com> | 2013-08-29 01:37:05 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-08-29 20:46:57 -0400 |
commit | c9f3f0815909386c2dba1cdb803af5cef34ec796 (patch) | |
tree | 4e68332b36f3727151ae8b58314c0aa15ad75988 | |
parent | a5828a6c5f51a909c3c4dbbf22c76c75a033b2e9 (diff) |
clk/exynos5420: add sclk_hdmiphy to the list of special clocks
Add sclk_hdmiphy to the list of exposed clocks. This is required
by hdmi driver to change the parent of hdmi clock.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5420-clock.txt | 1 | ||||
-rw-r--r-- | drivers/clk/samsung/clk-exynos5420.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5420-clock.txt b/Documentation/devicetree/bindings/clock/exynos5420-clock.txt index 9bcc4b1bff51..596a36868a56 100644 --- a/Documentation/devicetree/bindings/clock/exynos5420-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos5420-clock.txt | |||
@@ -59,6 +59,7 @@ clock which they consume. | |||
59 | sclk_pwm 155 | 59 | sclk_pwm 155 |
60 | sclk_gscl_wa 156 | 60 | sclk_gscl_wa 156 |
61 | sclk_gscl_wb 157 | 61 | sclk_gscl_wb 157 |
62 | sclk_hdmiphy 158 | ||
62 | 63 | ||
63 | [Peripheral Clock Gates] | 64 | [Peripheral Clock Gates] |
64 | 65 | ||
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c index e035fd0afbc7..a86cadc76650 100644 --- a/drivers/clk/samsung/clk-exynos5420.c +++ b/drivers/clk/samsung/clk-exynos5420.c | |||
@@ -120,7 +120,7 @@ enum exynos5420_clks { | |||
120 | sclk_i2s2, sclk_pcm1, sclk_pcm2, sclk_spdif, sclk_hdmi, sclk_pixel, | 120 | sclk_i2s2, sclk_pcm1, sclk_pcm2, sclk_spdif, sclk_hdmi, sclk_pixel, |
121 | sclk_dp1, sclk_mipi1, sclk_fimd1, sclk_maudio0, sclk_maupcm0, | 121 | sclk_dp1, sclk_mipi1, sclk_fimd1, sclk_maudio0, sclk_maupcm0, |
122 | sclk_usbd300, sclk_usbd301, sclk_usbphy300, sclk_usbphy301, sclk_unipro, | 122 | sclk_usbd300, sclk_usbd301, sclk_usbphy300, sclk_usbphy301, sclk_unipro, |
123 | sclk_pwm, sclk_gscl_wa, sclk_gscl_wb, | 123 | sclk_pwm, sclk_gscl_wa, sclk_gscl_wb, sclk_hdmiphy, |
124 | 124 | ||
125 | /* gate clocks */ | 125 | /* gate clocks */ |
126 | aclk66_peric = 256, uart0, uart1, uart2, uart3, i2c0, i2c1, i2c2, i2c3, | 126 | aclk66_peric = 256, uart0, uart1, uart2, uart3, i2c0, i2c1, i2c2, i2c3, |
@@ -297,7 +297,7 @@ static struct samsung_fixed_rate_clock exynos5420_fixed_rate_ext_clks[] __initda | |||
297 | 297 | ||
298 | /* fixed rate clocks generated inside the soc */ | 298 | /* fixed rate clocks generated inside the soc */ |
299 | static struct samsung_fixed_rate_clock exynos5420_fixed_rate_clks[] __initdata = { | 299 | static struct samsung_fixed_rate_clock exynos5420_fixed_rate_clks[] __initdata = { |
300 | FRATE(none, "sclk_hdmiphy", NULL, CLK_IS_ROOT, 24000000), | 300 | FRATE(sclk_hdmiphy, "sclk_hdmiphy", NULL, CLK_IS_ROOT, 24000000), |
301 | FRATE(none, "sclk_pwi", NULL, CLK_IS_ROOT, 24000000), | 301 | FRATE(none, "sclk_pwi", NULL, CLK_IS_ROOT, 24000000), |
302 | FRATE(none, "sclk_usbh20", NULL, CLK_IS_ROOT, 48000000), | 302 | FRATE(none, "sclk_usbh20", NULL, CLK_IS_ROOT, 48000000), |
303 | FRATE(none, "mphy_refclk_ixtal24", NULL, CLK_IS_ROOT, 48000000), | 303 | FRATE(none, "mphy_refclk_ixtal24", NULL, CLK_IS_ROOT, 48000000), |