Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752957AbdLSRC2 (ORCPT ); Tue, 19 Dec 2017 12:02:28 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:58859 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbdLSRCX (ORCPT ); Tue, 19 Dec 2017 12:02:23 -0500 Message-ID: <1513702940.14526.11.camel@pengutronix.de> Subject: Re: [PATCH] cpufreq: imx6q-cpufreq: Fix speed grading check for imx6qp From: Lucas Stach To: Stefan Riedmueller , rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, fabio.estevam@nxp.com Date: Tue, 19 Dec 2017 18:02:20 +0100 In-Reply-To: <1513698982-13560-1-git-send-email-s.riedmueller@phytec.de> References: <1513698982-13560-1-git-send-email-s.riedmueller@phytec.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:fa0f:41ff:fe58:4010 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2215 Lines: 48 Am Dienstag, den 19.12.2017, 16:56 +0100 schrieb Stefan Riedmueller: > Add compatibility for the i.MX 6QuadPlus to make it behave like the > i.MX 6Quad, as both SOCs use the same operating points. Otherwise the > i.MX 6QuadPlus tries to run with 1.2 GHz even though it only > supports 1 GHz. There is already an applied patch to fix this issue: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=ccc153a6de1f7741b5ef7c996f9be133772b2092 Regards, Lucas > Signed-off-by: Stefan Riedmueller > --- >  drivers/cpufreq/imx6q-cpufreq.c | 8 +++++--- >  1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c > index 628fe89..5ca1988 100644 > --- a/drivers/cpufreq/imx6q-cpufreq.c > +++ b/drivers/cpufreq/imx6q-cpufreq.c > @@ -218,7 +218,7 @@ static void imx6q_opp_check_speed_grading(struct device *dev) > >    * SPEED_GRADING[1:0] defines the max speed of ARM: > >    * 2b'11: 1200000000Hz; > >    * 2b'10: 996000000Hz; > > -  * 2b'01: 852000000Hz; -- i.MX6Q Only, exclusive with 996MHz. > > +  * 2b'01: 852000000Hz; -- i.MX6Q/QP Only, exclusive with 996MHz. > >    * 2b'00: 792000000Hz; > >    * We need to set the max speed of ARM according to fuse map. > >    */ > @@ -227,13 +227,15 @@ static void imx6q_opp_check_speed_grading(struct device *dev) > >   val &= 0x3; >   > >   if ((val != OCOTP_CFG3_SPEED_1P2GHZ) && > > -      of_machine_is_compatible("fsl,imx6q")) > > +     (of_machine_is_compatible("fsl,imx6q") || > > +      of_machine_is_compatible("fsl,imx6qp"))) > >   if (dev_pm_opp_disable(dev, 1200000000)) > >   dev_warn(dev, "failed to disable 1.2GHz OPP\n"); > >   if (val < OCOTP_CFG3_SPEED_996MHZ) > >   if (dev_pm_opp_disable(dev, 996000000)) > >   dev_warn(dev, "failed to disable 996MHz OPP\n"); > > - if (of_machine_is_compatible("fsl,imx6q")) { > > + if (of_machine_is_compatible("fsl,imx6q") || > > +     of_machine_is_compatible("fsl,imx6qp")) { > >   if (val != OCOTP_CFG3_SPEED_852MHZ) > >   if (dev_pm_opp_disable(dev, 852000000)) > >   dev_warn(dev, "failed to disable 852MHz OPP\n");