From patchwork Mon Aug 10 12:53:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 505619 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B270C14012C for ; Mon, 10 Aug 2015 22:54:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D2D164B748; Mon, 10 Aug 2015 14:54:20 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rwHXRO7MHsy4; Mon, 10 Aug 2015 14:54:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D92E4B971; Mon, 10 Aug 2015 14:54:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 06A374B693 for ; Mon, 10 Aug 2015 14:54:13 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XKwyRVpILPrB for ; Mon, 10 Aug 2015 14:54:12 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0148.outbound.protection.outlook.com [207.46.100.148]) by theia.denx.de (Postfix) with ESMTPS id 197FD4B67F for ; Mon, 10 Aug 2015 14:54:07 +0200 (CEST) Received: from DM2PR0301MB0687.namprd03.prod.outlook.com (10.160.96.25) by DM2PR0301MB0912.namprd03.prod.outlook.com (10.160.217.142) with Microsoft SMTP Server (TLS) id 15.1.225.19; Mon, 10 Aug 2015 12:54:06 +0000 Received: from BY2PR03CA051.namprd03.prod.outlook.com (10.141.249.24) by DM2PR0301MB0687.namprd03.prod.outlook.com (10.160.96.25) with Microsoft SMTP Server (TLS) id 15.1.225.19; Mon, 10 Aug 2015 12:54:04 +0000 Received: from BY2FFO11FD003.protection.gbl (2a01:111:f400:7c0c::137) by BY2PR03CA051.outlook.office365.com (2a01:111:e400:2c5d::24) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Mon, 10 Aug 2015 12:54:04 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD003.mail.protection.outlook.com (10.1.14.125) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Mon, 10 Aug 2015 12:54:03 +0000 Received: from linux-jyl1.am.freescale.net ([10.192.185.183]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t7ACrphB030953; Mon, 10 Aug 2015 05:54:02 -0700 From: Peng Fan To: Date: Mon, 10 Aug 2015 20:53:45 +0800 Message-ID: <1439211227-28030-2-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1439211227-28030-1-git-send-email-Peng.Fan@freescale.com> References: <1439211227-28030-1-git-send-email-Peng.Fan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD003; 1:yBpudZDoe+jv0ZA9G8DOOyfnceVjbuhnxCo+7wW4uYTEiDYxwIGE0jNIowk5yEOWAOmXbyyNvJ2K+OTB8BUIrQLhDvFWiAuZLu8POwp37JF8HBQaeSXYYYLV5F6HCmg/EgLA+/5ZwmBXG3H/ZIunXKidEHp6Yu6ubdHVVHJduPa/NS9uj8IhHlWWy7em9em8oBnZnYPmpX8g6X+sMoWbgjijQcwUXLPneOM8yUUAiFEN+QyOI4kqMGIwkiJrCoBg1Km5Xdad5WvugeLcFEamRdVxVbcYU1RKOVF13PoRCkm7Tum2HRqFalwWyyOwvAHyl+MJh7BVYbJQj/hqhKa0yQ== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(77156002)(47776003)(76176999)(92566002)(64706001)(5001960100002)(69596002)(5001860100001)(189998001)(5001830100001)(50986999)(68736005)(2351001)(77096005)(104016003)(229853001)(110136002)(85426001)(107886002)(2950100001)(36756003)(62966003)(97736004)(6806004)(46102003)(50226001)(19580405001)(19580395003)(48376002)(86362001)(5003940100001)(81156007)(87936001)(106466001)(575784001)(4001540100001)(50466002)(105606002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0687; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 2:cKQS5CiCIuoK7/GVscGYJGvncpwKk1lnhwH92u+yKQ7nU7rYRQstWqH6NsXKlTKaHQeFUFl2DK5BaqV3LU38Y2dvayAq1akgNsGvqavnGYpm6fyZR1c98utD5+HU51H0kM5DrMpzOyYn9lN4Q755Q6hiUQSUiEjTbcYwFoVAeRo=; 3:KfqjdzDvgMsxtvU6gFRrh5g9sv3TelbDKyYN/eKE94nGTKFSprMzVdP1ULMYfAGFvrYIHfnCE8dr7lxG2yzWGCVg7S3jBv4rWQAlhTot0XhkWgTjeFM3puEYeY3uXQZ3TDbrE7QELLnuU2sIZq/F60zl2fCPmpq3Yls2L1JGGNRf5yDdAwJqbIzgTkQkCRBVhnoVtM0PWSqtLEKFnUTEzP7yTQBwkAPW0N7Zi2RXDJM=; 25:x9fW7JD9wY980n1mTNIQjKX2OAI6n1jwLNKffmDL4t32CXzxHgpbMz48YV+hTWuOPrviVA1DYUblAnYPGEAmFvaa/qSqPgmB2PUulQxrWPQB/sTYcBhB6FFZhEQxlNL7vn9DwEY5OeB3uoy8K6FMDoxtC1MXCgcgXttM0hrJ6r2dqQc7I45ytmAZEUhBsqXfWDgXce/YFNKdYpwmbXf/TbfAv4r9M60vX59Ru/xXVmU0Pvh61j7b9dlhKh/pqGz9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0687; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0912; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 20:k80943Ve4vy0GXhB9V/ExeeYQ9InnhJHjUrSOKcLFIWmXyqsbpJnLSkaz5t6jURQXxMRNxWa3A5oYVGYFff9MikKCBTCqqbsEioR8aCpVf1UpyvsXQ5TvcVkBXDkE4RDw1gC8/c60Pq+CVbOhu0qDQJHu94K8J6mJsyCyhLC9JcuSrasPMEXFLLZ82qPNUPxDDgmRYDdbxmHRwrblr4AI3m1kQvZxCc0C9NdWkW7mdPYxojpDZHSia+6cl34XL7s/wm6bfRDctpg3YLWJv6CaWBaaXK4dvt9GZ1Yhk73hsn177Jtj1YJPafAhWZBT0DJAmKzOnrc5XzDn5mCi5KVKVjhhhEiopymleqcWMPRH1E=; 4:yI9tQzp0q61sYZO4gdQSu7Yvd1OtTQkL4Gf6tgaABqf3trsilSVcjHVK1ZTCBNeqGPEJxBFTg1ENNSA+rKJYULG7gSXw4L8zfJ2ixJ26bfvHq+VnYKt0NNAio10Qm+KjuxDX5llrz8+p8uAduAyeRIo2v8qXPkGNsHvLnDLoM1rUAGB4tcc2Z4jS+9ICCsx2uVjk8w5z8/mbxfrDGqwEBpsDXS//zlSosJVQBNn6yIYP06kdLpmVsbsk9MnHvz4tuZpaRbXJAarUbB/qwprmMv0ehLRq/1b8vtUtyF548NM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR0301MB0687; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0687; X-Forefront-PRVS: 06640999CA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0687; 23:Xm53n0EwOOwupnrP81XJCD1/dttuRr+eV4rpp8j?= =?us-ascii?Q?x9BBsIIKuhbxOjpSh37CqQKKLRKJj8P9unB3R6Vf3i6g6xVIwl2Btmf0pu7z?= =?us-ascii?Q?hvlpzXe/OQXY+U9Wc03tB3PssogB0XnJh4vDgV2ofQqmGxsIwB2fxRIsA8Hu?= =?us-ascii?Q?ahz5uniPtCqI5GBkaiyFaRhjh8OoJgAHpoj1Iy96A2hxzn9DVZhUVEaJD5TI?= =?us-ascii?Q?ZiVxmh/u/mhn74WS+lDGyM5cIT3A5EvemHGZLRugyrj+wghXZGO+zZWMqEW1?= =?us-ascii?Q?93fY4idOrzuYHAqNH+4u5MXHDXFqeBi+tS99tBWZ1/04yXDbfZsSQfXLPy04?= =?us-ascii?Q?sRrNa6kbmcfOjxIFCb6gKbtcct6yCc7GvJ9vnxh7tORT/sdJxVejcRQMHyVL?= =?us-ascii?Q?4a/dvItJxH0oKnqol92EaBa0EnixdL6dkqTU/58MhLGdpxW/bPLQ9qiMRXkn?= =?us-ascii?Q?zlL8coqs6M26SxK30Qp/bQHAuu3lEWR/xcRwvx8MbC0CKMtm6TP3WY8HsMdk?= =?us-ascii?Q?mFEMFiWGCI7Imdj9AR6ZQd2zE/iG/DcjsYH1HFtImIVhH55QC3p6sfPyzki2?= =?us-ascii?Q?0oQGfzzNOyBhrbz8ed6MYADYsad2Uu2qbZLzYg0J2/vAbDhqc6gWSJ78RksR?= =?us-ascii?Q?T2gWLnpXvj7Z9sM8zgqdgk8nvXG15xH4DIeQwUj2zr6fr7F7iGjVblc+XUql?= =?us-ascii?Q?v27r9Zpt2tnsuXaybz+yozPeJFF2hBzSeFalsUHYAxfr2XQWGH/jpYbt2p+l?= =?us-ascii?Q?nCmqAgsoe/gCt/JmOkoWbcdM/bV//LEC6r+5UVMiUr+wcfNRiIcXegtGfhlT?= =?us-ascii?Q?5G7ODSb8vMdY9uN0ix9jFIV8DCuqEHyhlQ5HjaCX8sA6GzvlmC4CoSIlF09u?= =?us-ascii?Q?OQn11oNVUWwyxmvKQ2yPVDaj9y3o5nxEe6ACeibwRjYEU2++mQmWQeewTY9V?= =?us-ascii?Q?FxDPWIYRjMLpG7GhsqcY8i3tzcFr4Gknc+jb1G7EVStCtcDM/EzO6/f+DQ0g?= =?us-ascii?Q?4YjVjXYNHgtbMOjW3fknz0XcG1gK5/2iDz2Juytr04yF12oQYjxWqjtWAH/t?= =?us-ascii?Q?y+a86+G/0lUx5jQ5ZDDFPftVasILL70IpOZivx29KMv0aEr26f3DxV1gIKYE?= =?us-ascii?Q?c0Xh6GsMEHBbWOKTzupnx27ZlDbYhggNc/vPaK6nXFzk4yIWmT52mdg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0687; 5:DoDTngeOQm88Pq9lWNokP+0eCaDHcXxPtTV2jBXVIaUM7nwiOAF0yUr+K9RadcWd0gbIwWAwNw2R1MXWQWohbdwH+uK86MP8UPM5SaZKwS15yMomkeU8JtC6N5JMkCVR4tAacQXptEKlFDJVvkW+TA==; 24:MgGScPwPf6otJJMvR753YNELX4Kqi2D9KXIi3Pi1Vp4nyZYcMIa2NLp34qbjmg8or+q3f99GkOijkn1rX3fIwB9u/SfFUGkXpN9mPYM+qBY=; 20:qCMQDQI51PbLPFZEuikpZMqXliq7xgn2JV2jWPQ/KJl9a4VMMpf/RcCk7iFjHzC6q2apjvJBJ68yDvjNrnfuvA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2015 12:54:03.9766 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0687 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0912; 2:NKxMhr3aCsNRpHwTNHWXefYa4g3A3Fx/lRAVx4cpGkukr1SDgB6chPhTPNwvS0xTJauNsJQ072zJP0BpM5i/HvP/JzX73roMjfvfJLHhewLKDPM1CToQ8n5EN8FEwrvg8PHvXJ0Tn9Fe7oxLvRF3dqjMzwY3lAQzd7l1DeugaZs=; 3:nZEAhBF11GnPevM81WLGfD8Uk3p/5DU6iOV9xhIpoXn3Z/txy2mMH7I5S9EtS2ki6mAua/BREizIRkW+w9qXVq51vDelclKwxC9helSVKL/MWjFQIq+Rc01p2V9f+lE+ZwSJNbH+qXRMjRl9uRH4sWD2cLzQDoXrD26YnUgeYq5odT+eeqHk2CIF5kjbfcJbO/FWHB5dkz5PgciTH4GU+QsVF7CGTjLVPB0uGxMFRE8=; 25:aTlrFUUoUpZGEPn935Gqnmhaw9gTt0sENKqQ4eEsCza2z1tM5BFiAFVULKJovvqvOud1Ng1TzMVyuyTTBzJx2EW+79l8/vaoyESxNbJQgh1A88P1YDIg6os1Ef61J2M21A53Doz2ktuBGVCNe86XsgMQTs+PBTFpStrZXs8lXKmkY6SQZwBwuolhBEaHzt2eKyHBQfV0T/kwK1JrdSXMyjgzj8pzGHqKzhhlVuhYsdIB6x3i3TAe9LLiKxVMAskZ; 23:xSsm6V8a1pp20DE9jz6Qacbb8nvasZuWHtwdi/CczlZsriMujnqgtfawqjcJxBD6Ecm54NMActdRrFM0ZtwDueLBO9stb2ZqGq5ELode87nfcCQt1vCTrr1ctV66ZUxcQcikj6W5lHb0S3oaRI9yk0q6oX8DizkQq9Oxj3GYXh5+YxvCYJV3Dyg36uibUsUtKJU7Mg0dAPvSwzqacYVW1POn11yqs+noxrZdflpb8s0YsQAeduvh+0WEEZ5n2/xR X-OriginatorOrg: freescale.com Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/4] imx: mx31 use new formula for get_cpu_rev X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use new formula for get_cpu_rev, since we need to use this formula to do runtime check for all i.MXes. Signed-off-by: Peng Fan Cc: Stefano Babic Reviewed-by: Stefano Babic --- arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/include/asm/arch-mx31/sys_proto.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index 060d46b..fe96670 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -175,7 +175,7 @@ u32 get_cpu_rev(void) for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) if (srev == mx31_cpu_type[i].srev) - return mx31_cpu_type[i].v; + return mx31_cpu_type[i].v | (MXC_CPU_MX31 << 12); return srev | 0x8000; } diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h index b0dfcba..1626442 100644 --- a/arch/arm/include/asm/arch-mx31/sys_proto.h +++ b/arch/arm/include/asm/arch-mx31/sys_proto.h @@ -8,6 +8,8 @@ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_ +#include "../arch-imx/cpu.h" + struct mxc_weimcs { u32 upper; u32 lower;