From: Nishanth Menon <nm@ti.com>
To: Kevin Hilman <khilman@linaro.org>,
Benoit Cousson <bcousson@baylibre.com>,
Tony Lindgren <tony@atomide.com>, Tero Kristo <t-kristo@ti.com>
Cc: Nishanth Menon <nm@ti.com>,
devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH V6 01/15] ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
Date: Wed, 9 Oct 2013 16:28:50 -0500 [thread overview]
Message-ID: <1381354144-7134-2-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1381354144-7134-1-git-send-email-nm@ti.com>
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>
---
arch/arm/mach-omap2/opp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c
index bd41d59..82fd8c7 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;
--
1.7.9.5
next prev parent reply other threads:[~2013-10-09 21:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 21:28 [PATCH V6 00/15] ARM: OMAP3+: support cpufreq-cpu0 for device tree boot Nishanth Menon
2013-10-09 21:28 ` Nishanth Menon [this message]
2013-10-09 23:24 ` [PATCH V6 02/15] ARM: OMAP2+: AM33XX: add lateinit hook for calling pm late init Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 03/15] ARM: OMAP2+: AM43XX: " Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 04/15] ARM: OMAP2+: OMAP5: " Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 05/15] ARM: OMAP2+: DRA7: " Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 06/15] ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 07/15] ARM: dts: omap5-uevm: add smps123 supply for CPU Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 08/15] ARM: dts: dra7-evm: " Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 09/15] ARM: dts: OMAP5: Add CPU OPP table Nishanth Menon
2013-10-09 23:24 ` [PATCH V6 10/15] ARM: dts: DRA7: " Nishanth Menon
2013-10-10 5:32 ` [PATCH V6 02/15] ARM: OMAP2+: AM33XX: add lateinit hook for calling pm late init Joel Fernandes
2013-10-10 13:32 ` Nishanth Menon
2013-10-10 15:20 ` Joel Fernandes
2013-10-10 15:23 ` Joel Fernandes
2013-10-10 15:45 ` Nishanth Menon
2013-10-10 15:53 ` Joel Fernandes
2013-10-11 16:11 ` Tony Lindgren
2013-10-10 13:33 ` Vaibhav Bedia
2013-10-09 23:30 ` Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 03/15] ARM: OMAP2+: AM43XX: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 04/15] ARM: OMAP2+: OMAP5: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 05/15] ARM: OMAP2+: DRA7: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 06/15] ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 07/15] ARM: dts: omap5-uevm: add smps123 supply for CPU Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 08/15] ARM: dts: dra7-evm: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 09/15] ARM: dts: OMAP5: Add CPU OPP table Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 11/15] ARM: dts: OMAP3: add clock nodes for CPU Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 12/15] ARM: dts: OMAP4: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 13/15] ARM: dts: AM33XX: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 14/15] ARM: dts: OMAP5: " Nishanth Menon
2013-10-09 23:30 ` [PATCH V6 15/15] ARM: dts: DRA7: " Nishanth Menon
2013-10-09 23:31 ` [PATCH V6 00/15] ARM: OMAP3+: support cpufreq-cpu0 for device tree boot Nishanth Menon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381354144-7134-2-git-send-email-nm@ti.com \
--to=nm@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=t-kristo@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).