From patchwork Tue Jan 5 17:17:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 563175 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 92AC4140B9A for ; Wed, 6 Jan 2016 03:18:37 +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 1aGUIG-00076g-3M; Tue, 05 Jan 2016 16:17:08 +0000 Received: from mail-db5eur01on0051.outbound.protection.outlook.com ([104.47.2.51] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGUHo-0006vv-5T for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2016 16:16:41 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=frank.li@nxp.com; Received: from lizhi-Precision-Tower-5810.am.freescale.net (192.88.168.49) by DB4PR04MB268.eurprd04.prod.outlook.com (10.242.231.23) with Microsoft SMTP Server (TLS) id 15.1.361.13; Tue, 5 Jan 2016 16:16:14 +0000 From: Frank Li To: , Subject: [PATCH v2 4/4] ARM: imx7d: correct chip version information Date: Tue, 5 Jan 2016 11:17:17 -0600 Message-ID: <1452014237-12848-4-git-send-email-Frank.Li@nxp.com> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1452014237-12848-1-git-send-email-Frank.Li@nxp.com> References: <1452014237-12848-1-git-send-email-Frank.Li@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: CY1PR08CA0010.namprd08.prod.outlook.com (25.163.94.148) To DB4PR04MB268.eurprd04.prod.outlook.com (10.242.231.23) X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB268; 2:ku8knX5zAejUGriRwJZbZDpwCJGnFqgKqMR9qlbLVuiNCkXk1GKDidTaDkD/Nukn+200V+5zNN0+VaqFBBuQ4oyeIpqe2NR3GcZvTpUJPeOpSDUIWtGqwQANUBcleA78cf9x6/XJEu9K/TzO4xmAFg==; 3:yUgedQC6sw5QaHGOBHc9/aEsGsA1SE9Yfxf4Ok9sfPnRbBidbABfU468nuWB9ywTV8Gi2/CnAGmMJaJ6EfkXs5WrEHiUk2T//XgD/Vo1ZOvKc1lwg883SBHSe2J/DQBV; 25:WJ/TIjQrDIExqgInb4QAzZ4KTuayXQc6aRd4PyuKczAVK5qAU+deb62avchVY3B5TlnIhcPUtBqHSi2MNbqe8KFo2XazidqZLX7hLW7OXF4zydTbMYDohWaQAOpWmLO6RJXJD3Db72zMg2Sj7OC/GSxcy7t+uowrEJ0gck8uEygjhIAFgv5irhX/EZD6IAsuP0Wl4R4vL1H932igCZnadlG5k2ND+E4hW8DTLSZKVQ35pC6ldKGWeGXl1X73yfj5dTJCS1WRclAqOIiXepTcGQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB4PR04MB268; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB268; 20:H7kClMNzITX6CUt6b36TvI69fJWF+BeJYQVSWJv3TUkA8k23H6MMk43ESP9cdg5+ELyqOeBpuxHTcXVGyBGGWdvP/SF3PbUalaV7++Vhg3Ys8xZNj6nELkCFBP0VN2IBLa7TrojSNtrSm0l4UFzVxe1pe6dT92TMz7hldXxasvoJYtOxSLm74vixmpXnUY8SFC11L5FWJtZamOgltIU7ZRnCvQv4lhS045spplTYb5ogV1Kh7HZd2AIEbnOFhbpt8dF7hd4kS7+Hpw9p0XCjZcYNy1gPRMeSvgDOBviDUhV/8dUTMF5mO3XN9axWIiE218iExumfhMo/nJuGq0YlWXQdXkzCweqmPceavVD1xx6L8rmAuGTP5YEua2L93WB3Z1zCQN8OxD4cPcnbLPj08NvDvk6FI1UHu7kf83jTB0SSdLtztDvGM3JhKb1IV+NnDhwHEpjWUORD0yIL2qw8xXNSQbIBjC5VOU+/KIB9G4NK4CAeanUT9SJcWYQpWqnM; 4:NbZQE+jzLvEzIgaqjdfhTnxlLtg/PN3R8PQyjMJEG863HXdt7i/T9m/6yHxDwvKpktGQZsRJ2rr0VvaTpNqQuc8EXQDpi9Zcbc0sTBYKcAbwe6I0KMqqkVH52BWxlnHZplaza9wFJRsvHG1H5WvYp2gA9/8hDXF31sn8WqVYa5FEfdIlLA7ve6Akp1QDo9cUhbGpP9QLhpFwJVYcm3pgWDThDvMO7gabQR4Lkj1ZxHDvE37t0iam+KHQzhWpErl8oFQHz8Kc/MBpog5TU54AYAOHnLTzkLXU3TxJAxuDdadGa/rXX64D6yqT+sGqk1+8xUep6AzmHLW5VTUj5VRm9odXmn+x+ew9wg7qLCswDTr9zEaCXdrusRAZmrNb+pWDVdcVp4nzie8tR2IBB2Njw6BOI/5I63XrPex3XlTIskRKdjPHBQIiHqoKpBxXrJ4E X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:DB4PR04MB268; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB268; X-Forefront-PRVS: 0812095267 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(3846002)(1096002)(50466002)(81156007)(106356001)(76176999)(36756003)(122386002)(105586002)(50226001)(66066001)(4326007)(229853001)(47776003)(92566002)(48376002)(87976001)(97736004)(5008740100001)(40100003)(6116002)(5001770100001)(77096005)(5001960100002)(586003)(42186005)(5003940100001)(50986999)(86362001)(19580405001)(5004730100002)(19580395003)(101416001)(189998001)(2950100001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB268; H:lizhi-Precision-Tower-5810.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB268; 23:e8tlOA3LOMf2HUonpBomx6A2cWlrdFC4W4kxzdqjil?= =?us-ascii?Q?spM3CvSRdGxj3OlYqlmWdpSOXkdV06EEBRsqOSGvUTYAPI1hr7i+L6Ul+UrP?= =?us-ascii?Q?B883FryYMuEdB1GRGB2zVAbPltpgxmixsbdwHZmijNP4MdQ0E3joovSr/Bjs?= =?us-ascii?Q?wjATyZBiYRXh2W7D+VpvxOIogetRdRbKavK1HdTBN2iwgohZWMcF0qnZzRgp?= =?us-ascii?Q?n36yjRr9Sk5irCnmQLkywNcd+zzbyAkrkb+s7CKMMNgyo6bgjcNxVurWT+Rv?= =?us-ascii?Q?2QBLD3h/Qyvy18mzxmiJn1/zCy/Csas5MDo7E/QpuENe5EiTQKaiXTWkHVmK?= =?us-ascii?Q?/P0AnlBILl3khN6UplHTdJROeYZhcvsa1OwxfL4NDb7xP/K2JarbAsNgXIC/?= =?us-ascii?Q?ktB7ipzge5wZFXclN0C5logmLLwIiNSXnGX0jETYUlo942vXghp1Ib9mB0rW?= =?us-ascii?Q?zjb1zPw0j7E1qK7+hpi7mX73yGn+KOs8Q2ELUPHjGQZgQQANcRxGIncUPJmh?= =?us-ascii?Q?CVEvWJNRnpGhEyRP9S4rXtKx4KuoVmgFdlcTW231qvodbOlJwjRwHSqDXF1a?= =?us-ascii?Q?yJ+rKM/nXcTWzj0iMnob4t56OWhDdJf3cMODx8lg8zMJJnPv1+XUtMOSaVPi?= =?us-ascii?Q?UIYZd1fiRzm+ZOj2yc6QEtJWV5lzRZSamK6iNf6OSND6TXPWxegBqQ92tuwk?= =?us-ascii?Q?7QOBZ09i7rhGB6pS2P47aOb8btjv3TSAmu6hLuaeEnl1tNQHFH9AbQ5ReJ5u?= =?us-ascii?Q?azXGUZLiaHidd0xgx5qv18Wf0oFgNf0e+TVS1/PyqZYw5pto+XIz2BCKk9PG?= =?us-ascii?Q?A3sQLyrY1tSJVMDw0I3Oa3fLlROUNZjQws4S5lDHQYh5ohSySpeXIcqJAA6u?= =?us-ascii?Q?TblRg+8jcy2ZrjU026XPMvBEA6ZCwXt8fggX5sPGNQCX+ks9Vt+u1L5B2Bd5?= =?us-ascii?Q?5W14law5xUdXXR21KopqC6ArB12nPGQQEmudOc7CBznSKVrQSI/0DmOA15th?= =?us-ascii?Q?nNhFqNsp0DgS8eUeMDnfCgzdxv0sSIBfa7evDuhiM4furqAQoHg60NnGmN9A?= =?us-ascii?Q?6R/W8=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB268; 5:dnFDSPk47yDo8/xasQhO3k8aaECdMNKntpXOIq+fVZE20yNXCACty9aVMMwzy1UMUGD1DBvNheC30zwv0bVWeGRNjj20P8sJL+UveOqJots8U4STV6BrGAFm8ggd+Me5iPPvpcMIyO4rL+1Wh3/6nw==; 24:HDSuisXfAHsormRQsp2i7zGRVybJVkft0WA4viWHJazCQf4aZKCTMa1dnn+/mzzt/rBEmwL7X/EQZ5q0t/Q7MmrgWhnBHRz9kOU6NYfY2P8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2016 16:16:14.3419 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB268 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160105_081640_479268_ED510898 X-CRM114-Status: UNSURE ( 8.73 ) X-CRM114-Notice: Please train this message. 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 [104.47.2.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.47.2.51 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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, Frank Li , 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 From: Frank Li The commond 'cat /sys/devices/soc0/revision' can show correct soc version information. "unknow revision" message in imx_print_silicon_rev() will never work for digprog. Signed-off-by: Frank Li --- Change from v1 to v2: fix grammer issues in comments. arch/arm/mach-imx/anatop.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index 231bb25..bd3555e 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -151,7 +151,14 @@ void __init imx_init_revision_from_anatop(void) revision = IMX_CHIP_REVISION_1_5; break; default: - revision = IMX_CHIP_REVISION_UNKNOWN; + /* + * Fail back to return raw register value instead of 0xff. + * It will be easy to know version information in SOC if it + * can't be recognized by known version. And some chip's (i.MX7D) + * digprog value match linux version format, so it needn't map + * again and we can use register value directly. + */ + revision = digprog & 0xff; } mxc_set_cpu_type(digprog >> 16 & 0xff);