Commit 53cc6bc6 authored by Sven Van Asbroeck's avatar Sven Van Asbroeck Committed by Shawn Guo
Browse files

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: default avatarSven Van Asbroeck <TheSven73@gmail.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 7544bfc0

arch/arm/mach-imx/mach-imx6q.c

+7 −2
Original line number Diff line number Diff line
@@ -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());

CRA Git | Maintained and supported by SUSTech CRA and CCSE