From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876AbdITHt1 (ORCPT ); Wed, 20 Sep 2017 03:49:27 -0400 Received: from mail-bn3nam01on0076.outbound.protection.outlook.com ([104.47.33.76]:20160 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751578AbdITHtZ (ORCPT ); Wed, 20 Sep 2017 03:49:25 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; arm.linux.org.uk; dkim=none (message not signed) header.d=none;arm.linux.org.uk; dmarc=fail action=none header.from=nxp.com; From: Dong Aisheng To: CC: , , , , , , , Dong Aisheng , Russell King Subject: [PATCH V3 1/1] clk: bulk: add of_clk_bulk_get() Date: Wed, 20 Sep 2017 15:49:13 +0800 Message-ID: <1505893753-16143-1-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131503673624165829;(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)(7966004)(336005)(39860400002)(39380400002)(346002)(376002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(81166006)(81156014)(50986999)(8936002)(5660300001)(5003940100001)(97736004)(68736007)(86362001)(4326008)(50226002)(48376002)(2906002)(36756003)(50466002)(189998001)(47776003)(8676002)(8656003)(104016004)(53936002)(7416002)(6666003)(6916009)(77096006)(356003)(105606002)(33646002)(16586007)(316002)(54906003)(85426001)(498600001)(106466001)(2351001)(305945005)(42866002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB2363;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD023;1:R/qiU6wsSsHnM4KoCXng8pZLhCGm8+gSfhWga3zdFzlrqTwxpk8w0nyOM4ssoVwUN4Puw45fgH9/M/wjGWouFrgCeqSFPEd+M735lZqOz5o2grFqpYGG7WAZapVN8SYL MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2099b19e-270a-4ad6-fdc5-08d4fffc1b7d X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:CY1PR03MB2363; X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2363;3:EewvFMiTgXPacS+EnYAR3b1IZkBL3krqKM1c4IWLt4t43gd0pW3YVcWdrdq4BX+shQEE+Jh6Oec1GiszspFre2aDhZ4NnEPunEvIr/eCIAxSiEZ7yqr4a06ycqcTUoaOnLdvpZ+dIrGy6EMlMfZAxCqZE0ZKUSF0s5afXKzxnhZQqYNATF7cuJgtZZj61Ulbkjb8htmWJ+2OSQEJ5yQfoB2wDKGMBVNTswHRDOCS4dyliA407Y3MWEJX49Ha/XY+3f1Clc36JOji/Qbu0F6dYfSxLhYegAW1TtUTk+83UbG2MTCx43dtxzjrtTd8823MKR+MmpeMbkqWc/3J8ykf+SLXZ9Bba9/j4zLgGo4mKps=;25:EirJWgYOepdfbl3TztSQNVtMmfydE69krTujVZ/+kSm646ghOHyBOSp3jbyMdJsppGoqQ7GoTE0UMntEssPM7uZ6V3LH4fTHkENcUSE6sfY4En3bIN17i4IA8GbfKorHCVIbXDGn3exnNFTQ6rpwlYOfAb0GFOLEOweA0+OTy2iqBtjrhMlaQIz5UFe+ojcxzXKyMw2na2GqXUO+lw+ppCNmds7Muz2VGKjK691uLhxHqeipHL8KjcHX/WnKt9Z6UzoEWoE/VjqYcGI871iyRMEmqItt2zSVxpR4hULsEC91fQ5OooYkhDYpR5Df9SSFM1qsCfU7sEEzSQSt/TqiIA== X-MS-TrafficTypeDiagnostic: CY1PR03MB2363: X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2363;31:gk8K98PdtbTX+pislbCdeGAhhDmjrPOFr5MYyuTdnHUMRt4ksMUZPucoArZHAbOS68SZVHHTcZ/JnLtm+doBr1LaqyPKGBNUbgPsu6Slg8+fSZumlBj8UPdAnD0NvJqKTMGMP+afwgBCVqtRb9Vx1Fz7p3TQ5AdDB1FXNCYvyFVs0U+lcHfTJcCIoxEOdfoV5x4rp67f3QZwvWkVznHfwOwdW8x3haxA6EwhEY8NtOo=;4:N0+TGoPvrxSgsoPGtOuuufy3Q2hSNfrZiZ6y8JX3kr6LFrp7z68bI1hKPtQeBfJlFI/BBxH/anblle1p0Vyu1IIshHG+3hcjRLWAbw4XM3KNcqxqS2kTkJ4yigWoam297AC7ff8cWH3zdHKumlQIiW+ATRcFN206NYNtikjeCy8Sr7g9r4aogV4qxCRwMvS/HFbrbYHex88BFn9ADHPz25q0Ix+EMNziv3K3xNnV3Uv5NlCujMjJf8od1HjpSKpEPTVdDUkxAS6fLNkHVGJF9zkKxQZ4zx2kT2tPb9cpgLU= 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)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123556025)(20161123563025)(20161123561025)(20161123565025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY1PR03MB2363;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY1PR03MB2363; X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR03MB2363;23:vbQrZuR6cGrXqsWxshLP5nkrjoOc09XRUDCKhu9u2?= =?us-ascii?Q?4LTRpV3zX1G1hk9551dyizlBaI7v9mz5w/z4AmRNo0sXfkJvCfgzlwlC6ybt?= =?us-ascii?Q?/WJwQlznT/L2OST0TssYVl5sTK5xtoFjT3YBKOl7NPzpIwVAyb0hUTIDWxcQ?= =?us-ascii?Q?/janO4tbG5X89gQ6/jShXCO2dVtfZ4txkeuUTMDzQweD2dP37iMgaomHoYif?= =?us-ascii?Q?diUQ/4o/vX0djLq2G4bX/chqTOPH0axWvQMc0X31sZJRN+bCRXVMpdGm6ZOv?= =?us-ascii?Q?kkgt2fFGi/uALWbjcXXebAu2MkX3Gd3wBYKeyafAYlloBDgmrwIBw/gebwD8?= =?us-ascii?Q?bbFiWthwofssHOEliwJ6EQwYvL88+suPfVNtLVAjqTRVUwF9ItfRwVH6R+Fx?= =?us-ascii?Q?v/Mc6pYXg8HSeZTWlUnlEPj8UPhnzMmX9wEGkzB0bfMfoUC7lEEh6LE2Ng2t?= =?us-ascii?Q?uLIZlFKggDFk0WKKRT2jVi78u+0dwVA5p1ywq0BPhUfvEZX3Wyx170CfwW/r?= =?us-ascii?Q?08qFhYy11FFa/DHwVygmjWUVVFAuqMtdzOEr0VcMF0F4cewKgL+k7MFajp22?= =?us-ascii?Q?SmkXhJgl3j3snQuEIC/7qE598Ig4N+Kz3Fv9zWc2Eoh1ECeyyJ5GLR2uUixv?= =?us-ascii?Q?xYZ2kLcLNeW2Ot42oBJmNOdSoBdziXk7IlKxBsLpAkdeyTbB0KtbDD++am7q?= =?us-ascii?Q?FbgIrNOCvQ8cpchKsginzhnqaplJyhnkPegooMLDE2y2xLAD9wwRWwo5I+ep?= =?us-ascii?Q?QDp1IHNNkdDvrV0X7VzYDUNbrvP5gMSt1jGXCYWM6HMI9yEMkJew9uKhRAAa?= =?us-ascii?Q?W+J+ke2TEozevuv8h0dZZPyu8ZvuHmkNmpt1TqzrBLw+afY3VYLqUYFZEmPz?= =?us-ascii?Q?xLzn/z+x1DLIKfxgrtcBG4J+Gn8tCbLwX4hrdPEsI7C9ImGJrVoHTXqeIx5Z?= =?us-ascii?Q?LjVWZpawR5K0Gn2vAXH4+LbRJG8s8ZGMA8h9IavYayysAiSWc22gvVO2Txem?= =?us-ascii?Q?XGAwk+pNSNchZhKiTDlPjSGbI68jOwRdFrKGb+2y+5LhjAheAozRiUoz5vyw?= =?us-ascii?Q?RZ+DN4dbDGrnhdamBuA5CpG9H4tqiZyIm/6B6Ba+Oqf4Eb03mis9I7WCZPeN?= =?us-ascii?Q?LVgfQ9GblivJoE/2gE5Jt3si0l9dBoV6G3OKvdRGST/w+NTPW3I7wXWVfkSH?= =?us-ascii?Q?OMWYJ5+FZkvqSQ=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2363;6:q65bCx3qLB6pQ1v6s5vwVEE+J7pc847A9nCtyXa0KdCzSJ0YppvqTUYqpOKRGJq0Kh4TrDOoIdqdmS0pKNBSXFMrkGWp3bMXb2dJjUyU4mIkDl3xEsoVR9lLE3Bt5QDnwJtm/p3R/d2XKddKB1Y1+ktPCV7CO0+ACKgJo12uA1IfNfUugBktkk2qOofj9s6Sj1uhbpOzupn99gDr61Kl+E6S6ZcJssi1Pu40rkPafU2YDn9A9zfnEd3lY5CZ/Uz5id+K+GxmTadZ7nGuV+JvDo1oa9+JuPiJZ/09acsqLCx5kzwvY47ZBTgPOh9femo7Ufs9zmGJ5sr75fErZqME3g==;5:0wYhNtFzYYDIO/zoGopMs+VrMGX+LsEFboB5/cs6j3+yWW9TtyHP3e8afblcdgZKHstPYiR6imNob6tnSKAkLcFKzvFHxAYwnQAc7vH48sVtuTlvsZTnMjpueB4Br8uCiIeIKEjFo+eKliKmxYO2fMBS3bifu1NFqOhOKSV/cU0=;24:4m1DB5yrgRXPk7AH/kH7negfbHQNeYe3nYBD2w+lqsqtNYh81pRGauP6AdMgHwsAzfMBdKPhgnp0d68Nej86utrUZhgbGqgMdgqa3y1DnR4=;7:f0koXh8uwrSoYwbC77suI3plcfNIR9JRPtf9Y3ZJNEnEkb7+na2rN2k79nHlgOodv1X+y6kDyB6iFwFdS7AgixHp9hB8rE4ZT/7S/iWkCceJev07ZaeRDd59NjLwFWpaXoHWDk/X+/aP3idFBOY47CLa2zQh52HOl1ToG+T5HshI+bT1HqZ/Z2bYuLh8Qp86vGJmwbgFYX33Rj9iKqjvpunTm+nPbJF2l2FcDlIykCk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 07:49:22.2605 (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: CY1PR03MB2363 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'clock-names' property is optinal in DT, so of_clk_bulk_get() is introduced here to handle this for DT users without 'clock-names' specified. Cc: Stephen Boyd Cc: Michael Turquette Cc: Russell King Reported-by: Shawn Guo Signed-off-by: Dong Aisheng --- Changes since v2: * of_clk_bulk_get should return -ENOENT; Changes since v1: * using %pOF instead of full_name --- drivers/clk/clk-bulk.c | 31 +++++++++++++++++++++++++++++++ include/linux/clk.h | 8 ++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c index c834f5a..896aa3b 100644 --- a/drivers/clk/clk-bulk.c +++ b/drivers/clk/clk-bulk.c @@ -19,6 +19,37 @@ #include #include #include +#include + +#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) +int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, + struct clk_bulk_data *clks) +{ + int ret; + int i; + + for (i = 0; i < num_clks; i++) + clks[i].clk = NULL; + + for (i = 0; i < num_clks; i++) { + clks[i].clk = of_clk_get(np, i); + if (IS_ERR(clks[i].clk)) { + ret = PTR_ERR(clks[i].clk); + pr_err("%pOF: Failed to get clk index: %d ret: %d\n", + np, i, ret); + clks[i].clk = NULL; + goto err; + } + } + + return 0; + +err: + clk_bulk_put(i, clks); + + return ret; +} +#endif void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) { diff --git a/include/linux/clk.h b/include/linux/clk.h index 12c96d9..a1f1f05 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -680,10 +680,18 @@ static inline void clk_bulk_disable_unprepare(int num_clks, } #if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) +int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, + struct clk_bulk_data *clks); struct clk *of_clk_get(struct device_node *np, int index); struct clk *of_clk_get_by_name(struct device_node *np, const char *name); struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec); #else +static int of_clk_bulk_get(struct device_node *np, int num_clks, + struct clk_bulk_data *clks) +{ + return -ENOENT; +} + static inline struct clk *of_clk_get(struct device_node *np, int index) { return ERR_PTR(-ENOENT); -- 2.7.4