From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E18DC2D0A3 for ; Wed, 4 Nov 2020 16:52:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C01612072C for ; Wed, 4 Nov 2020 16:52:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eNDtigO6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731569AbgKDQwu (ORCPT ); Wed, 4 Nov 2020 11:52:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731365AbgKDQwo (ORCPT ); Wed, 4 Nov 2020 11:52:44 -0500 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35EEEC0613D3 for ; Wed, 4 Nov 2020 08:52:43 -0800 (PST) Received: by mail-io1-xd44.google.com with SMTP id u62so22887534iod.8 for ; Wed, 04 Nov 2020 08:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ete0w7OwwAo9K9sCTazD4Lhb1CP7WOqpnU3tycCjBtY=; b=eNDtigO6Xsb6qmSJfAC688RmSmLZlxjb7sMlqr3xO3lpzjb/tCAecKcVAI9Vjcc7Fc 4H0lfvD6PDy1PbOdLDhI/RaCfzZjnH2uBTbtzV562y+E8lyegIqp+rqH0qROk67iRqg/ biO6D5mBiZ6yUFzqufIKugZGgpFSN3IO9eDj5vb7K/o5d2r88+t/pUAVqEK/KeXXVdci 5yzDNEICSDouMf7fdElttnJPYdQEDRLoe8MjP+4o5prZH7G3rEt3T2skDRFC9z0MvW4d w1anbrz0LKmLNjMUp1sIFoNtVIK6p2KaZbZ7umpXYA/mcUFngcwILoG4wui6ZweYX8aW HBUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ete0w7OwwAo9K9sCTazD4Lhb1CP7WOqpnU3tycCjBtY=; b=GKwyLKb/czzA7+IBgzXV0t45+uNwvBIz37Ss0rHkme9d+AcjWEJRT5LexEpXN27WA4 yhMFArJ/VuabGwoqz3ehBTTTPe+CKCFKVGtm6HxsYQC/bI/h8STVU39N4XN3VVTJWwht O3fZWJjkBOQdoq9+S4vEDnRehyXpJ1aVGC8l2o8xRKdQYrfC+kr3aGah/2GWBC/QVbRP rsJyeigzY2zFqn0iuGNs5ZQdhtcyVrjSoMKIL4hyTjKKDml+bY9qgEHStw9QQmQwyFGA DUKDEEpTdQGU7+Qx6fSpfIrv+pSADJraidIZacBvPeRG2l/oVdSm2KVaIbO/3Z0pjcur Ao0A== X-Gm-Message-State: AOAM531q4qEy5AWvvU0z0io3Jku3VTTKYDw9rhU4zib+MXIK6RBR0DA3 8zfFqruT6WACwK1FGfEvRvA= X-Google-Smtp-Source: ABdhPJxwr/sJB8QTM0k36oDjJV4HlXHTxM7jEXkIYgw70AvfMmx5iHFRZQDihuCdEXUkfTCr6fmuwg== X-Received: by 2002:a5d:894d:: with SMTP id b13mr1794120iot.52.1604508762603; Wed, 04 Nov 2020 08:52:42 -0800 (PST) Received: from localhost.localdomain ([198.52.185.246]) by smtp.gmail.com with ESMTPSA id n4sm1416097iox.6.2020.11.04.08.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:52:42 -0800 (PST) From: Sven Van Asbroeck X-Google-Original-From: Sven Van Asbroeck To: Shawn Guo Cc: Russell King , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Anson Huang , Peng Fan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs Date: Wed, 4 Nov 2020 11:52:39 -0500 Message-Id: <20201104165239.4738-1-TheSven73@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Tree: v5.10-rc2 To: Shawn Guo Cc: Russell King To: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: Anson Huang Cc: Peng Fan Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org 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