aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-07-22 00:54:59 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 11:20:41 -0400
commit97245139a0586ad28bf5ab3dd6cef0b019386b9f (patch)
tree3073be13ca936b291bf303ff9591a66c69e0c65e
parent6cd622357df82431358c38dfba4d70e5735e6b5e (diff)
ARM: imx6q: add vdoa gate clock
Add the missing vdoa gate clock for imx6q. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/clock/imx6q-clock.txt1
-rw-r--r--arch/arm/mach-imx/clk-imx6q.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index 3066f1811eda..5a90a724b520 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -214,6 +214,7 @@ clocks and IDs.
214 cko2_podf 199 214 cko2_podf 199
215 cko2 200 215 cko2 200
216 cko 201 216 cko 201
217 vdoa 202
217 218
218Examples: 219Examples:
219 220
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index ed19b332468b..bbafa3ccacb5 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -251,7 +251,7 @@ enum mx6q_clks {
251 ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5, 251 ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5,
252 sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate, 252 sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate,
253 usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow, 253 usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow,
254 spdif, cko2_sel, cko2_podf, cko2, cko, clk_max 254 spdif, cko2_sel, cko2_podf, cko2, cko, vdoa, clk_max
255}; 255};
256 256
257static struct clk *clk[clk_max]; 257static struct clk *clk[clk_max];
@@ -501,6 +501,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
501 clk[i2c3] = imx_clk_gate2("i2c3", "ipg_per", base + 0x70, 10); 501 clk[i2c3] = imx_clk_gate2("i2c3", "ipg_per", base + 0x70, 10);
502 clk[iim] = imx_clk_gate2("iim", "ipg", base + 0x70, 12); 502 clk[iim] = imx_clk_gate2("iim", "ipg", base + 0x70, 12);
503 clk[enfc] = imx_clk_gate2("enfc", "enfc_podf", base + 0x70, 14); 503 clk[enfc] = imx_clk_gate2("enfc", "enfc_podf", base + 0x70, 14);
504 clk[vdoa] = imx_clk_gate2("vdoa", "vdo_axi", base + 0x70, 26);
504 clk[ipu1] = imx_clk_gate2("ipu1", "ipu1_podf", base + 0x74, 0); 505 clk[ipu1] = imx_clk_gate2("ipu1", "ipu1_podf", base + 0x74, 0);
505 clk[ipu1_di0] = imx_clk_gate2("ipu1_di0", "ipu1_di0_sel", base + 0x74, 2); 506 clk[ipu1_di0] = imx_clk_gate2("ipu1_di0", "ipu1_di0_sel", base + 0x74, 2);
506 clk[ipu1_di1] = imx_clk_gate2("ipu1_di1", "ipu1_di1_sel", base + 0x74, 4); 507 clk[ipu1_di1] = imx_clk_gate2("ipu1_di1", "ipu1_di1_sel", base + 0x74, 4);