linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mvs@tigris.de (Maximilian Schwerin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] OMAP3: OPP: Test for IVA subsystem before attempting to add IVA OPP
Date: Wed, 14 Mar 2012 18:38:15 +0100	[thread overview]
Message-ID: <1331746695-24372-1-git-send-email-mvs@tigris.de> (raw)

From: Steve Sakoman <steve@sakoman.com>

Don't try to add IVA OPPs for OMAP3 versions not containing an IVA
subsystem, as this would make omap_init_opp_table fail.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Maximilian Schwerin <mvs@tigris.de>
---
 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 9262a6b..414f2ec 100644
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@@ -62,6 +62,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
 				__func__, i);
 			return -EINVAL;
 		}
+
+		if ((strcmp(opp_def->hwmod_name,"iva") == 0) && !omap3_has_iva())
+			continue;
+
 		oh = omap_hwmod_lookup(opp_def->hwmod_name);
 		if (!oh || !oh->od) {
 			pr_warn("%s: no hwmod or odev for %s, [%d] "
-- 
1.7.0.4

             reply	other threads:[~2012-03-14 17:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-14 17:38 Maximilian Schwerin [this message]
2012-03-14 21:15 ` [PATCH] OMAP3: OPP: Test for IVA subsystem before attempting to add IVA OPP Kevin Hilman
2012-03-14 21:35   ` Menon, Nishanth
2012-03-14 22:06     ` Kevin Hilman
2012-03-16  9:26       ` AW: " Maximilian Schwerin
2012-03-16 14:20         ` Nishanth Menon
2012-03-16 15:47           ` AW: " Maximilian Schwerin
2012-03-16 15:57             ` Menon, Nishanth
2012-03-16 16:04           ` Steve Sakoman
2012-03-19 21:27           ` Kevin Hilman
2012-03-19 21:29             ` Menon, Nishanth
2012-03-20  0:15               ` Kevin Hilman

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=1331746695-24372-1-git-send-email-mvs@tigris.de \
    --to=mvs@tigris.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).