diff options
author | Stefan Agner <stefan@agner.ch> | 2016-03-09 21:16:49 -0500 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2016-03-31 05:02:02 -0400 |
commit | 349efbeedb2b79292eee12cf6b9a2422ef93853d (patch) | |
tree | ecd0a6da8d924ea62c373a9aa116d778f978fe74 | |
parent | 0da15d36a90f405541773e884b3264e0f94debd3 (diff) |
clk: imx: vf610: add WKPU unit
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r-- | drivers/clk/imx/clk-vf610.c | 2 | ||||
-rw-r--r-- | include/dt-bindings/clock/vf610-clock.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c index f0ff45811e76..610a72464f1e 100644 --- a/drivers/clk/imx/clk-vf610.c +++ b/drivers/clk/imx/clk-vf610.c | |||
@@ -120,6 +120,7 @@ static unsigned int const clks_init_on[] __initconst = { | |||
120 | VF610_CLK_DDR_SEL, | 120 | VF610_CLK_DDR_SEL, |
121 | VF610_CLK_DAP, | 121 | VF610_CLK_DAP, |
122 | VF610_CLK_DDRMC, | 122 | VF610_CLK_DDRMC, |
123 | VF610_CLK_WKPU, | ||
123 | }; | 124 | }; |
124 | 125 | ||
125 | static struct clk * __init vf610_get_fixed_clock( | 126 | static struct clk * __init vf610_get_fixed_clock( |
@@ -235,6 +236,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) | |||
235 | clk[VF610_CLK_PLL6_MAIN_DIV] = imx_clk_divider("pll6_video_div", "pll6_video", CCM_CACRR, 21, 1); | 236 | clk[VF610_CLK_PLL6_MAIN_DIV] = imx_clk_divider("pll6_video_div", "pll6_video", CCM_CACRR, 21, 1); |
236 | 237 | ||
237 | clk[VF610_CLK_DDRMC] = imx_clk_gate2_cgr("ddrmc", "ddr_sel", CCM_CCGR6, CCM_CCGRx_CGn(14), 0x2); | 238 | clk[VF610_CLK_DDRMC] = imx_clk_gate2_cgr("ddrmc", "ddr_sel", CCM_CCGR6, CCM_CCGRx_CGn(14), 0x2); |
239 | clk[VF610_CLK_WKPU] = imx_clk_gate2_cgr("wkpu", "ipg_bus", CCM_CCGR4, CCM_CCGRx_CGn(10), 0x2); | ||
238 | 240 | ||
239 | clk[VF610_CLK_USBPHY0] = imx_clk_gate("usbphy0", "pll3_usb_otg", PLL3_CTRL, 6); | 241 | clk[VF610_CLK_USBPHY0] = imx_clk_gate("usbphy0", "pll3_usb_otg", PLL3_CTRL, 6); |
240 | clk[VF610_CLK_USBPHY1] = imx_clk_gate("usbphy1", "pll7_usb_host", PLL7_CTRL, 6); | 242 | clk[VF610_CLK_USBPHY1] = imx_clk_gate("usbphy1", "pll7_usb_host", PLL7_CTRL, 6); |
diff --git a/include/dt-bindings/clock/vf610-clock.h b/include/dt-bindings/clock/vf610-clock.h index cf2c00a06d10..7dc1b84fde07 100644 --- a/include/dt-bindings/clock/vf610-clock.h +++ b/include/dt-bindings/clock/vf610-clock.h | |||
@@ -196,6 +196,7 @@ | |||
196 | #define VF610_CLK_DAP 183 | 196 | #define VF610_CLK_DAP 183 |
197 | #define VF610_CLK_OCOTP 184 | 197 | #define VF610_CLK_OCOTP 184 |
198 | #define VF610_CLK_DDRMC 185 | 198 | #define VF610_CLK_DDRMC 185 |
199 | #define VF610_CLK_END 186 | 199 | #define VF610_CLK_WKPU 186 |
200 | #define VF610_CLK_END 187 | ||
200 | 201 | ||
201 | #endif /* __DT_BINDINGS_CLOCK_VF610_H */ | 202 | #endif /* __DT_BINDINGS_CLOCK_VF610_H */ |