diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-03 15:41:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-03 15:41:16 +0200 |
| commit | 6f1293ff747ddcb696d546e3efcd31f7cc42b9a5 (patch) | |
| tree | a11d54bb4493dbd40925bf4b2f4dcdf9de64b4d3 /arch/arm/mach-imx | |
| parent | cpufreq: update 'cpufreq_suspended' after stopping governors (diff) | |
| parent | cpufreq: cpufreq-dt: fix potential double put of cpu OF node (diff) | |
| download | linux-6f1293ff747ddcb696d546e3efcd31f7cc42b9a5.tar.xz linux-6f1293ff747ddcb696d546e3efcd31f7cc42b9a5.zip | |
Merge back cpufreq material for v3.18.
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/imx27-dt.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-imx51.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c index 080e66c6a1d0..dc8f1a6f45f2 100644 --- a/arch/arm/mach-imx/imx27-dt.c +++ b/arch/arm/mach-imx/imx27-dt.c @@ -20,7 +20,7 @@ static void __init imx27_dt_init(void) { - struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; + struct platform_device_info devinfo = { .name = "cpufreq-dt", }; mxc_arch_reset_init_dt(); diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c index c77deb3f0893..2c5fcaf8675b 100644 --- a/arch/arm/mach-imx/mach-imx51.c +++ b/arch/arm/mach-imx/mach-imx51.c @@ -51,7 +51,7 @@ static void __init imx51_ipu_mipi_setup(void) static void __init imx51_dt_init(void) { - struct platform_device_info devinfo = { .name = "cpufreq-cpu0", }; + struct platform_device_info devinfo = { .name = "cpufreq-dt", }; mxc_arch_reset_init_dt(); imx51_ipu_mipi_setup(); |