2020-11-04 16:57:22

by Sven Van Asbroeck

Subject: [PATCH v1] ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs

The i.MX6QP rev 1.1 SoC on my board is mis-identified by Linux:
the log (incorrectly) shows "i.MX6Q rev 2.1".

Correct this by assuming that every SoC that identifies as
i.MX6Q with rev >= 2.0 is really an i.MX6QP.

Signed-off-by: Sven Van Asbroeck <[email protected]>
---

Tree: v5.10-rc2

To: Shawn Guo <[email protected]>
Cc: Russell King <[email protected]>
To: Sascha Hauer <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Anson Huang <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: [email protected]
Cc: [email protected]

arch/arm/mach-imx/mach-imx6q.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 85c084a716ab..703998ebb52e 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -245,8 +245,13 @@ static void __init imx6q_axi_init(void)

static void __init imx6q_init_machine(void)
{
- if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
- imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
+ if (cpu_is_imx6q() && imx_get_soc_revision() >= IMX_CHIP_REVISION_2_0)
+ /*
+ * SoCs that identify as i.MX6Q >= rev 2.0 are really i.MX6QP.
+ * Quirk: i.MX6QP revision = i.MX6Q revision - (1, 0),
+ * e.g. i.MX6QP rev 1.1 identifies as i.MX6Q rev 2.1.
+ */
+ imx_print_silicon_rev("i.MX6QP", imx_get_soc_revision() - 0x10);
else
imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
imx_get_soc_revision());
--
2.17.1

2020-11-05 04:15:36

by Fabio Estevam

Subject: Re: [PATCH v1] ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs

On Wed, Nov 4, 2020 at 1:54 PM Sven Van Asbroeck <[email protected]> wrote:
>
> The i.MX6QP rev 1.1 SoC on my board is mis-identified by Linux:
> the log (incorrectly) shows "i.MX6Q rev 2.1".
>
> Correct this by assuming that every SoC that identifies as
> i.MX6Q with rev >= 2.0 is really an i.MX6QP.
>
> Signed-off-by: Sven Van Asbroeck <[email protected]>

Reviewed-by: Fabio Estevam <[email protected]>

2020-11-10 02:25:51

by Shawn Guo

Subject: Re: [PATCH v1] ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs

On Wed, Nov 04, 2020 at 11:54:18AM -0500, Sven Van Asbroeck wrote:
> The i.MX6QP rev 1.1 SoC on my board is mis-identified by Linux:
> the log (incorrectly) shows "i.MX6Q rev 2.1".
>
> Correct this by assuming that every SoC that identifies as
> i.MX6Q with rev >= 2.0 is really an i.MX6QP.
>
> Signed-off-by: Sven Van Asbroeck <[email protected]>

Applied, thanks.