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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 876B8C4741F for ; Wed, 4 Nov 2020 16:54:11 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22037206FA for ; Wed, 4 Nov 2020 16:54:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WwnxEpOP"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eNDtigO6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22037206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=otE4idJn0t3SekcOcK+m+OBndo3+hTm1798k21S5dFY=; b=WwnxEpOPQFf+SbQa1b1fBNmJuP TrldzqAddFwW+qfbLhp1UQu50B28HURov+CH+dItISVTc2BUkVgjwf9gcZjVHojDQHJGfC8DI39yY xOwPRlMYbB6NzQY/DKHU3Lp+xHRy6m5a58bl60CCvKBOA0HUeSVcmztoLl7b4yJk5g65slKLxodDI 1+G3zZLVn8yx7engJrgZK0pGssgjJBtVYFTqobqtf5gQ8GK/b4hX3wdpgwaOb1fviOXDDKDWSWy0Y BoXKfM5DTOfdaO0wYUpMnlvfYu0NK/eoqEyA058/QmhQm51iwUMNYePCBdC8M4M9x6nUEILlDD8bZ xiHVFhYA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaM1l-0000ah-DX; Wed, 04 Nov 2020 16:52:53 +0000 Received: from mail-io1-xd42.google.com ([2607:f8b0:4864:20::d42]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaM1h-0000Xt-Nh for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 16:52:50 +0000 Received: by mail-io1-xd42.google.com with SMTP id o11so11604317ioo.11 for ; Wed, 04 Nov 2020 08:52:44 -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=OSWJSxuckmjpD/T0FMCc3UHTVkeiwn2QXu95QzAw+qyivS0YC/EL1ySEuYqsSYrVTc 2CxAxXiHEN7hlAL0L4T4dVFL5mgcIlxn5Nx49AMXQVHicEUumYO3xG0aJbjVXkOE8YvW IqOiY6cQ5gJKartwX3wouXn4Ki7POq1dedOVaJJxJcfRb3vstthrT8wxoup+LSgrHTs4 IM4AvKt6Y0d5r8hn2guPYYpccBI/7Erpto7Wo3oWmWKQg1r/t3MRQR3UsIsHlR27QuRh 4jEz5zJ3xNWdBLjNd7LAFIESCY9tdupUXJypg9hGfAZPumx7wKZNcZDkUQV7QzMaAxcG nK/g== X-Gm-Message-State: AOAM532ijldZ+yE+1FfXyezA8/bvgdQW93pvZ9QCPbz/mZtHdbqOlOKk UgokL8HVldGuzGHWft4reDU= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_115249_828666_EAA47DE7 X-CRM114-Status: GOOD ( 15.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , Anson Huang , Russell King , linux-kernel@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel