diff for duplicates of <1507636655.20816.8.camel@nxp.com> diff --git a/a/1.txt b/N1/1.txt index 3731bb9..a9d59f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,23 +5,23 @@ On Tue, 2017-10-10 at 13:44 +0200, Lucas Stach wrote: > > IMX_CHIP_REVISION_1_1. > Did you mean 1.0 here and in the subject? This would make sense AFAICS, -> and is also in line with what the code change does. +> ?and is also in line with what the code change does. No, I do mean "1.1" for 6dl. It's a bit confusing because the code uses > instead of >= for comparison. This patch results in imx6q_cpuidle_init getting called if -(cpu_is_imx6dl() && imx_get_soc_revision() == IMX_CHIP_REVISION_1_1); +(cpu_is_imx6dl() &&?imx_get_soc_revision() == IMX_CHIP_REVISION_1_1); without this patch it was skipped. > > --- a/arch/arm/mach-imx/mach-imx6q.c > > +++ b/arch/arm/mach-imx/mach-imx6q.c > > @@ -374,7 +374,8 @@ static void __init imx6q_init_late(void) > > > -> > > * WAIT mode is broken on TO 1.0 and 1.1, so there is no point -> > > * to run cpuidle on them. -> > > */ +> > > ? ?* WAIT mode is broken on TO 1.0 and 1.1, so there is no point +> > > ? ?* to run cpuidle on them. +> > > ? ?*/ > > > - if (imx_get_soc_revision() > IMX_CHIP_REVISION_1_1) > > > + if ((cpu_is_imx6q() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_1) || -> > > + (cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0)) -> > > imx6q_cpuidle_init(); +> > > + ????(cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0)) +> > > ? imx6q_cpuidle_init(); diff --git a/a/content_digest b/N1/content_digest index 01ae80a..d65440a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\0bbd72503f0e79cc6df4ba12db41b980d50415caf.1507634288.git.leonard.crestez@nxp.com\0" "ref\01507635857.2745.12.camel@pengutronix.de\0" - "From\0Leonard Crestez <leonard.crestez@nxp.com>\0" - "Subject\0Re: [PATCH] ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1\0" + "From\0leonard.crestez@nxp.com (Leonard Crestez)\0" + "Subject\0[PATCH] ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1\0" "Date\0Tue, 10 Oct 2017 14:57:35 +0300\0" - "To\0Lucas Stach <l.stach@pengutronix.de>" - Shawn Guo <shawnguo@kernel.org> - " Fabio Estevam <fabio.estevam@nxp.com>\0" - "Cc\0Rafael J. Wysocki <rjw@rjwysocki.net>" - Daniel Lezcano <daniel.lezcano@linaro.org> - linux-pm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - kernel@pengutronix.de - " Bai Ping <ping.bai@nxp.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-10-10 at 13:44 +0200, Lucas Stach wrote:\n" @@ -21,25 +13,25 @@ "> > IMX_CHIP_REVISION_1_1.\n" "\n" "> Did you mean 1.0 here and in the subject? This would make sense AFAICS,\n" - "> \302\240and is also in line with what the code change does.\n" + "> ?and is also in line with what the code change does.\n" "\n" "No, I do mean \"1.1\" for 6dl. It's a bit confusing because the code uses\n" "> instead of >= for comparison.\n" "\n" "This patch results in imx6q_cpuidle_init getting called if\n" - "(cpu_is_imx6dl() &&\302\240imx_get_soc_revision() == IMX_CHIP_REVISION_1_1);\n" + "(cpu_is_imx6dl() &&?imx_get_soc_revision() == IMX_CHIP_REVISION_1_1);\n" "without this patch it was skipped.\n" "\n" "> > --- a/arch/arm/mach-imx/mach-imx6q.c\n" "> > +++ b/arch/arm/mach-imx/mach-imx6q.c\n" "> > @@ -374,7 +374,8 @@ static void __init imx6q_init_late(void)\n" "> > > \n" - "> > > \302\240\t\302\240* WAIT mode is broken on TO 1.0 and 1.1, so there is no point\n" - "> > > \302\240\t\302\240* to run cpuidle on them.\n" - "> > > \302\240\t\302\240*/\n" + "> > > ?\t?* WAIT mode is broken on TO 1.0 and 1.1, so there is no point\n" + "> > > ?\t?* to run cpuidle on them.\n" + "> > > ?\t?*/\n" "> > > -\tif (imx_get_soc_revision() > IMX_CHIP_REVISION_1_1)\n" "> > > +\tif ((cpu_is_imx6q() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_1) ||\n" - "> > > +\t\302\240\302\240\302\240\302\240(cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0))\n" - "> > > \302\240\t\timx6q_cpuidle_init();" + "> > > +\t????(cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0))\n" + "> > > ?\t\timx6q_cpuidle_init();" -90181f86e0164378fec1983798a7003ec142246c652e488c4718cfc8db185fc1 +5e650d3eda65d438e0a5551d932586dfdd7a105c5de7f6eba8e353cb14c55d55
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.