diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 14:43:09 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 14:43:09 -0700 |
| commit | 137f66ee147cb4a06ad1ee04484ae64a9f6ba3f3 (patch) | |
| tree | d780e0e5cc8a282aa7786a91708b39c29f39aea8 /arch/arm/mach-omap2/opp.c | |
| parent | 7a54698fa6c5ee066f5b7a621a07ca4cd494a667 (diff) | |
| parent | 60c5fc86d01154e2a005bf701f495426ebc81f73 (diff) | |
Merge tag 'omap-for-v3.13/cpufreq-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Few patches to make cpufreq work for omap3 with device tree.
Note that this branch has a dependency to the patches merged
with omap-for-v3.13/board-removal-signed-take2.
* tag 'omap-for-v3.13/cpufreq-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
ARM: OMAP2+: add missing lateinit hook for calling pm late init
ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/opp.c')
| -rw-r--r-- | arch/arm/mach-omap2/opp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c index bd41d59a7ca..82fd8c72f75 100644 --- 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 omap_opp_def *opp_def, { 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; |