replace the TI patch with a smaller patchset

[openwrt/openwrt.git] / target / linux / omap / patches-3.12 / 804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch

diff --git a/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch b/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch
new file mode 100644 (file)
index 0000000..600fd1a
--- /dev/null
+++ b/target/linux/omap/patches-3.12/804-ARM_OMAP3plus_use_cpu0-cpufreq_driver_in_device_tree_supported_boot.patch
@@ -0,0 +1,50 @@
+From 60c5fc86d01154e2a005bf701f495426ebc81f73 Mon Sep 17 00:00:00 2001
+From: Nishanth Menon <nm@ti.com>
+Date: Wed, 16 Oct 2013 15:39:03 +0000
+Subject: ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
+
+With OMAP3+ and AM33xx supported SoC having defined CPU device tree
+entries with operating-points and clock nodes defined, we can now use
+the SoC generic cpufreq-cpu0 driver by registering appropriate device.
+
+Cc: Benoit Cousson <bcousson@baylibre.com>
+Cc: Kevin Hilman <khilman@deeprootsystems.com>
+Cc: Paul Walmsley <paul@pwsan.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Nishanth Menon <nm@ti.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+---
+diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
+index e742118..360b2da 100644
+--- a/arch/arm/mach-omap2/pm.c
++++ b/arch/arm/mach-omap2/pm.c
+@@ -266,7 +266,12 @@ static void __init omap4_init_voltages(void)
+ 
+ static inline void omap_init_cpufreq(void)
+ {
+-      struct platform_device_info devinfo = { .name = "omap-cpufreq", };
++      struct platform_device_info devinfo = { };
++
++      if (!of_have_populated_dt())
++              devinfo.name = "omap-cpufreq";
++      else
++              devinfo.name = "cpufreq-cpu0";
+       platform_device_register_full(&devinfo);
+ }
+ 
+@@ -300,10 +305,11 @@ int __init omap2_common_pm_late_init(void)
+               /* Smartreflex device init */
+               omap_devinit_smartreflex();
+ 
+-              /* cpufreq dummy device instantiation */
+-              omap_init_cpufreq();
+       }
+ 
++      /* cpufreq dummy device instantiation */
++      omap_init_cpufreq();
++
+ #ifdef CONFIG_SUSPEND
+       suspend_set_ops(&omap_pm_ops);
+ #endif
+--
+cgit v0.9.2