diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 15:19:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 15:19:31 +0200 |
| commit | 29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba (patch) | |
| tree | d3586c1f6a89150fcf24702b24aa21dcd7745f7b /arch/arm/mach-omap2 | |
| parent | 6f707daa3833761110a03478cba5cc4b708ec77d (diff) | |
| parent | b4f4b4b37133340befa354fbaa54d8e84ea86103 (diff) | |
| download | linux-29c5e7b2bc875c4ad5d3fd9e3c4ed2702e705bba.tar.bz2 | |
Merge back earlier cpufreq material for v4.7.
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 58920bc8807b..2f7b11da7d5d 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -277,13 +277,10 @@ static void __init omap4_init_voltages(void) static inline void omap_init_cpufreq(void) { - struct platform_device_info devinfo = { }; + struct platform_device_info devinfo = { .name = "omap-cpufreq" }; if (!of_have_populated_dt()) - devinfo.name = "omap-cpufreq"; - else - devinfo.name = "cpufreq-dt"; - platform_device_register_full(&devinfo); + platform_device_register_full(&devinfo); } static int __init omap2_common_pm_init(void) |