From patchwork Tue Oct 18 15:46:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 78090 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp949755qge; Tue, 18 Oct 2016 08:47:08 -0700 (PDT) X-Received: by 10.99.114.29 with SMTP id n29mr1345801pgc.7.1476805628097; Tue, 18 Oct 2016 08:47:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c22si36341912pfk.159.2016.10.18.08.47.07; Tue, 18 Oct 2016 08:47:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935839AbcJRPrH (ORCPT + 4 others); Tue, 18 Oct 2016 11:47:07 -0400 Received: from bear.ext.ti.com ([198.47.19.11]:42770 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933622AbcJRPrG (ORCPT ); Tue, 18 Oct 2016 11:47:06 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id u9IFkdYY029990; Tue, 18 Oct 2016 10:46:40 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u9IFkdo7023568; Tue, 18 Oct 2016 10:46:39 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Tue, 18 Oct 2016 10:46:39 -0500 Received: from gomoku.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u9IFkJXC006114; Tue, 18 Oct 2016 10:46:37 -0500 From: Tero Kristo To: , , , , CC: Subject: [PATCHv4 07/15] clk: ti: rename ti_clk_register_legacy_clks API Date: Tue, 18 Oct 2016 18:46:00 +0300 Message-ID: <1476805568-19264-8-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476805568-19264-1-git-send-email-t-kristo@ti.com> References: <1476805568-19264-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Drop the '_legacy_' part out of the name, as this will be used to register also non-legacy clocks in the following patches; namely the hwmod clocks. Signed-off-by: Tero Kristo --- drivers/clk/ti/clk-3xxx-legacy.c | 30 +++++++++++++++--------------- drivers/clk/ti/clk.c | 4 ++-- drivers/clk/ti/clock.h | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/clk/ti/clk-3xxx-legacy.c b/drivers/clk/ti/clk-3xxx-legacy.c index 0fbf8a9..5a860d2 100644 --- a/drivers/clk/ti/clk-3xxx-legacy.c +++ b/drivers/clk/ti/clk-3xxx-legacy.c @@ -4600,9 +4600,9 @@ int __init omap3430es1_clk_legacy_init(void) { int r; - r = ti_clk_register_legacy_clks(omap3430es1_clks); - r |= ti_clk_register_legacy_clks(omap34xx_omap36xx_clks); - r |= ti_clk_register_legacy_clks(omap3xxx_clks); + r = ti_clk_register_clks(omap3430es1_clks); + r |= ti_clk_register_clks(omap34xx_omap36xx_clks); + r |= ti_clk_register_clks(omap3xxx_clks); omap3_clk_legacy_common_init(); @@ -4613,10 +4613,10 @@ int __init omap3430_clk_legacy_init(void) { int r; - r = ti_clk_register_legacy_clks(omap34xx_omap36xx_clks); - r |= ti_clk_register_legacy_clks(omap36xx_omap3430es2plus_clks); - r |= ti_clk_register_legacy_clks(omap36xx_am35xx_omap3430es2plus_clks); - r |= ti_clk_register_legacy_clks(omap3xxx_clks); + r = ti_clk_register_clks(omap34xx_omap36xx_clks); + r |= ti_clk_register_clks(omap36xx_omap3430es2plus_clks); + r |= ti_clk_register_clks(omap36xx_am35xx_omap3430es2plus_clks); + r |= ti_clk_register_clks(omap3xxx_clks); omap3_clk_legacy_common_init(); omap3_clk_lock_dpll5(); @@ -4629,11 +4629,11 @@ int __init omap36xx_clk_legacy_init(void) int r; ti_clk_patch_legacy_clks(omap36xx_clk_patches); - r = ti_clk_register_legacy_clks(omap36xx_clks); - r |= ti_clk_register_legacy_clks(omap36xx_omap3430es2plus_clks); - r |= ti_clk_register_legacy_clks(omap34xx_omap36xx_clks); - r |= ti_clk_register_legacy_clks(omap36xx_am35xx_omap3430es2plus_clks); - r |= ti_clk_register_legacy_clks(omap3xxx_clks); + r = ti_clk_register_clks(omap36xx_clks); + r |= ti_clk_register_clks(omap36xx_omap3430es2plus_clks); + r |= ti_clk_register_clks(omap34xx_omap36xx_clks); + r |= ti_clk_register_clks(omap36xx_am35xx_omap3430es2plus_clks); + r |= ti_clk_register_clks(omap3xxx_clks); omap3_clk_legacy_common_init(); omap3_clk_lock_dpll5(); @@ -4645,9 +4645,9 @@ int __init am35xx_clk_legacy_init(void) { int r; - r = ti_clk_register_legacy_clks(am35xx_clks); - r |= ti_clk_register_legacy_clks(omap36xx_am35xx_omap3430es2plus_clks); - r |= ti_clk_register_legacy_clks(omap3xxx_clks); + r = ti_clk_register_clks(am35xx_clks); + r |= ti_clk_register_clks(omap36xx_am35xx_omap3430es2plus_clks); + r |= ti_clk_register_clks(omap3xxx_clks); omap3_clk_legacy_common_init(); omap3_clk_lock_dpll5(); diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index f526f0d..7a445f4 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -291,6 +291,7 @@ void __init ti_clk_patch_legacy_clks(struct ti_clk **patch) patch++; } } +#endif struct clk __init *ti_clk_register_clk(struct ti_clk *setup) { @@ -376,7 +377,7 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup) { } }; -int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) +int __init ti_clk_register_clks(struct ti_clk_alias *clks) { struct clk *clk; bool retry; @@ -443,7 +444,6 @@ int __init ti_clk_register_legacy_clks(struct ti_clk_alias *clks) return 0; } -#endif /** * ti_clk_setup_features - setup clock features flags diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h index 6bf962d..5675e37 100644 --- a/drivers/clk/ti/clock.h +++ b/drivers/clk/ti/clock.h @@ -201,7 +201,7 @@ struct clk *ti_clk_register(struct device *dev, struct clk_hw *hw, void ti_clk_patch_legacy_clks(struct ti_clk **patch); struct clk *ti_clk_register_clk(struct ti_clk *setup); -int ti_clk_register_legacy_clks(struct ti_clk_alias *clks); +int ti_clk_register_clks(struct ti_clk_alias *clks); void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index); void ti_dt_clocks_register(struct ti_dt_clk *oclks);