From patchwork Tue Apr 11 02:37:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 9672297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E975D600CB for ; Mon, 10 Apr 2017 10:41:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC5581FF8F for ; Mon, 10 Apr 2017 10:41:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0E2D27B2F; Mon, 10 Apr 2017 10:41:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_12_24, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49EDF26E97 for ; Mon, 10 Apr 2017 10:41:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752756AbdDJKlM (ORCPT ); Mon, 10 Apr 2017 06:41:12 -0400 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:8612 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752829AbdDJKlK (ORCPT ); Mon, 10 Apr 2017 06:41:10 -0400 Received: from BN6PR03CA0090.namprd03.prod.outlook.com (10.164.122.156) by BY2PR03MB288.namprd03.prod.outlook.com (10.242.37.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Mon, 10 Apr 2017 10:41:06 +0000 Received: from BN1BFFO11FD029.protection.gbl (2a01:111:f400:7c10::1:180) by BN6PR03CA0090.outlook.office365.com (2603:10b6:405:6f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Mon, 10 Apr 2017 10:41:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; pengutronix.de; dkim=none (message not signed) header.d=none; pengutronix.de; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD029.mail.protection.outlook.com (10.58.144.92) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 10 Apr 2017 10:41:04 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.182]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3AAexg5005350; Mon, 10 Apr 2017 03:41:00 -0700 From: Dong Aisheng To: CC: , , , , , , , Subject: [PATCH 1/2] clk: clk-imx7d: fix ahb clk definition Date: Tue, 11 Apr 2017 10:37:48 +0800 Message-ID: <1491878269-9559-1-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131362944647239329; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39410400002)(39840400002)(39860400002)(39380400002)(39450400003)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(6916009)(77096006)(6666003)(85426001)(50466002)(356003)(48376002)(36756003)(54906002)(2906002)(189998001)(38730400002)(110136004)(4326008)(53936002)(8656002)(33646002)(104016004)(50986999)(86362001)(47776003)(5003940100001)(81166006)(81156014)(8676002)(50226002)(8936002)(5660300001)(305945005)(106466001)(105606002)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB288; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD029; 1:pjp/tz2Xl0UaE/qk+Bg/lZV81yBK2rBaIJoaUEi7vX18urPqdMAFRgOUyehDjaJI7v4FD2YJ/vwQYNncrRude74Aw0thBswcnUxZ4BLT/iiwKL7DMsR8UlKqcM2A/hrds+kZfy6RnoY5Dc9/LjPSz/jqnfSbtikQXae0d/Odta/iTqvA9uwtlYYO2wn5lq52UQTQ0zuyEQGKVEyUUFP12T6jL2RYR/zLHhAwX7XDOOX1QWGfbyq5lQkotC37vG9zgP26RzfnGU9YfmRIWONHcEe10DfUbXElX/M63FOrAqQWu5XyYvYyRQZepN7NJERRbYYe4guG7k2q/MIT/1EIfBsyQL0C4gvj3PjFkBwoO5/G4Xb5Mn6SJXpyDBmtjne7xUI2eR9ku/crkGax87WtV2+h+bZScVM1Rn6PlnAZ0oljimlmWM+HgzXC8OedPfMKpr9o6LFTNsejbdCCmyVSAFSN+Uz8SNe/ljenf+EHBzS5vbvY+J1dl6llrsDLffqxxI5Thgzcz+gig5VfEqTLlKbJ56vz6Gx2xNA3bSgVTmzaORAKnviQTczZ5hhaDkhlG/zm8Z5K7KJyYtUQIYWZTkHColnQ+8zcUK+qDs5G2k3Sb9SjVGoTa2SFfpIKvTUk MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 5b28c2cb-e973-41b4-b542-08d47ffe16cd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 3:b3uNosNmF7xb709CsVZmEhBDiTU4+UxYNEBTJ+p6kIWf59zSGFqXy/lllr+emCsnJEBKshgoWEhghoHw1bYSIRZbKTMNvK2ONLIwffQUNVmrfqauZQ/mQukEk3lxr+2w/DTA8R5nIbazWHVeWOTxCozBo+4gUkckSEK2XM6v+vMxWiGBGezVK8CoG3VS9+hUbv7yj4wpDZC5s6ZvvOl4KaTYf1GTIx4xzKfR0kE3G/BN4ymSuVtTAfnqJvycQ3rDe+CTe1nF0ojWbU6XaKXM82jodpFOJlJgrs9ug8uMvVZeDcHiSP3MwlSIAITLKcTI57hEpp4K/kFcnBykHwQnWKZss1TG2jQop1jd8e5dDRBA9uBAX/2ND+jCvVBvRgYbZPwzGXIhD3QAxtZ7F7NVtT/Fa13iGaZP41PY5Zs6AvW+4NYDzKF/DTzPXXnlc30K; 25:uW8WfcBzkDdkuUfU9hZdPkzftiZdhdd+eSBBdorElVU+EXQYzBGwfwDsxu3XU5d//KYltooH1o/Yx37yefNEw7o+5yIN4TNwALr9pq+6Mx34BCc1JBXoPort7t06+ePDdtycoOWzyanr1Ub4a10L8spKrxmd1BpMLe9A1g0QTHrOe1ijPfIV9u23tey/19Xx00FyT1WJRvXB4keThOG7sKywdlo96TTeP8mwv2rVa+XDSGJqyWNcj4R4XNYoAbVTqTJOGNM3nYmSrFZ0uRg/LFdXHto8O3mk3jdFz+NJpLNxkLQkABlwUCKzoyU6RDEphgGrPlzgjFdJqwJ2AyuBWraBd6x5DmI5epnZwt8dDTMb83f+Uvma+YMNhgW+pUzHsssk39Z3JaYkNN2nE8+vYREEYPWBUDaivMYmWphHcqgheYH8mNxGtBJSfE+UA5G+WpcDRvZ9EQx7ZmqDoodidg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 31:EltQBtqqCQK7O8xXvFc+J5EeBFMl9r4kcEQW8END08rqiqkq8kb1bawoH9ZWnJ64chqpuY23lWrQnoJo6Sp8wQYa8MeZygdHI/Lnu9rrFo1yBHk2PT7GlPHKor++iON8stqkX3bsvKVcAIihiA4i1g28+ckfYLqvltnOkZVJwKu4NCHRJubRXOj3mLbtb2M5KX534GvtRFZualTwTBvkzdV4i7ONf2FlnznCzHM1f18csesgaqqR39zoDn0MnhMl3xAVgKpuTrQq3H1PEF8qIw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(8121501046)(13015025)(5005006)(13018025)(13017025)(13024025)(13023025)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123561025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123556025); SRVR:BY2PR03MB288; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 4:/1Ttb7OsYqXypBhTSrDRKs3dXiti1qG/k1dV0xnlFsxPE+mdDlMCYOL3LOq7YIUyQabE6bxJQxwoy3kVjZ6UyFZ9OalWw6k1oIKUlbZDkRrgP89BDD/p8j1Gizv5w1sNa9daDiX/+L9Nx3K+5Enigd0FeSUC6rH4oQOV+DijzXIiMank84OPg61z9s+YD9VPdhBg9qEMoX7RNbbgGN1KijYaSn/FqHY52fRakhgzAXupXRW+tGw9RvbYaDRqIrwFIUd8iO0GdbXUhYFtVGae6vcx3+pKpMyz+GijXMMked14s+yNid20Vu9G9p+gRS49hauMxTvqbxSZCosDS9EOoGc+bIEq+v96AAoQuA5GIoBczIbNbdTPrXWtP359vZTTFN46ORquJZ0yC8HdRdyb5p/X2Vfhee0jezQ4EyNZ2FWDcN+qMguzOAw8WdB4vSYT/dLdpsUlj/sObI02KDuykBgK72oB/sKNC+bfY/XdNzD4xIe9msrTKNg7iXO5Lh3dUwbYnCIiR0GLWdDzJXxHDWiqOQeJnH0nfZX8Rhph5IQlkUEUE/M/ppdoJKN5Kqvri9vKGdVIOIXAehifiUTJmOlW5pZlTboGZG2EAL2RhT/R/s1iHUiQTMAnWrdDUf304m8hwLQ3+NxhrofqkeuZQS8y3Jl8q6ZDBgMLYE1GGEBX468itNhd/TnvbejabC8+Gy7PEvBEty0/9pWF2LKyX8SRFKLqGch5B4SH0aKpglA2HiZEDQJr8RoS5cLZvMPtsAusCR+ZmoYY3z9en3Y+otA4PRZaKsDmoE+FeiK+FhBPd1ouFP8clcwrB5On8kqD6IgJlXzBs/qh3ZqFD7NLmXAoHKqSm8bVCJNX+uXK7Ku4kBX9+U58/lWgRRH+ZQ+NDrFWL/EA5Sd9GlF0r+D24g== X-Forefront-PRVS: 027367F73D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB288; 23:+q6rcDx6e0mxkc/xeC09tHokbD9pkTJBEYvAqDtDgK?= =?us-ascii?Q?ywhjWUcB1xRrLh5rBvj+7gcul0c1tq4hhC53c1oHDxyfA6cz2flyaQxILvfw?= =?us-ascii?Q?j8PSCBftyLDvy2yT2HAm/yDiFFDP2EEl5c45+bbGcc1reEn1fbuJUt8/WyOr?= =?us-ascii?Q?LsNJht1DzEZYE4lqMeYlgEabevB9e0KapbGOv/u9vymhXxOwBxoehH3ImRet?= =?us-ascii?Q?x+8tDCf5UFIDHV4u3oodJL6fSL5ANFzj0f5xZdHH9oRxzaci0xNVFBASEL+i?= =?us-ascii?Q?RXsYMthg0josLrzCqZ6OkEUTcasX4lX4fstWxRnNouKXe2PxSfnRXnr14WrJ?= =?us-ascii?Q?X9gwHHRtS8tl2hQVqiDnalCxw8mjyrj/LSaIrjkob+QQp4ap37b7YBaAjRfc?= =?us-ascii?Q?flGGJed50/xFZu5H0Av9swKBoQDjac1KttjcKswPob2X05PSkfksf6VJuhZ0?= =?us-ascii?Q?+SdoQrJyuy+9m9ExjUFmPCv2GaStqZC9fIpo3e4MW8BWOdJ4Zu5d4HV6c13h?= =?us-ascii?Q?NDMtuoElCkDhYnQrw8UHZVI2cP2CqxS8od/KciWDqXoCg9BA37whu5mBTY3H?= =?us-ascii?Q?I2WtZ9hUIiFTxgYxA6N8gjwg7zPIdA9xTu8R9dWAOO3H3XDjCujHrMNBdSzb?= =?us-ascii?Q?DLerrq4PBwn/ekqAWErmEH0rmPTZ68gJPUBFOPvQKpj703Gfi10IdhLiO8sx?= =?us-ascii?Q?DNvICokONb646tYS423p+BcrK1tQ1GwyRHOkqGUiHH9pZ//4F0jvGG+MmZdw?= =?us-ascii?Q?UzpVrujw82TKNir69jdZXvSTF6As9UsdJoEQyM/ssNrd2K3VXaLED/vWCQ1J?= =?us-ascii?Q?1VaxwNduMHtqm/Pubach3LftnnZK1dyIfRDgsbOLeVhd0P7rtsIwJPAzTq5h?= =?us-ascii?Q?QEoRac8TnAXTVNSA6zGAxt2Qa95c+sy+yQSiWsRXDGTue/tZkB4py3rAk7qD?= =?us-ascii?Q?wOO4R44rpqel4k3e9wCKu0KdFZQnmy2xMqGHLby5dksoMMsAzyk82WIqVrIX?= =?us-ascii?Q?awTWMj4qCf/OeVwKsweM3TopBWrX0rz5CufwFTwqB8A9+mVWyhpDb+nF7mSd?= =?us-ascii?Q?/3i+1Icu3GVUAH8lmFFFH9jCoyFS8KisnI5/muQlZryvlwbsu+8g+Y4WBk/1?= =?us-ascii?Q?UGrSNa0sXCl7V1+f35mN3PdoA2h/zfNQ4u0Mk2OXHiKSZROlPzRTFVsFSyEQ?= =?us-ascii?Q?+KSRt4bRqPRcQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 6:XaGjY2dc94VW+psPJINL3iQag4bjLK2ZRA4W2VjQdm0oxenUbGPtEyDi85k3LCUPkrMKNSnTKB8F477J7DgYkzCsvhJJ49n+7LvKTABlpOpeq+kfJiOWC0QmsuSIYZpnPs4uz68C/Yh2X6p8wKm5RdwBzdbmcEMxSKNhijDUw+NwbAJ+O2M5Hbz1NWMeNsANLKEi99x0BzwEs0rmLXCFQPlBsm5MK9ItGHX8rsx3nG3DSgf9nBl+hzu590NrhkAtTCQAjibgSRU/8lw5LB1TiemoQgn9FpGpwVFLfTtzC5H+6i3K1B3vbtU/douYFK8al/yxoFjka0lG6Vd+Jh8k1bB22IjJXbs/aXGNSaJKsLrLOyr5JSbEnYFNYm1IGy7hevWrlv/UrwWNhIQCnsSa2F/OvE+W++hF9sJuUE3zFFQCjrY4q+BrjSonMSueic2wAwn24/AswQi7ZW3xilTwwg==; 5:vgY0D/Xstqy9RYmgcf3xaxfTnOvFqholuj2krmMA728n5R0VA/5qd0b2s1yTW84nLw3KXrPxE0rMd8gFalfRwxXtFVOllWMt5ftCVJGmffr8jQIuLlzgJooEDTahnXAHMxMWdKD3opq/BC14I0DYY7IFYFLNuoq2akl3oNy5BwKK5+hxNSR9Jh/I6c1TL/27; 24:gCZ+rb42bopTOheslfR7dRnM3NE3b97ui+exRlxqHSawTK9iuHkfeR5Gh43siXeg0r5unovH7nl8sqj0CMlPmQrqg5NiaiTjXPnSJ0Y3t4Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 7:RhlRbV5ybU5RpyuUwZfO4qiwIBaXdRF9ALIIVXL5r3M/AGwNFMq5nr1rWvZFGZRLN7iSBA2vEkdfLVFZhfrCFVfkjftSFvrRv7k+0rIzEtSauj047jRMDPsSthSVgkyK8EYD+6+5LKr9y4sk7PjPTkYEn9HfprffStAOVSgEAvH9p55KSI5YZzraj98oCqlXHKHyMolbxjxe06z+UTP+ZfnatDV/F/59y5xwOGqobcQPRU+NiDF+K6kaP+0APkZvRo4ickiISXklrted+QCPxmOpCcszAKGREYKCCV17Wm3dFsrUtpDgI36r2TPVvbbsLSymp/4WTTiVM1THvyrn+Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 10:41:04.4899 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB288 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP MX7D ahb clk actually has no LPCG gate, current LPCG offset 0x4200 used actually is for adc, not ahb. After fix, correct ocram_s_clk parent accordingly as well. Cc: Shawn Guo Cc: Stefan Agner Cc: Fabio Estevam Signed-off-by: Dong Aisheng Reviewed-by: Stefan Agner Tested-by: Stefan Agner --- drivers/clk/imx/clk-imx7d.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index ae1d31b..ad04483 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -725,7 +725,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_DISP_AXI_ROOT_DIV] = imx_clk_divider2("disp_axi_post_div", "disp_axi_pre_div", base + 0x8880, 0, 6); clks[IMX7D_ENET_AXI_ROOT_DIV] = imx_clk_divider2("enet_axi_post_div", "enet_axi_pre_div", base + 0x8900, 0, 6); clks[IMX7D_NAND_USDHC_BUS_ROOT_DIV] = imx_clk_divider2("nand_usdhc_post_div", "nand_usdhc_pre_div", base + 0x8980, 0, 6); - clks[IMX7D_AHB_CHANNEL_ROOT_DIV] = imx_clk_divider2("ahb_post_div", "ahb_pre_div", base + 0x9000, 0, 6); + clks[IMX7D_AHB_CHANNEL_ROOT_DIV] = imx_clk_divider2("ahb_root_clk", "ahb_pre_div", base + 0x9000, 0, 6); clks[IMX7D_DRAM_ROOT_DIV] = imx_clk_divider2("dram_post_div", "dram_cg", base + 0x9880, 0, 3); clks[IMX7D_DRAM_PHYM_ALT_ROOT_DIV] = imx_clk_divider2("dram_phym_alt_post_div", "dram_phym_alt_pre_div", base + 0xa000, 0, 3); clks[IMX7D_DRAM_ALT_ROOT_DIV] = imx_clk_divider2("dram_alt_post_div", "dram_alt_pre_div", base + 0xa080, 0, 3); @@ -796,9 +796,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_DISP_AXI_ROOT_CLK] = imx_clk_gate4("disp_axi_root_clk", "disp_axi_post_div", base + 0x4050, 0); clks[IMX7D_ENET_AXI_ROOT_CLK] = imx_clk_gate4("enet_axi_root_clk", "enet_axi_post_div", base + 0x4060, 0); clks[IMX7D_OCRAM_CLK] = imx_clk_gate4("ocram_clk", "axi_post_div", base + 0x4110, 0); - clks[IMX7D_OCRAM_S_CLK] = imx_clk_gate4("ocram_s_clk", "ahb_post_div", base + 0x4120, 0); + clks[IMX7D_OCRAM_S_CLK] = imx_clk_gate4("ocram_s_clk", "ahb_root_clk", base + 0x4120, 0); clks[IMX7D_NAND_USDHC_BUS_ROOT_CLK] = imx_clk_gate4("nand_usdhc_root_clk", "nand_usdhc_post_div", base + 0x4130, 0); - clks[IMX7D_AHB_CHANNEL_ROOT_CLK] = imx_clk_gate4("ahb_root_clk", "ahb_post_div", base + 0x4200, 0); clks[IMX7D_DRAM_ROOT_CLK] = imx_clk_gate4("dram_root_clk", "dram_post_div", base + 0x4130, 0); clks[IMX7D_DRAM_PHYM_ROOT_CLK] = imx_clk_gate4("dram_phym_root_clk", "dram_phym_cg", base + 0x4130, 0); clks[IMX7D_DRAM_PHYM_ALT_ROOT_CLK] = imx_clk_gate4("dram_phym_alt_root_clk", "dram_phym_alt_post_div", base + 0x4130, 0);