diff options
author | Baruch Siach <baruch@tkos.co.il> | 2010-06-10 05:32:15 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 08:18:15 -0400 |
commit | 30816abc212587f8dc75dcfb4ef6d383fbe2d68c (patch) | |
tree | 6cfd6926dcbce6a83254341136cd6448588c6066 /arch/arm/mach-mx25/clock.c | |
parent | 6f1fa706fc06dac9ba088e884ec8110475e42704 (diff) |
mx25: add watchdog clock
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25/clock.c')
-rw-r--r-- | arch/arm/mach-mx25/clock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c index caeea7551582..74cf27d48bfb 100644 --- a/arch/arm/mach-mx25/clock.c +++ b/arch/arm/mach-mx25/clock.c | |||
@@ -206,6 +206,7 @@ DEFINE_CLOCK(i2c_clk, 0, CCM_CGCR0, 6, get_rate_i2c, NULL, NULL); | |||
206 | DEFINE_CLOCK(fec_clk, 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk); | 206 | DEFINE_CLOCK(fec_clk, 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk); |
207 | DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1, 8, get_rate_ipg, NULL, NULL); | 207 | DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1, 8, get_rate_ipg, NULL, NULL); |
208 | DEFINE_CLOCK(lcdc_clk, 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk); | 208 | DEFINE_CLOCK(lcdc_clk, 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk); |
209 | DEFINE_CLOCK(wdt_clk, 0, CCM_CGCR2, 19, get_rate_ipg, NULL, NULL); | ||
209 | DEFINE_CLOCK(ssi1_clk, 0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk); | 210 | DEFINE_CLOCK(ssi1_clk, 0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk); |
210 | DEFINE_CLOCK(ssi2_clk, 1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk); | 211 | DEFINE_CLOCK(ssi2_clk, 1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk); |
211 | DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL); | 212 | DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL); |
@@ -243,6 +244,7 @@ static struct clk_lookup lookups[] = { | |||
243 | _REGISTER_CLOCK("fec.0", NULL, fec_clk) | 244 | _REGISTER_CLOCK("fec.0", NULL, fec_clk) |
244 | _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk) | 245 | _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk) |
245 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) | 246 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) |
247 | _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk) | ||
246 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) | 248 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
247 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) | 249 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |
248 | _REGISTER_CLOCK(NULL, "audmux", audmux_clk) | 250 | _REGISTER_CLOCK(NULL, "audmux", audmux_clk) |