diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-26 23:12:17 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-26 23:12:17 -0800 |
| commit | 3c8cee3b408ba3d2e2527eef734b5503ac5c9188 (patch) | |
| tree | ae26087fe98636cc04d8914452782b9a54b9f777 | |
| parent | d1a8c54b704a4bcf62c0c109ec764277f0bcc57d (diff) | |
| parent | 5e540a5a7fd145ff7b2cdf8779b53349287c64a9 (diff) | |
| download | op-kernel-dev-3c8cee3b408ba3d2e2527eef734b5503ac5c9188.zip op-kernel-dev-3c8cee3b408ba3d2e2527eef734b5503ac5c9188.tar.gz | |
Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx6: add missing twd_clk for imx6q clock
| -rw-r--r-- | arch/arm/mach-imx/clock-imx6q.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c index 9273c2a..2d88f8b 100644 --- a/arch/arm/mach-imx/clock-imx6q.c +++ b/arch/arm/mach-imx/clock-imx6q.c @@ -814,6 +814,16 @@ DEF_PFD(pll3_pfd_540m, PFD_480, PFD1, &pll3_usb_otg); DEF_PFD(pll3_pfd_508m, PFD_480, PFD2, &pll3_usb_otg); DEF_PFD(pll3_pfd_454m, PFD_480, PFD3, &pll3_usb_otg); +static unsigned long twd_clk_get_rate(struct clk *clk) +{ + return clk_get_rate(clk->parent) / 2; +} + +static struct clk twd_clk = { + .parent = &arm_clk, + .get_rate = twd_clk_get_rate, +}; + static unsigned long pll2_200m_get_rate(struct clk *clk) { return clk_get_rate(clk->parent) / 2; @@ -1894,6 +1904,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("20ec000.sdma", NULL, sdma_clk), _REGISTER_CLOCK("20bc000.wdog", NULL, dummy_clk), _REGISTER_CLOCK("20c0000.wdog", NULL, dummy_clk), + _REGISTER_CLOCK("smp_twd", NULL, twd_clk), _REGISTER_CLOCK(NULL, "ckih", ckih_clk), _REGISTER_CLOCK(NULL, "ckil_clk", ckil_clk), _REGISTER_CLOCK(NULL, "aips_tz1_clk", aips_tz1_clk), |
