diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-08-31 15:56:08 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-12-04 22:37:23 +0800 |
| commit | 99f358f66ac4b0d1f3fb0db1c535ea2f7b12c30a (patch) | |
| tree | 2ca48e111c46b83de0e366a637dc6c2c4dcc813c /arch | |
| parent | 3cc503bb7f1cb8a08d971c58cb98b941f7f61913 (diff) | |
imx: add watchdog clocks for imx2-wdt.c
Clocks for watchdog driver imx2-wdt.c are missing from the clock.c
forward ported from 2.6.38, add dummy_clk for them.
Signed-off-by: Eric Miao <eric.miao@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/clock.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c index 14650d4637c..ddcba085755 100644 --- a/arch/arm/mach-mx5/clock.c +++ b/arch/arm/mach-mx5/clock.c @@ -37,6 +37,7 @@ static unsigned long external_high_reference, external_low_reference; static unsigned long oscillator_reference, ckih2_reference; +static struct clk dummy_clk; static struct clk pll1_main_clk; static struct clk pll1_sw_clk; static struct clk pll2_sw_clk; @@ -4405,6 +4406,10 @@ static struct clk asrc_clk[] = { }, }; +static struct clk dummy_clk = { + .id = 0, +}; + #define _REGISTER_CLOCK(d, n, c) \ { \ .dev_id = d, \ @@ -4496,6 +4501,8 @@ static struct clk_lookup mx51_lookups[] = { _REGISTER_CLOCK("sdhci-esdhc-imx51.2", NULL, esdhc3_clk[0]), _REGISTER_CLOCK("sdhci-esdhc-imx51.3", NULL, esdhc4_clk[0]), _REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk[0]), + _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk), + _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk), }; static struct clk_lookup mx53_lookups[] = { @@ -4525,6 +4532,8 @@ static struct clk_lookup mx53_lookups[] = { _REGISTER_CLOCK("sdhci-esdhc-imx53.2", NULL, esdhc3_clk[0]), _REGISTER_CLOCK("sdhci-esdhc-imx53.3", NULL, esdhc4_clk[0]), _REGISTER_CLOCK("imx25-fec.0", NULL, fec_clk[0]), + _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk), + _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk), }; static void clk_tree_init(void) |