diff options
author | Andrew Bresticker <abrestic@chromium.org> | 2013-09-25 17:12:49 -0400 |
---|---|---|
committer | Tomasz Figa <t.figa@samsung.com> | 2014-01-08 12:02:42 -0500 |
commit | 35399dda011b515120e0c39463ac32f0cac75c6a (patch) | |
tree | d3117a0bf64baa1b1841570ed61af2cbd25f3cf0 | |
parent | 547f33509ccc6e016df02600d377778b75e26a7b (diff) |
clk: exynos5250: add clock ID for div_pcm0
There is no gate for the PCM clock input to the AudioSS block, so
the parent of sclk_pcm is div_pcm0. Add a clock ID for it so that
we can reference it in device trees.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
-rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5250-clock.txt | 1 | ||||
-rw-r--r-- | drivers/clk/samsung/clk-exynos5250.c | 2 | ||||
-rw-r--r-- | include/dt-bindings/clock/exynos5250.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt index 5883ec878ddd..492ed09ea8c8 100644 --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt | |||
@@ -62,6 +62,7 @@ clock which they consume. | |||
62 | div_i2s1 157 | 62 | div_i2s1 157 |
63 | div_i2s2 158 | 63 | div_i2s2 158 |
64 | sclk_hdmiphy 159 | 64 | sclk_hdmiphy 159 |
65 | div_pcm0 160 | ||
65 | 66 | ||
66 | 67 | ||
67 | [Peripheral Clock Gates] | 68 | [Peripheral Clock Gates] |
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c index 25c77ab37ccf..ff4beebe1f0b 100644 --- a/drivers/clk/samsung/clk-exynos5250.c +++ b/drivers/clk/samsung/clk-exynos5250.c | |||
@@ -329,7 +329,7 @@ static struct samsung_div_clock exynos5250_div_clks[] __initdata = { | |||
329 | DIV(0, "div_jpeg", "mout_jpeg", DIV_GEN, 4, 4), | 329 | DIV(0, "div_jpeg", "mout_jpeg", DIV_GEN, 4, 4), |
330 | 330 | ||
331 | DIV(0, "div_audio0", "mout_audio0", DIV_MAU, 0, 4), | 331 | DIV(0, "div_audio0", "mout_audio0", DIV_MAU, 0, 4), |
332 | DIV(0, "div_pcm0", "sclk_audio0", DIV_MAU, 4, 8), | 332 | DIV(CLK_DIV_PCM0, "div_pcm0", "sclk_audio0", DIV_MAU, 4, 8), |
333 | 333 | ||
334 | DIV(0, "div_sata", "mout_sata", DIV_FSYS0, 20, 4), | 334 | DIV(0, "div_sata", "mout_sata", DIV_FSYS0, 20, 4), |
335 | DIV(0, "div_usb3", "mout_usb3", DIV_FSYS0, 24, 4), | 335 | DIV(0, "div_usb3", "mout_usb3", DIV_FSYS0, 24, 4), |
diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h index 0512572b2b24..922f2dca9bf0 100644 --- a/include/dt-bindings/clock/exynos5250.h +++ b/include/dt-bindings/clock/exynos5250.h | |||
@@ -55,6 +55,7 @@ | |||
55 | #define CLK_DIV_I2S1 157 | 55 | #define CLK_DIV_I2S1 157 |
56 | #define CLK_DIV_I2S2 158 | 56 | #define CLK_DIV_I2S2 158 |
57 | #define CLK_SCLK_HDMIPHY 159 | 57 | #define CLK_SCLK_HDMIPHY 159 |
58 | #define CLK_DIV_PCM0 160 | ||
58 | 59 | ||
59 | /* gate clocks */ | 60 | /* gate clocks */ |
60 | #define CLK_GSCL0 256 | 61 | #define CLK_GSCL0 256 |