diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:21:39 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:21:39 +0800 |
| commit | 40885dc9eae69bbb3523836ccd9da8699eff5385 (patch) | |
| tree | 8200e3f72df82000932c512cb0d6af3295fc30d8 /arch/arm/mach-imx/clock-imx6q.c | |
| parent | a48f11ebb784e84f06ddb0e1a181a7379ee8915e (diff) | |
| parent | 7b4c1ab171f68aa904e4b6c6376ca33a60140282 (diff) | |
Merge branch 'topic/lt-3.2-imx6-cpufreq' into lt-3.2-imx6
* topic/lt-3.2-imx6-cpufreq:
arm/imx6q: select ARCH_HAS_CPUFREQ
arm/imx6q: register arm_clk as cpu to clkdev
dts/imx6q: add cpufreq property
cpufreq: add clk-reg cpufreq driver
arm/imx: cpufreq: remove loops_per_jiffy recalculate for smp
ARM: add cpufreq transiton notifier to adjust loops_per_jiffy for smp
arm/imx: add cpu_voltage to cpu_op
arm/imx: cpufreq: add multi-core support
Diffstat (limited to 'arch/arm/mach-imx/clock-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/clock-imx6q.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c index c246712948c..f86afe81abb 100644 --- a/arch/arm/mach-imx/clock-imx6q.c +++ b/arch/arm/mach-imx/clock-imx6q.c @@ -1914,6 +1914,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "gpmi_io_clk", gpmi_io_clk), _REGISTER_CLOCK(NULL, "usboh3_clk", usboh3_clk), _REGISTER_CLOCK(NULL, "sata_clk", sata_clk), + _REGISTER_CLOCK(NULL, "cpu", arm_clk), }; int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode) |