From mboxrd@z Thu Jan 1 00:00:00 1970 From: steve@sakoman.com (Steve Sakoman) Date: Fri, 16 Mar 2012 09:04:28 -0700 Subject: [PATCH] OMAP3: OPP: Test for IVA subsystem before attempting to add IVA OPP In-Reply-To: <20120316142034.GA22234@senorita.am.dhcp.ti.com> References: <8762e6et1u.fsf@ti.com> <5448984682E7954C9BFF27F747A9C6CA56D6A8@dolphin.TIGRIS.local> <20120316142034.GA22234@senorita.am.dhcp.ti.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Mar 16, 2012 at 7:20 AM, Nishanth Menon wrote: > From 5275d09c9f1a16c8f0814745e1c313c6cca049f6 Mon Sep 17 00:00:00 2001 > From: Nishanth Menon > Date: Fri, 16 Mar 2012 09:13:24 -0500 > Subject: [PATCH] OMAP2+: OPP: allow OPP enumeration to continue if device is not present > > On platforms such as OMAP3, certain variants may not have IVA, SGX > or some specific component. We currently have a check to aid fixing > wrong population of OPP entries for issues such as typos. This however > causes a conflict with valid requirement where the SoC variant does > not actually have the module present. > > So, reduce the severity of the print to a debug statement and skip > registering that specific OPP, but continue down the list. > > Reported-by: Steve Sakoman > Reported-by: Maximilian Schwerin > Signed-off-by: Nishanth Menon > --- > ?arch/arm/mach-omap2/opp.c | ? ?4 ++-- > ?1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c > index 9262a6b..de6d464 100644 > --- a/arch/arm/mach-omap2/opp.c > +++ b/arch/arm/mach-omap2/opp.c > @@ -64,10 +64,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, > ? ? ? ? ? ? ? ?} > ? ? ? ? ? ? ? ?oh = omap_hwmod_lookup(opp_def->hwmod_name); > ? ? ? ? ? ? ? ?if (!oh || !oh->od) { > - ? ? ? ? ? ? ? ? ? ? ? pr_warn("%s: no hwmod or odev for %s, [%d] " > + ? ? ? ? ? ? ? ? ? ? ? pr_debug("%s: no hwmod or odev for %s, [%d] " > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?"cannot add OPPs.\n", __func__, > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?opp_def->hwmod_name, i); > - ? ? ? ? ? ? ? ? ? ? ? return -EINVAL; > + ? ? ? ? ? ? ? ? ? ? ? continue; > ? ? ? ? ? ? ? ?} > ? ? ? ? ? ? ? ?dev = &oh->od->pdev->dev; > > -- > 1.7.0.4 Acked-by: Steve Sakoman