From patchwork Tue Nov 21 06:13:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 10067695 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 410366022E for ; Tue, 21 Nov 2017 06:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34F4F28D8E for ; Tue, 21 Nov 2017 06:31:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28DBB28D95; Tue, 21 Nov 2017 06:31:37 +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=-6.9 required=2.0 tests=BAYES_00,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 837E028D8E for ; Tue, 21 Nov 2017 06:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752984AbdKUGbg (ORCPT ); Tue, 21 Nov 2017 01:31:36 -0500 Received: from mail-sn1nam02on0087.outbound.protection.outlook.com ([104.47.36.87]:19376 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752999AbdKUGbe (ORCPT ); Tue, 21 Nov 2017 01:31:34 -0500 Received: from BN6PR03CA0063.namprd03.prod.outlook.com (2603:10b6:404:4c::25) by BN1PR0301MB0724.namprd03.prod.outlook.com (2a01:111:e400:4c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Tue, 21 Nov 2017 06:31:32 +0000 Received: from BN1AFFO11OLC001.protection.gbl (2a01:111:f400:7c10::195) by BN6PR03CA0063.outlook.office365.com (2603:10b6:404:4c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.239.5 via Frontend Transport; Tue, 21 Nov 2017 06:31:32 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; 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 BN1AFFO11OLC001.mail.protection.outlook.com (10.58.53.72) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Tue, 21 Nov 2017 06:31:32 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAL6VPwQ008673; Mon, 20 Nov 2017 23:31:27 -0700 From: To: , , CC: , , , Yuantian Tang Subject: [PATCH v2] clk: qoriq: add more divider clocks support Date: Tue, 21 Nov 2017 14:13:00 +0800 Message-ID: <20171121061300.23464-1-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131557194927041902; (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)(7966004)(346002)(376002)(39860400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(104016004)(498600001)(81156014)(1076002)(53936002)(8676002)(305945005)(33646002)(68736007)(47776003)(36756003)(97736004)(6666003)(50466002)(106466001)(105606002)(48376002)(81166006)(8936002)(5660300001)(85426001)(50226002)(77096006)(86152003)(50986999)(189998001)(316002)(8656006)(356003)(4326008)(575784001)(86362001)(5003940100001)(2906002)(2876002)(16586007)(110136005)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0724; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC001; 1:+MkNvGJu6hJcQvz96XLvWpQdG9Z3UjRocKe/Wc2455nuVfv2ed7l0y3W72wqUBn1EMjLyxPVLXzKjIvVBxtzQGfPpQEDbfaRVWmdZc917ZzCbBrA/roMJ3UT3wE+3KJj MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c1aa4ca-b87b-4544-ed6e-08d530a981bc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199); SRVR:BN1PR0301MB0724; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0724; 3:t4EA8CYzfkoN+cX7z4BqWjhii3ZLGdR1B7d7pGyx1zV6g4/QOHM6+1t0e0e4QMFtHHAag0AlzJOWZpDaefmYenEV+Jh3X/IBsRxGSnp492tUH8wBMW8GZCQxXnTHWXllKLJStc66RPmnAbhitVwV7PpDFRij3kg5+9Kh1pArn0jgDhSBskT/0oPk2Ida46DDv+QR7WqIhQogOfV+Uvz8YQHBjc1DrsmKnASng+N3G/I/yscIOfH8ZLw9a1JKrhLvxavKVbRnp5f007gJ0cfXX/wp3PSrkHRQV9eTi5xiN7Ce7q/BvH57u3U3MS/c18GqX96gzWUF8WOYRj/b9Rj5/V79hsF3LO4ITebuWz5BeD0=; 25:3TzJyncyH4LZ0Hrj9IyNRKElO3I09dI2xG9oj4f7yoCMKr3K2THNgJ88U7ocvkCwXJsuG8pulwuLuaJguKANYsrDqG6QLnURxOHec1KFwYoQ5x9uwzEQLX7ds4fgC+K74/pvz8mTU4qTv0DU4a17m5pHW7SOflRyBp9orQFzf+01aWTafi03KKoECZ1cqXV522T5pC430BLW3TujOtnM5PUdmHupbfwzh6PduROPQweV30EYr2HtTR+ayBbEKxR+5gJFWyl0CSsjdklRPC0S1MbCBZvcBrvdy39hQLcu2zB2Mv1826Im/7cqyBfsro6vuXPOzI2UKFSeKRVR/ibRBA== X-MS-TrafficTypeDiagnostic: BN1PR0301MB0724: X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0724; 31:U8frughWV0Zj2ei5U6EYLSo65xHI6KKV2FZmFk05GMFC1g/9BaEDqMVxFkhUM1ZSY+LgHDllh2TbTHjYJAfM9edmNW1vKDyMlyp36Lb0JzTNrPL75bPfm+vCt9YXKBiycByzCx60WwECv2vnfmYVh3NJt6CsAhtaYUfmCIUkYt4skewMOj7opteZjedG9nkzgeKiauS4uXpMZnsSxKi4522BhP7WYrrP89KAwP7Chw0=; 4:ep7sm9rz8sB6NaHZGRQtR7BAp7LkqmXW5rqo3gtjWVAZiqPxKxsyXMLrkj3F3WUoLsYA/bauLkP3f98TfktF+f0Otog6NoiIMCp+uBoWn+MSg8G9g92I0P4GqBJj2iyot6VANuHSyb48vME/Twa2Al9FdrC5Vu+5lp/Lqh+ugit19i25/uaVOcHSYGvg5nk2R7zrSm6GlshK7ZxNA+czP7jCCPmZgMgm/goKRn9ReZ7YWCBh+7IZgT9mfgqCm02sW8uJXwKjkDd24mB6WbplGmde9zv0iXFZ5aDFiOSj5jTe7nM4lIfh1EExjX4KzCkk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3231022)(3002001)(6055026)(6096035)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123561025)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN1PR0301MB0724; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN1PR0301MB0724; X-Forefront-PRVS: 049897979A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0724; 23:45iYfjroCIdmp5kNj3sTrB8M975ur0SAgsuLIuU?= =?us-ascii?Q?607dXQgWsUAZ70JWy64RmCMzin6qRizDezCABj6Rw2rLOVU3iJD5Lcnfbj12?= =?us-ascii?Q?ytl/i4mC4Ph/kBoRG5Bmyo3vHq8ZSyvO/dTrYZN+z5neOGfLbewANPY2q2+q?= =?us-ascii?Q?uoHfmjKku958NMMqxLpdW7n9LjxnuUgw78xUUP39z/PitcVCv/C1RA6xVMkv?= =?us-ascii?Q?t4y8Pcim/NjEcvuJls16k5V03SE8dgeTmhflJIJbIex+GQI+XnDcXPmcKALl?= =?us-ascii?Q?2Lc6tKoqxLd7jxu5qxROK4llqKhbMXGaA+L0NUOvSBDPDl5xfu7fKZsuO1of?= =?us-ascii?Q?XxG2wX6Mn+RSHq4qZax0nC8b7W/Xq2Tc+WxIlc5XTkmycTuGr3ybE9zGaiWy?= =?us-ascii?Q?mqCgpyGc5kPzWR2zMuB/qPrqKX+DQdpQgNqg5ERRZ+QzXRWk6KQy+qrQVJ4L?= =?us-ascii?Q?KM+bWyLLtTQie2YnolejJoQYK/3iNu9l0a+SfTQYC/P8oR259UiKvcXVVwhM?= =?us-ascii?Q?1zAlW56KizPIqSyunaoxFNEWf1irjCUfS8pMPRvLFwDOJX9FMXlbPY9Domy6?= =?us-ascii?Q?OLWBxe2dtcEYOBC1uGmgAjjYwyp2Ci5vABcHoBigY8nPcwVCnsSBD4bWZ6B6?= =?us-ascii?Q?YwfT9uOTN8mViG/uP7vSkHOpYtz3OGXLH6x8a/f7DkBltdVq65aoiunQjBVv?= =?us-ascii?Q?DYvZedWM9/W6HiCfQCX1KL/Oui2j0gSbZMwPtxBoKP3iAwDx164zqBp3ztz4?= =?us-ascii?Q?zdyk9LwGjCMAo+v1ksCPQol+h4Wnoq+5581eV4qVVUSsBL5l4m+bsOT1xGfS?= =?us-ascii?Q?MGVw6H6Q9Bq4nAs1zynat5g55/M2Q0l6JGJrbU8iWHXqeldArDDdw8HEOo57?= =?us-ascii?Q?IIj3G17CNdUwE/TWXNgcclKKwT2XdrOITiNjfny0FQ6ExJMXTuAOHfeMBuoy?= =?us-ascii?Q?Iq4SeMfj+xL/6+x70JMKAh18K/r5E6z6CU6BPxcG+dwwuXSPxpQqUYRpdIN+?= =?us-ascii?Q?MiRidCxBEf/FoY3ObFaWq9DaQycWn6RAEAPv1uWDlMqUUyJxYiKfhZzHelk8?= =?us-ascii?Q?ZEp2VMCgF5YdJWkiIpnuQIiytbIUdMDCy71WvZlXNOvTWNCAGuQuFVg/RFN0?= =?us-ascii?Q?ArvPpnQI/xchZlg5Sonwe9eMj6b2hAYQPD4N5oIL75jKfupB7jZHqKL4H5gZ?= =?us-ascii?Q?TYtr4e2snkA5y1ejWWHTWrqkb+iTPPVsJrDXA?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0724; 6:r50JL4htKqd0ay+s/c2DGwQ6Jua3BH4Ap6AzJ0qoC9GVhDN8pLJ7A2RSVRRwacorC8hOlJKVT13uBfBUJpkwEknuj8UZ+9qr6rfhxoMf20mkT7t/f4SsWfjaHJeHXdyBTkXwTMdfLw4yh5zi8GFWyR6OIm/ACIAyUx1oLpRNN8Qm+HoQsryndU2QFjyks8BIJ5NJVIq4AzRNVBQqKrmYi2tQeE+SP2xmLVdGGFnY8qkYvF7qMOkea9h149zBJOIa6S2PElR0oCMoyEHyrA1JoY/ahS4M4EUHWbNgvjHJprCoFS37Q0dJZGD7XAgEjoqx7OIKjBZBUjpNhnGX//XpvB8lYiTIdDXmKQHOLR1/p14=; 5:VpXlhD89Z1O94SJCE5HSkFyPQx93rk1gi305kAGO8VRvLAe+w642G1Tw9Q6hgtKMah2dWKMGrSJ+4+rmAcLyE77/egVtjwkrSACQ3ahXUF/v6c3moNSK8Xfs+4/YGAIJx53tWBF2qwDvn3BhZy03C6mhIOBT2IVZofEE7c3BRrI=; 24:d8j4oo1Oa3POULMxpgz9GX3GtZ2dqBh6eZRuAM8jplysx4OR09SRZ5OQJcZi9Wy6NnGT8OwDgRGhZZQjj42CtZC3ut2JQCGG3x0SN9QuRWA=; 7:7mNucjwriLhmTg3vdbWtCVse3PtexxkE5O+QjMxZspkheS7dSD9F0ttB1OJnGKxergumjKbnprT/pHakJWtimaSvRoTr9Kyao8BBpPsS6ung4u/VGKzs+w4GGojyRUG3ObiovRRgXy9cEvkEG5mVUca2oCaPzfKkwoY7IOPPemclfg4aLzVcd8+VPhMJOnRmRnt8+W4toz6qQvp3zkZWNu4oEL1RyjxgQmM+nnnV8gEQ4dEtTbW3M8ciro8UqjCt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2017 06:31:32.5481 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c1aa4ca-b87b-4544-ed6e-08d530a981bc 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: BN1PR0301MB0724 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 From: Yuantian Tang More divider clocks are needed by IP. So enlarge the PLL divider array to accommodate more divider clocks. Signed-off-by: Tang Yuantian --- v2: - fix a logical error Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 + drivers/clk/clk-qoriq.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt index 6498e1fdbb33..97f46adac85f 100644 --- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt +++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt @@ -78,6 +78,7 @@ second cell is the clock index for the specified type. 2 hwaccel index (n in CLKCGnHWACSR) 3 fman 0 for fm1, 1 for fm2 4 platform pll 0=pll, 1=pll/2, 2=pll/3, 3=pll/4 + 4=pll/5, 5=pll/6, 6=pll/7, 7=pll/8 5 coreclk must be 0 3. Example diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c index b0ea753b8709..3a1812f65e5d 100644 --- a/drivers/clk/clk-qoriq.c +++ b/drivers/clk/clk-qoriq.c @@ -41,7 +41,7 @@ struct clockgen_pll_div { }; struct clockgen_pll { - struct clockgen_pll_div div[4]; + struct clockgen_pll_div div[8]; }; #define CLKSEL_VALID 1 @@ -1127,6 +1127,13 @@ static void __init create_one_pll(struct clockgen *cg, int idx) struct clk *clk; int ret; + /* + * For platform PLL, there are 8 divider clocks. + * For core PLL, there are 4 divider clocks at most. + */ + if (idx != PLATFORM_PLL && i >= 4) + break; + snprintf(pll->div[i].name, sizeof(pll->div[i].name), "cg-pll%d-div%d", idx, i + 1);