From patchwork Wed Nov 8 08:26:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 10048011 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 85C846032D for ; Wed, 8 Nov 2017 08:44:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72DF1286C5 for ; Wed, 8 Nov 2017 08:44:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6780D29132; Wed, 8 Nov 2017 08:44: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 D0882286C5 for ; Wed, 8 Nov 2017 08:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750865AbdKHIog (ORCPT ); Wed, 8 Nov 2017 03:44:36 -0500 Received: from mail-dm3nam03on0076.outbound.protection.outlook.com ([104.47.41.76]:13993 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750727AbdKHIoe (ORCPT ); Wed, 8 Nov 2017 03:44:34 -0500 Received: from BN3PR03CA0095.namprd03.prod.outlook.com (10.174.66.13) by MWHPR03MB2702.namprd03.prod.outlook.com (10.168.207.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 08:44:32 +0000 Received: from BY2FFO11FD001.protection.gbl (2a01:111:f400:7c0c::102) by BN3PR03CA0095.outlook.office365.com (2603:10b6:400:4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 08:44: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 BY2FFO11FD001.mail.protection.outlook.com (10.1.14.123) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.178.5 via Frontend Transport; Wed, 8 Nov 2017 08:44: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 vA88iR0s028573; Wed, 8 Nov 2017 01:44:28 -0700 From: To: CC: , , , , , , Yuantian Tang Subject: [PATCH] clk: qoriq: add more divider clocks support Date: Wed, 8 Nov 2017 16:26:15 +0800 Message-ID: <20171108082615.46769-1-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131546042722343331; (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)(39860400002)(39380400002)(376002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(97736004)(86152003)(53936002)(4326008)(2906002)(50986999)(1076002)(2876002)(33646002)(189998001)(47776003)(77096006)(106466001)(105606002)(6666003)(2351001)(6916009)(5660300001)(305945005)(50226002)(498600001)(16586007)(316002)(68736007)(8676002)(5003940100001)(85426001)(356003)(54906003)(8936002)(36756003)(104016004)(8656006)(575784001)(48376002)(86362001)(50466002)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2702; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD001; 1:DaFU/7HwvUuKvYmUZ2iRWP7gtz6cmGRLQrAA7cKQ3ST+OQaUFveCsek4Yaw6ti0VY9tSlEg0m+DjCdpdI/eY5QphPE67zr4GdxiA8gqpQb4KTbw+cLM24HgRbLl1LLgF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45d5e5d3-bd86-4275-d9a3-08d52684ee89 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603249); SRVR:MWHPR03MB2702; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 3:CNt7Sbx6GiG74jT0XkXMVbAK2adLvHiht5TDxckaVRs0Em41dmJVohAHJ23XEva6MD3i3uzIdrCsOGh0QNrbW4aR5LX5D509EcGf/+xVfJAGK/w4Z00dl7ZrxWJAwG/OEHPZJcYR1t8KXdxhql9PO69MCBqoRRGG7jWgcEtuMyEiSBq9S1gAiOYLHIyC6zWPJ85GMXGEpvf9R8mvVCkgbNJqme4G+IqwYxRTGiU/Vl6DJ6WSNlHuLexEAzSu0M18eeX/pZhswYy0PXl1KgQHUCNZ7NH+0Rog1K9guz3d2D8PttVo5adp0taELT9EK3qBLgUwVPLrTPQj29a2fRMrq/lSk1JfiY7kSSjpHvDXcPI=; 25:EKt9h1CPSvk/NcjQLio2anvP0lOVrWNolspi87xX49Vuoy4pjxQ8nvSMs3NW5f3QoyTWPdNQ/l8SxvcjrcvmxkNLYReHaOB4Sr2d0N4YO/vWbiOQbqR2tmFIy5xxSdPCbaL29CLjjgLh57d4HdzKZML24EP9RUWNTwBLcx/j6qSWTiwQsCswxt6uET56Tj30p2tqHrggo4u8CiEKtwDUZHGJi9NRFvDmTQhG3Tn4QChK0WgLpORBE9uKZzuaOgQWyqYBKPJzsSnfrqB4yfoSw8UfNZYCj4DbFcIMTvxqG1IzqK3CgS+Bv5vWLiWN+437r/vAM7HKXJn4DRsqGhVqcQ== X-MS-TrafficTypeDiagnostic: MWHPR03MB2702: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 31:YzifEgGYwM9akC8XF0CbNkmZS2pHC4XU8CeCHRSx9e80PIoiSTxRJ735CRJcWRLnR1TqfhM2JBpA9ztmIflWotCJveCXQ00DhmgsmviH5xnCJkRJvNEmM4z6g2MZ212TraQ3xNczm5hDtA+nbKgrSdB2LNtqvUXPym18Xy2azh9+4WDnW/8q5xSDivPes9keJ+n7foZV1j+xSOo9EjcZPi9Yypm7EUUwg5dR6R3nu50=; 4:0vCKsvP2UMCU7pjBBriYp4SmC8YvW3Vtx4lK64iI4T/+OHzcOg1B3n2P/szJQhm3kDibZoW2xfs1hvaEL1sHFV/cyiOuL/P99hF2lm2ZOhgJBj1h44/JZDqkFt7KFsekMEqVkC9nDG0o9WIBFAC0P2WkBOlg1Hi+fPuN+2psXwk+ube7oqefSQ1SK6rS/LxE4AHFIf3HUzLAeSAgtkOFJXcsaMs70Au/5s+a6Cfk5BzhSh75bxZoU1Z0/VEXBKROI53QMw+WiK318nHUIPWhRkWXbtXJ0b+xAT22f72doVBfdptkhC5TuZzl7jNkhdTi X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(3231021)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(2017110403001)(6096035)(20161123563025)(20161123556025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123561025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2702; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2702; X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2702; 23:UrQRC/VtjEmSUulDzuUpHyaw2Hi0GIz8/3z9Zp0tk?= =?us-ascii?Q?S3Qx8NBwA7vYzoJMLdxmLILeYkK9d5K9ls2dUsc43JwxomJaB57tUke0lcLn?= =?us-ascii?Q?CC+Vn8Oikahj6a1QgJX+06sJLHiHN4Rgo0P/+IvUcQYg2IUabOa/R3JvyzoF?= =?us-ascii?Q?ljahXWR7e3MKdLu5N6OoCiNU+O5/Gak4PqcJObjw18PDeVYMPqQOW8L5BGEU?= =?us-ascii?Q?Y6upbzpPUZtxOaehd4KhKoYKU6OujU041vXO/ry6KvpoysUirvYAIJpJKVz1?= =?us-ascii?Q?ZHFTpKXXafmQLqZC+LAcsxour4HBv+7F2wgqdDLkxa7jJb72ajHmF4YB+Ete?= =?us-ascii?Q?XcxLtqZxShzI7Du97DoRcs7X63ZjLbcehkKiAQ+NX4HuvdONXOdXCloW65Xk?= =?us-ascii?Q?of2B1ZjhO9Tb3PZZ9U9gjsyjdrmaAUaDfqFph0gpYHvY3Yj1OtIIALpQv7Kc?= =?us-ascii?Q?ScoiexWP1dTQYFAWEXcgfebYSIpfj6q6X20/Z+ZUvTmjza358lL0UFzEd3ga?= =?us-ascii?Q?mpR2ELpEqm4piVB/s4ZKmY3mQ1dMFexLlTcnRpWz1+j0LM7EW3BM98Gjjzpi?= =?us-ascii?Q?tL+u9g2lf5ivA03JjEydNvbix7Kl7ZRmgaS7YChpaFHmRLKuiR87rrSkLrz7?= =?us-ascii?Q?rm4E2+n+aG1AvQ5odX20vbJofuLtzyb3vXStF2gkHY4X5GHCwckWlq3AgTD1?= =?us-ascii?Q?9VX5Wh7YqjP9SrbapjtIgzr1R9E9p9ghaIWt0ZZVxtIDJmQUAu9aIGDQsh2H?= =?us-ascii?Q?3bFwwzB8pNiXeB1g+PRED9UCtxIjEYKIerNfnEyV3K5oiAFoYQcMsvVdy7Ac?= =?us-ascii?Q?aAJRb9vJpVh7klPvU2ZLOTMIJ8NJk9u+ptGGAaQFlbRyNTvf4mUHVy3RZWoy?= =?us-ascii?Q?8WO+TK+s6OxEGmYyELf52L+yPwCdvWTCZxRTvS6ToC3EnUz2sAfzXxxTL0q8?= =?us-ascii?Q?Jz36MSgIg7wCRZDdqH37CxcH0sFpxReqWvR6PGH3vEDZdKqf/cTvRbZ65KGZ?= =?us-ascii?Q?kNc4JA+VnZeDN+NGYMAyoPXe6nAzXjEQIJLq/+0Q+I++GWSL4jZNi2obAqQS?= =?us-ascii?Q?QAjElwNyuzMUd7swY+khMQLKGL5DSeMA7/MEqJGyBKV8nEg6zXdwjANvf16W?= =?us-ascii?Q?7wWRsPX95OEZ49qY+fGMoBRqGYHlwQHcmSGogfdswyIKTBwQLor4zVwG+CHH?= =?us-ascii?Q?56vNlJ2yGV9n2zGpMw6SLptelrj4Kwl8bViPBAheW7Hn2Z60+Fcbf48jA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2702; 6:kg1dDYSqhVX6Izen6cX+HfWRZuiio+iW/kiLQCli/z4sCVwn3e/qPb/6ppefyewhfGbSw7T1lknjodBLeSTEoqZobjE/UMtTF7a9IZsgePYG+HdJ/r+0EzztWU28NkfMtkx7g7rxp/7wu7UaXL/4ZAier+0zAPV0YuCNz92l5jz2ePYR3d7WNFNj7WYCp1fcFxWLrZ1Y1HiPMCHkXdvdawAnhgWZSTJ706NVGeFZKGgQWkyX1jNrKYcIPvgQ6wQ17BCC0xXIdhnhhu1Bh4Kix9ZCpt8W1TSqctUi/moFb6h5iOFvxRg3gxlR4rFuqeH5RXFU7NeIO/rWhWtWvpVOk+37vB08rPn1m8E665/Q/P8=; 5:5+BMMaRm7cCvSRBUtrNQY/Fz9TD7ooCydQ3yAEJOFDyN8asMq1w13aG6OKJ4Uz7jCji25NiQ/deKedMNMVbvKDYGluNDeVplxNCRrRNt3dooQstOBecx5bP9oh4c0d/VtpgIyNqnMLbh4NpgKdMtiVpGcYYfbi4gSmqnIkiRvUw=; 24:sRrlUwZxCnWyvOSu6vN3QgsO9lmRt2SZQHuybJDYgeKGto5qSD9llr9WXsOoWviXDiL2QDoDdO66d56nhc9rtIil34Ainh/HiI7p7W/x2TI=; 7:/f3PrSc40qCvlZVMDYgwwJHvwSkbX2SryW9rw157jl6a7FUcNbtEhgYL9GUeeMeanG/ra73CbIUsWwM+6t1FmMthVYjcMGjaiQnR3AzqSuucVgFRph2BaMrHYxaN1c5DAZdgIx5SU0TSKbtcROrhWBCMYGicXhEM+ynMDBbBAZMITth3aIMpwZH6EGPhP0H3gy46p7PZzYTE1xS5COMJ4kHnTlpytTzyeFLiP5m3FCqmsa5LzFu9qf1QVwF9jJIX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 08:44:32.0315 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45d5e5d3-bd86-4275-d9a3-08d52684ee89 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: MWHPR03MB2702 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 Acked-by: Rob Herring --- 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..c2cd3f01fd62 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 (i != 0 && i >= 4) + break; + snprintf(pll->div[i].name, sizeof(pll->div[i].name), "cg-pll%d-div%d", idx, i + 1);