From patchwork Wed Jan 10 05:20:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 857960 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="PkW1yEXJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGd356xC8z9s82 for ; Wed, 10 Jan 2018 16:33:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 25E93C22108; Wed, 10 Jan 2018 05:29:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6BD90C2211A; Wed, 10 Jan 2018 05:22:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A79A0C2210B; Wed, 10 Jan 2018 05:21:44 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30064.outbound.protection.outlook.com [40.107.3.64]) by lists.denx.de (Postfix) with ESMTPS id 9E8D3C220E5 for ; Wed, 10 Jan 2018 05:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=JDlKRkjRYuRWZplWdpk7Cj2KYsTo1QpM4zjXQBF9+88=; b=PkW1yEXJ3dktGHw/ZvkSv7LxyKXlGNImoMQfKjgMahjn5d4x/r62RqLW6Tcr1HOth/3X7YPx/xkN7S4+WjMaPfaOVa42I/GJDKUvj/PHCcY8SKgoxeg6heT5ZuCCbREkzbVzgEqLbs4Q/yswe7LWjDpOB1KZJlqnYVulR0G0sl4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 05:21:37 +0000 From: Peng Fan To: sbabic@denx.de, fabio.estevam@nxp.com Date: Wed, 10 Jan 2018 13:20:30 +0800 Message-Id: <20180110052048.4425-14-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180110052048.4425-1-peng.fan@nxp.com> References: <20180110052048.4425-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0219.apcprd02.prod.outlook.com (2603:1096:201:20::31) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f93adf8a-cf1c-4c55-3e56-08d557ea074c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:boit3Icm/S/lW4IEdckDpZ0AS2wVwXvFEVRWvm4nZJZTgcHsypEBF0EHu4ZsvdX7z19YlDnxTEriSuhhR3jvlCNsjDrhUVW7S2mQ6iUja+WhwlxG400Tq+gwsv6d8TusDDRdsZwP7CFY9IT2tgtw7XEoUPfn8nG4S1iR5Bxj9eqi5gGfVZ243VbVM5N5vQZN6A9chZQO/V4da9ABJik/eXBNFUhLUQ0lt51aDCfiZIEVzYMAsGQjPKkSQt133oOG; 25:PLsk0UafDp2DOcR3jVb42rdTfZ7+E5+2pXBsd9AujBMG1C3Mp8KAIYrYF641m43DckNwm8HE95fsxSzcNBQzp4n/9Mnk3wcTJ9YO5EXGaATCo9czryaszU8yy5tr0SkYPGkrnIIRsarK738nFI0altdGKTqi0yBWaDLBqkfzSt1uE3C7tw321GS5B/RujcueF11IOtk1JZiWdFiUFQUJuGABgt6ACMWR7JxNuvlzUkbkk8EWmb0/AADdZxeaCbVioT8Hgk4ony8JY00reQ1+giziIrNTCl0qxKooCX7wx7xfSZms26zhNcy8Xy33PGn4YpBygiiMO9JFQbhz/DXJwA==; 31:3FdtqCRRaGJV2VxpD/cQ6CY4q3CUwHBs92JairH55bVl9u/iD6qwc91RiHiZP8OFDz7LgPOn2K37LTfv8eXG3O14MYTjimpCTDXWDnOJym+/6dB2nNEcdWLyQhiIoIifOaf49EomvQ1FTpzG9QPIm8cx0wVMGK8cBX3UT+SWJ+tJv9VGv9ZWCPJk1a5jP6BeGAOUgOOIEGtDZNCwC+OGbmQG+Yvb2nQp1T2vNkqU8zw= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:1aNFLi/ikpmziqyPKqBnAG7gLyD6HV0zVUT7du50rMmBKEVkkAyhvBCjX+leSjIgkqHaU3p/4kAaQa9NQa3VYI7EpSt5U47XpxHpsSahZ5TPrOekJ9YGqRjilUiqZ+gjUVdnYQt+yQOjRg9EHWg3FvZBIfbqytTtFy5gKWRi+H2Y8gBbJ8Gzg+MVUS246Ey+AYic/tPc1ms7MllA6C6Pvp/BvvjsoSvjmRjjcgzJ81uUFiMRjD2eoETcWwZUuGbpo5uvXMoYT+MkXHAzix12IATsyTo+nK5pSajoy60wszChKz+FQit8RkKUgYMaNa39+wBZcsN1aZfiRv4uIk2XBXbNNXq6uaEdtk13KyJiS9nkBTgVb4wedt86ppwsaFzodIpfeTHySVkSK3ZgSwx8TJUc8ocpNvMQ6W41I6KBOw0y0uf1fTbCxoiz73Fg0h9QAirUNGCM/zBmPDfB7GKLRoKlEj0qbSzfwvOobavlzDb0qYHyZML25P6MJZJHgGv8; 4:r7HYEuKZBkck02rVAPJPT2DUUBI0Dy3EWi/4lhF4JQrCNJZjuAXksGUY1IOHlvPGfC8LiYA9eRjEPSP9P4Ia/58COdEw9jCvrdEe1PixhNW4Dg6LlEuF72ohOfss+eLc5B9vXEiymUNhEE9Zn6QsLSVek2k+Xhqd+bc+OOW8sAo+iZATgUbM6ljD3VKYDiDLnFkUtd1xUVky4leE7nUlp6KsgXh9mPJZhkETdhzASSu7AvHxM/SUifxYjmus08yoPmh2sjScbZYnmx95ada0JuS43jZWJsj7jJTppFVj7SlzjTA/92LYw27214QDR8n1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231023)(944501075)(6055026)(6041268)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39860400002)(366004)(39380400002)(199004)(189003)(6486002)(386003)(16586007)(68736007)(6506007)(6636002)(86362001)(6666003)(2950100002)(1076002)(81166006)(16526018)(6512007)(6116002)(8936002)(3846002)(97736004)(5660300001)(50226002)(47776003)(4326008)(53936002)(50466002)(48376002)(66066001)(81156014)(36756003)(25786009)(39060400002)(106356001)(478600001)(2906002)(51416003)(76176011)(305945005)(8676002)(7736002)(52116002)(105586002)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; DB6PR04MB3221; 23:AyBF8BYVstDhmt/yJfxTi5KNnBXuUDUiwz45j1n29?= YYAQIvs3t8H2tvY6PXgCaZYTRh77tTpB5xWJgL+5bt1ljbmJRomRcUI4QZAT/wl65wr4aVKkEOZkBX9KG9GB4HWgfv2GTPlryZDGOsk+gZG79JoM8tSTQOwRnnejvgpZhpRcrsH3U2Jhej5Ns7NNFM3PXEL6i42ix6Tw40XRdpuna8OpV9EQiZ1sLb2YTz+4f232UVFnbG5ryEz4oe8ock4WzAAsCmhYX9y7eN9TsgDa9BSiUCt/lk9EtO3UNn6RG+i8M6dcH0XHmm3k8Nx+OH9nieS2dkCG/vKx6b9OuWqoiMDyoHsJqi+H9gxED4bmYP4Hfv2yQeLKqsEc0iIqJbvlIc5f29bRYfBNYOwv0sFtwlA1uQudF8lieOC6BnFC0YnzpF1KvPcv8gdUfjXz6wgzwovynnjm/SL3eaVrbFIzFVREmnQI3nfb8E2LJfrnbDh+8slP4tpMJtzq7tOOmyAxrNQ7Ha9x8FW2B411rwYMa5azWSaZXQPIDtmevQR8rjIuNYcwPEh+JUMjVdgtwdAyRFeN4r6zeaoP3O698c7oUNTn90ScAwu6HRFzooY5GgT0DRrSm3BDqPZ24TOr40x2QLS8ba9xJ2fvlc8r6bvd0F3xbJibOC9L+Nd+qKRHI0V6F5OBesDNfSfk1T99+48wfjH2QLASvFhgBGGUw7rchKYqQcpJU/dafUNxDjHczgujn5d3IAKhBvKM1EJ1qnbe1hMeDFkAJmO5tJFxFKc0NvJWKtkGFWBU9BSaOE2rXEoL6rI6jQnSyUf8iUVdV2N0k2ggiOHsB8SmUi6eh3dnHz/SgSbql6ziFvvEuqPakK53avrybFS3ErAg7zLQhvHmw9hkTNNNXCCjJY6wCP+nccxoVzomDTS3hoPVHn6PHJn4njohzcCday83i4oEK12pT7WU3Sj+cY987MCbPx7w1uUTU7Ifo6bFiLDX+rAr/tsjbWnsHCDhGTJ/lJ3h7DVtBzJUvMs/qKC4flYVZqW3v+tOMGHPUPaJpyfaBNqzQj5TRjO0HaL+IO8nMPGDjDBBgM43poUxJuv11u5nLS/b/baPansxcpJiWHRpxG6ZFk= X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:ZgJHa8T27s6aCKGGmXJi5OPh4rE7pzwAxBu8srvNbPu8PI5RV3dSmPFtzX4wz6Diz+gtBLZs8bfpTDeCrNZCJZW2eMQw7grSv4i/Mg6VhbOqtt1H3mwlrVWceB/FrKs6Zc9LsmdKXB6+clQP9PEj7qqVCXP0ov/XB4tTghxNwO1EwuaKjp5oiCH1/1E+VhXELFHWy2jU9Bpm5MB3M78/h93QoSrjScXcZ0HASIjJ6TLLZAykan8c2ydYt6khxY2NJ5n65sPMPd98cZ0WkHGNDYjfy/c0mAdZur22wwYq04LBIvwqaEU8CKVgRUWrx6CUtPWs7oB/mv1+M4e4j5oEgn57MiBjLCQvaTfIUBX+WXU=; 5:wKv0Ohlie0RzG4QvCsQYTSCiVZnBCFpTPSiTIfjhpOiFgXulrBsVLZbG2B/6ZqevUxjF8ojLDXPn3eZScoOS3bAjeL8/2RxVwN4nLWrW1pMMx86u3l0PUOHuN04oVLyyj2I+GMSaFFdpfVwkgrvbupG6GWD/dkhOGcy2Bq0tNKI=; 24:Bl48fYQSIXBYI6S/eJbYmrXIRUoFJ6m1KWmSTiAX+e3rqke3pcEqHtdYpsE8B0wRJzlR0V5RPeNKnhptbqAAqx7FlGipRcUYTpQYSklHVt4=; 7:jHrl4C8Yt1s5tMk9a0QQmfhaWGOm7HCpuuipfRBQ4D/rZFIoMTbp5Z3YK7CT9UdctuoLG0IuNDIzQ6opRD+iYfzkUAZw1PPr8vxy7zvj5gZZyWr1jhTi8I8RnJ+Y2xa7dSfUsF6CTPQNdHB705ObV5Ne8kfwNY3xtZ4FUkGsBnC5q8GhqK4tRgNoXh5uxG2Dv4W+filHLivuo89vB18A7Zs+fAjLNi92dxLsPe3oINs52xnZwd8kbIwZFSkSgx9p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 05:21:37.5912 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f93adf8a-cf1c-4c55-3e56-08d557ea074c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V5 13/31] imx: cpu: add cpu speed/grade for i.MX8M X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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 more general enum types for speed grade. Refine get_cpu_speed_grade_hz to support i.MX8M. Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Reviewed-by: Stefano Babic --- arch/arm/mach-imx/cpu.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 52dbafb50c..fd6d08c533 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -333,16 +333,18 @@ void set_chipselect_size(int const cs_size) } #endif -#if defined(CONFIG_MX7) +#if defined(CONFIG_MX7) || defined(CONFIG_MX8M) /* * OCOTP_TESTER3[9:8] (see Fusemap Description Table offset 0x440) * defines a 2-bit SPEED_GRADING */ #define OCOTP_TESTER3_SPEED_SHIFT 8 -#define OCOTP_TESTER3_SPEED_800MHZ 0 -#define OCOTP_TESTER3_SPEED_500MHZ 1 -#define OCOTP_TESTER3_SPEED_1GHZ 2 -#define OCOTP_TESTER3_SPEED_1P2GHZ 3 +enum cpu_speed { + OCOTP_TESTER3_SPEED_GRADE0, + OCOTP_TESTER3_SPEED_GRADE1, + OCOTP_TESTER3_SPEED_GRADE2, + OCOTP_TESTER3_SPEED_GRADE3, +}; u32 get_cpu_speed_grade_hz(void) { @@ -357,15 +359,16 @@ u32 get_cpu_speed_grade_hz(void) val &= 0x3; switch(val) { - case OCOTP_TESTER3_SPEED_800MHZ: + case OCOTP_TESTER3_SPEED_GRADE0: return 800000000; - case OCOTP_TESTER3_SPEED_500MHZ: - return 500000000; - case OCOTP_TESTER3_SPEED_1GHZ: - return 1000000000; - case OCOTP_TESTER3_SPEED_1P2GHZ: - return 1200000000; + case OCOTP_TESTER3_SPEED_GRADE1: + return is_mx7() ? 500000000 : 1000000000; + case OCOTP_TESTER3_SPEED_GRADE2: + return is_mx7() ? 1000000000 : 1300000000; + case OCOTP_TESTER3_SPEED_GRADE3: + return is_mx7() ? 1200000000 : 1500000000; } + return 0; }