From patchwork Fri Dec 11 10:45:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bai Ping X-Patchwork-Id: 555660 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DF4C5140213 for ; Fri, 11 Dec 2015 21:47:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a7LCs-0006Vj-R6; Fri, 11 Dec 2015 10:45:46 +0000 Received: from mail-by2on0142.outbound.protection.outlook.com ([207.46.100.142] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a7LCk-0006R3-0O for linux-arm-kernel@lists.infradead.org; Fri, 11 Dec 2015 10:45:39 +0000 Received: from DM2PR03CA0033.namprd03.prod.outlook.com (10.141.96.32) by BLUPR03MB1347.namprd03.prod.outlook.com (10.163.80.25) with Microsoft SMTP Server (TLS) id 15.1.337.19; Fri, 11 Dec 2015 10:45:16 +0000 Received: from BY2FFO11FD033.protection.gbl (2a01:111:f400:7c0c::172) by DM2PR03CA0033.outlook.office365.com (2a01:111:e400:2428::32) with Microsoft SMTP Server (TLS) id 15.1.355.16 via Frontend Transport; Fri, 11 Dec 2015 10:45:16 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD033.mail.protection.outlook.com (10.1.14.218) with Microsoft SMTP Server (TLS) id 15.1.346.13 via Frontend Transport; Fri, 11 Dec 2015 10:45:15 +0000 Received: from b51503-01.ap.freescale.net (b51503-01.ap.freescale.net [10.193.101.130]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id tBBAj0G9027124; Fri, 11 Dec 2015 03:45:12 -0700 From: Bai Ping To: , Subject: [PATCH 3/3] ARM: imx: Identify imx6q rev2.0 as imx6qp Date: Fri, 11 Dec 2015 18:45:22 +0800 Message-ID: <1449830722-26607-3-git-send-email-b51503@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449830722-26607-1-git-send-email-b51503@freescale.com> References: <1449830722-26607-1-git-send-email-b51503@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD033; 1:1dd5N3igqMiInRNszPVAAc6Sax4ygMM8u2bDnSY1UPXDNAGEMa71cpXtv7+9lEjXde3+FYFQGPdM6VSayD4j5EbigGa8raZ3ziaoEkUl1eQP4Eh7zVM6NtuB0cSNkAHdt7G/vt5qqSVFjUcoNxFnSSwCY01Mxrq5JEFy2NSHgKx0dwa7DwvepKdJsq0Voj3cE8IN7wr/PWQVti7Hjg0ssL4keRrIX9bwgOWdFmEem6gqnhgUwaomu2AQtZ9ufWTyg2t8V5j87oarH6N1casYoHASahxFLPC2W8GIkCfcv3/kROf/HzBzj4GTXd7r9ba4WwLB0JJKbeoI90PaSVoQE4P7gO+uqJFStL+BvG/hlgujN6HyVeBtIeVzqIV28GCOvnGgFN1nOq/4VqGEvxs6H7DnxkBUpsEo4Ylom0cJCZc= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(2950100001)(48376002)(1096002)(11100500001)(81156007)(1220700001)(50466002)(104016004)(586003)(36756003)(5001770100001)(6806005)(97736004)(5008740100001)(5001960100002)(50986999)(189998001)(85326001)(50226001)(77096005)(87936001)(33646002)(106466001)(47776003)(92566002)(19580395003)(229853001)(76176999)(5003940100001)(19580405001)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB1347; H:tx30smr01.am.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1347; 2:/e9+sz5IQ2g2MGRHUqPCeWRHFI0o9tpsNyH2WL0ydgVx9vHCyG2iJbCi4rdkhb5fBkxxOoXRC0Jm+DHCChfCQ9U9RKIee75Z6SRKq9nueGmSTcsf8B92FtJhie15i42hA8kBmhhQpebpE4uVPFODIQ==; 3:5ps7hYFlyr8DJdA3CC8pyqF2WqI8awZDClwk+oViTbrDY/oxfFqdvAPbceKZbMq5JMaws5pXes8v5+rtx6NQgLpT3WVuOUKXy4uj9TOAdyEPBJ/RksyotzMAwdTNfYjTFTqW9bmTjWhdIRm8mIeJzQWQxzVoUoq9PAy3qORoZUMegdGFwVolSeGD2fIT3jqv0YQdjjLSkE57VeqWNtmsrvjpyNPMpbBMLULyT46hF08=; 25:YmrG2DjCmxw3luvUrEjNGYJKs35Jszkv3kcPa1svIvzBdWWymmgNelCoPOA+kBHLBjFUZTqFmXI3VD2Xsuhc5z77D7YR6IbFl8QCOq7x8WMiLf1T9ZhPQqlttysZIKksjZw9h+fPLMlEh0Yb9fGfyT75/qKyfbIHaW0WSHzFXInBBA1DfyM5aqMYGZSvwVUqlOL8XLdqzovAFsOC1umGVum/GHKxS7yLO+afUSYLlpmnsx87eNjtPG1+jqToVbXUPn9KRsmmY3y+Gi4kdqgFlw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1347; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1347; 20:bwOyLvASByVALhKWUcr4nOBnOe9OcXwlcPVs8OKGHm/DTxW7y8kTH2FhssoWIpX6wA9K5yDRce20W8DuicLqV6w8q4/5Sz6D7QIXbGVg6nb9BiDOxT9JT8kKZN4myIK95L9vMdLUCxLnXZo7FTKvM6RBKy0zFlihkYTezodo/D+ZETTLgPrU54QqBuuvACFksCXDB+EywprgjXmqFPoeKZqZIg6kmxlrnGWVSaWnl+eIjxoKfaU/DITisJujWY79G7lew2v0GKht30G2WoOp0AmZXaB6lsexYf1Gf4whQafOkVgXlBPu7ZOKKbA/cLojNl5VtMHFCuiC0d/7Ut1NPGZT7WkJXGKziKr9aVFXVis=; 4:RnKHn5Q08afLQjy4pWjSZpOpjnt1z3SBJQh6G868T+AeetNpQ16rqXMvNJv4CRxAf/xYdg0iIbraOSzGNBzDhTYScT6gyEVL1PpnCL4/K3dg1cDRKyrZpedZohk+p4oSFJlJQCb+CqOoBjkVTTakSILqBpnTGZxXqMJItRZKFXH6hKkeVkkyFhVXQIszxFJCobgHOfjUOWC8vfVA38+BZHTZEMEebAVFqsnNoGjkWFk7vT0UYV+n13B129MWsTE0gDdPSlNcd9xCXM9T8aIrpob9oGcPqgcR836evpqrwxT+LxZ/Tgbf394a8xjcMCRkXc7NCkFVHX2EpKZsSEdoheSHtY2Zmkoim5h7nj+yUwiK+Rp2Svje7r1ZlVrBRluQwgvtR81R9QWAe9YVScwwSn5nCBV98FmEJMtQnn7M2+hecmWmzePtiKS6E1rNYIgT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:BLUPR03MB1347; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB1347; X-Forefront-PRVS: 0787459938 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB1347; 23:qHt1VZtodBkM/hV+a1/EQOA9dDvTGlVcZT4c6DXxF?= =?us-ascii?Q?BLyjGCzpB4KuHftJDyj4xrQIeTSnm5iV1yCZUzf6NgFS9pia3KA34VLLWiF9?= =?us-ascii?Q?NIWnDwuLYt/6xFAz4Ujh7qGGLvtlisciBNQNDblj8OlvIY+NpzC8upPF0um3?= =?us-ascii?Q?l1D3xS6pr881NCyrtmsKHgDlP2yzA6KRCiwVxWTj+7RXQf3vg4Iqo9dmwjTt?= =?us-ascii?Q?OOax3FNxSSME9Hh5ZfJGKugK+GYCNkSXNb4LvM0jtso172e9orUjiKGCqlj2?= =?us-ascii?Q?m7oO7bNurgdan3pzRmUjemBECG3hZaK+dn80cciFB4Ki2h9/RLXRg7/O3Ajk?= =?us-ascii?Q?7zAOvflkQL+qRxyFQXYBIPigalMA5N0KXEyxA+ocBkLCzddewXlOWjxIHV44?= =?us-ascii?Q?SqZDG+dtZrP5SnS8XPqX1/2NRWZeo59SrkrBYQgTKPOOiWzoILAsKAeJ7nXo?= =?us-ascii?Q?3M/cocm7BtMZ16GAeYPDleTLYNuTvzcf4gxY64SBG0jbC2Qr4haT5ZfaAPWP?= =?us-ascii?Q?9XWSeru0vGtUQ7j0KIJBG9FEN8vlZ7QKp82E9UaQN0dluv6rgNcSOsTNOTrX?= =?us-ascii?Q?mf4ejK/MdntXfgaU/Tfl/Y7ssCDVYsEw8R5IMLk3gwVR0zp0i8QcacR3Milp?= =?us-ascii?Q?dQhTsiERuYYzt9A371JFDDq5sJ3I0XRiF6JseQtiAyEpnpeBpUniOl2iGdVV?= =?us-ascii?Q?L2zWj9jnqXJu7UiFI6+m8I0H8Ywowci0YEcYAFPgHYKZatZNf6B5hTxXn2Mg?= =?us-ascii?Q?g2Ut3QslBDnaT7NO7ZJPUszcAdraOB04pD52zDDpxFgBmnkgrQ6lwN5iOaDO?= =?us-ascii?Q?RduHf23sqtvt5HI7xVEIGy3xEoHCF4GoUkoT7ISHHM2bdO/64QUu6QFy+SmG?= =?us-ascii?Q?t2x8VdoXyFzhNX+VG599mnrHiuWiinMH3rbcQyqhVpqVdQ/BeuRkvtobu8k/?= =?us-ascii?Q?An9E954ueep3UzfeYjxbdLQrf7UehDugVFiyeNHi3lrR/5thHutJ2Eu9PzkQ?= =?us-ascii?Q?b8=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1347; 5:upRtCzJDw6Z/GuihuwIJP87Zeci84RYs+YBjTtEKPdQuPv+KZsXFyJy3LJ6Ep+tWGoQ7jJupJzj+SBoyYjVfbi8vPVGmhz8ERKiHgwDqOVZEe1Klic2fP0THby3/Stb1B389O4TNBR7s/B5a+Mm5AQ==; 24:RvynXmtfMVc2D2+M/dym0uhTZJRSp3oWk2RNVIPI9THVQ3ecyvVGbszPWt2eBq9VaElCcV7XkEhju5w6h6+1VSUKDZAHgce1fGCD9QkfOqg= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2015 10:45:15.3552 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1347 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151211_024538_316840_CADC926B X-CRM114-Status: GOOD ( 16.23 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [207.46.100.142 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [207.46.100.142 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, pawel.moll@arm.com, mturquette@baylibre.com, sboyd@codeaurora.org, robh+dt@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The i.MX6QP is a different SOC, but internally we treate it as i.MX6Q Rev_2.0 to maximum the code reusability. The chip silicon number we read from the ANADIG_DIGPROG is 0x630100. This patch add code to identify it as i.MX6QP Rev_1.0 when print out the silicon version. Signed-off-by: Bai Ping --- arch/arm/mach-imx/anatop.c | 5 ++++- arch/arm/mach-imx/mach-imx6q.c | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index 231bb25..9622763 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -129,7 +129,10 @@ void __init imx_init_revision_from_anatop(void) switch (digprog & 0xff) { case 0: - revision = IMX_CHIP_REVISION_1_0; + if (digprog >> 8 & 0x01) + revision = IMX_CHIP_REVISION_2_0; + else + revision = IMX_CHIP_REVISION_1_0; break; case 1: revision = IMX_CHIP_REVISION_1_1; diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 3878494b..cb27d56 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -266,8 +266,11 @@ static void __init imx6q_init_machine(void) { struct device *parent; - imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", - imx_get_soc_revision()); + if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0) + imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0); + else + imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", + imx_get_soc_revision()); parent = imx_soc_device_init(); if (parent == NULL) @@ -399,6 +402,7 @@ static void __init imx6q_init_irq(void) static const char * const imx6q_dt_compat[] __initconst = { "fsl,imx6dl", "fsl,imx6q", + "fsl,imx6qp", NULL, };