aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRahul Sharma <rahul.sharma@samsung.com>2013-08-29 01:37:09 -0400
committerMike Turquette <mturquette@linaro.org>2013-08-29 20:48:12 -0400
commit0044cbcd667520fedbd96d07c20cfe5b7473f71a (patch)
tree636637ea008a4a554dff3ade15ad5fd15953c7bd
parent4625f1b5d44c7f38801c0553fa90b33577307843 (diff)
clk/exynos5420: assign dout_pixel id to pixel clock divider
dout_pixel is a new ID allocated for pixel clock divider. It is queried in the driver to pass as the parent to hdmi clock while switching between parents. 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.txt5
-rw-r--r--drivers/clk/samsung/clk-exynos5420.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5420-clock.txt b/Documentation/devicetree/bindings/clock/exynos5420-clock.txt
index 343430bd5573..32aa34ecad36 100644
--- a/Documentation/devicetree/bindings/clock/exynos5420-clock.txt
+++ b/Documentation/devicetree/bindings/clock/exynos5420-clock.txt
@@ -187,6 +187,11 @@ clock which they consume.
187 187
188 mout_hdmi 640 188 mout_hdmi 640
189 189
190 Divider ID
191 ----------------------------
192
193 dout_pixel 768
194
190Example 1: An example of a clock controller node is listed below. 195Example 1: An example of a clock controller node is listed below.
191 196
192 clock: clock-controller@0x10010000 { 197 clock: clock-controller@0x10010000 {
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 78465a5aa8e9..48c4a9350b91 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -143,6 +143,9 @@ enum exynos5420_clks {
143 /* mux clocks */ 143 /* mux clocks */
144 mout_hdmi = 640, 144 mout_hdmi = 640,
145 145
146 /* divider clocks */
147 dout_pixel = 768,
148
146 nr_clks, 149 nr_clks,
147}; 150};
148 151
@@ -463,7 +466,7 @@ static struct samsung_div_clock exynos5420_div_clks[] __initdata = {
463 DIV(none, "dout_fimd1", "mout_fimd1", DIV_DISP10, 0, 4), 466 DIV(none, "dout_fimd1", "mout_fimd1", DIV_DISP10, 0, 4),
464 DIV(none, "dout_mipi1", "mout_mipi1", DIV_DISP10, 16, 8), 467 DIV(none, "dout_mipi1", "mout_mipi1", DIV_DISP10, 16, 8),
465 DIV(none, "dout_dp1", "mout_dp1", DIV_DISP10, 24, 4), 468 DIV(none, "dout_dp1", "mout_dp1", DIV_DISP10, 24, 4),
466 DIV(none, "dout_hdmi_pixel", "mout_pixel", DIV_DISP10, 28, 4), 469 DIV(dout_pixel, "dout_hdmi_pixel", "mout_pixel", DIV_DISP10, 28, 4),
467 470
468 /* Audio Block */ 471 /* Audio Block */
469 DIV(none, "dout_maudio0", "mout_maudio0", DIV_MAU, 20, 4), 472 DIV(none, "dout_maudio0", "mout_maudio0", DIV_MAU, 20, 4),