diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-11-27 12:34:41 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-11-27 12:34:41 +0000 |
commit | dcae3ef009bc5f02704dee38b6cdf255f3afdde9 (patch) | |
tree | 37324760709698931204aeff303bbfcf238d605c /target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch | |
parent | cf8a1865532a52997e2a10d829621184bb81ce32 (diff) | |
download | master-31e0f0ae-dcae3ef009bc5f02704dee38b6cdf255f3afdde9.tar.gz master-31e0f0ae-dcae3ef009bc5f02704dee38b6cdf255f3afdde9.tar.bz2 master-31e0f0ae-dcae3ef009bc5f02704dee38b6cdf255f3afdde9.zip |
refresh/rename patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38932
Diffstat (limited to 'target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch')
-rw-r--r-- | target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch b/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch new file mode 100644 index 0000000000..4dc5f00bab --- /dev/null +++ b/target/linux/omap/patches-3.12/802-ARM_OMAP3plus_do_not_register_non-dt_OPP_tables_for_device_tree_boot.patch @@ -0,0 +1,36 @@ +From 92d51856d7405fa55bcf3d6f20d7e97e0bf2656c Mon Sep 17 00:00:00 2001 +From: Nishanth Menon <nm@ti.com> +Date: Wed, 16 Oct 2013 15:39:01 +0000 +Subject: ARM: OMAP3+: do not register non-dt OPP tables for device tree boot + +OMAP3+ supports both device tree and non-device tree boot. +Device tree bindings for OMAP3+ is supposed to be added via dts following: +Documentation/devicetree/bindings/power/opp.txt + +Since we now have device tree entries for OMAP3+ cpu OPPs, +The current code wrongly adds duplicate OPPs. So, dont register OPPs +when booting using device tree. + +Signed-off-by: Nishanth Menon <nm@ti.com> +Signed-off-by: Tony Lindgren <tony@atomide.com> +--- +--- a/arch/arm/mach-omap2/opp.c ++++ b/arch/arm/mach-omap2/opp.c +@@ -17,6 +17,7 @@ + * GNU General Public License for more details. + */ + #include <linux/module.h> ++#include <linux/of.h> + #include <linux/opp.h> + #include <linux/cpu.h> + +@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct om + { + int i, r; + ++ if (of_have_populated_dt()) ++ return -EINVAL; ++ + if (!opp_def || !opp_def_size) { + pr_err("%s: invalid params!\n", __func__); + return -EINVAL; |