diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 15:08:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 15:08:59 -0800 |
| commit | 96e61b8e34ea4982ce57319c19ab73e9e5d74165 (patch) | |
| tree | 5a92e274069225396051e3b12d6b82d6cdd8175b /drivers/mfd/db8500-prcmu.c | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
| parent | ec6691239373395d64fb73f50444f09a6f29d5ef (diff) | |
Merge tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
From Linus Walleij:
These are cpufreq updates for the ux500
- Updates to the ux500 cpufreq driver
- Support for delay timers in the MTU clksrc
- Consequential updates to the cpufreq driver
* tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
cpufreq: db8500: set CPUFREQ_CONST_LOOPS
clocksource: nomadik-mtu: support timer-based delay
cpufreq: dbx500: Update file header
cpufreq: dbx500: Minor code cleanup
cpufreq: dbx500: Move clk_get to probe
mfd: db8500: Update cpufreq device name
cpufreq: Give driver used for dbx500 family a more generic name
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mfd/db8500-prcmu.c')
| -rw-r--r-- | drivers/mfd/db8500-prcmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index dc8826d8d69d..f13808b7c4ef 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -3072,8 +3072,8 @@ static struct mfd_cell db8500_prcmu_devs[] = { .pdata_size = sizeof(db8500_regulators), }, { - .name = "cpufreq-u8500", - .of_compatible = "stericsson,cpufreq-u8500", + .name = "cpufreq-ux500", + .of_compatible = "stericsson,cpufreq-ux500", .platform_data = &db8500_cpufreq_table, .pdata_size = sizeof(db8500_cpufreq_table), }, |