From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763316AbbA3VyY (ORCPT ); Fri, 30 Jan 2015 16:54:24 -0500 Received: from smtp4.ore.mailhop.org ([54.149.240.58]:37971 "EHLO smtp4.ore.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763264AbbA3VyW (ORCPT ); Fri, 30 Jan 2015 16:54:22 -0500 X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 104.193.169.186 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX1/C/3VNx8cEwTKQATgV9RWZ Date: Fri, 30 Jan 2015 13:51:24 -0800 From: Tony Lindgren To: Michael Turquette Cc: linux-kernel@vger.kernel.org, Stephen Boyd , Paul Walmsley , Tero Kristo , linux-omap@vger.kernel.org Subject: Re: [PATCH 1/3] arm: omap2+ remove dead clock code Message-ID: <20150130215123.GC16250@atomide.com> References: <1422653113-32688-1-git-send-email-mturquette@linaro.org> <1422653113-32688-2-git-send-email-mturquette@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1422653113-32688-2-git-send-email-mturquette@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Michael Turquette [150130 13:28]: > Remove omap_clocks_register and dummy_ck. The former is not used anymore > now that the statically defined clk stuctures are replaced with proper > descriptors and registered with the framework. > > The dummy clock in arch/arm/mach-omap2 is made redundant by the OMAP3+ > clock data that migrated to drivers/clk. > > An additional benefit to this clean-up is removing the references to > clk-private.h which will be removed. Right on! Assuming things sitll build and boot, please feel free to apply this via your clock patches: Acked-by: Tony Lindgren > Cc: Paul Walmsley > Cc: Tero Kristo > Cc: Tony Lindgren > Signed-off-by: Michael Turquette > --- > Cc: linux-omap@vger.kernel.org > arch/arm/mach-omap2/clock.c | 16 ---------------- > arch/arm/mach-omap2/clock.h | 5 ----- > arch/arm/mach-omap2/clock_common_data.c | 14 -------------- > 3 files changed, 35 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c > index 6ad5b4d..d9c128e 100644 > --- a/arch/arm/mach-omap2/clock.c > +++ b/arch/arm/mach-omap2/clock.c > @@ -23,7 +23,6 @@ > #include > #include > #include > -#include > #include > > #include > @@ -630,21 +629,6 @@ const struct clk_hw_omap_ops clkhwops_wait = { > }; > > /** > - * omap_clocks_register - register an array of omap_clk > - * @ocs: pointer to an array of omap_clk to register > - */ > -void __init omap_clocks_register(struct omap_clk oclks[], int cnt) > -{ > - struct omap_clk *c; > - > - for (c = oclks; c < oclks + cnt; c++) { > - clkdev_add(&c->lk); > - if (!__clk_init(NULL, c->lk.clk)) > - omap2_init_clk_hw_omap_clocks(c->lk.clk); > - } > -} > - > -/** > * omap2_clk_switch_mpurate_at_boot - switch ARM MPU rate by boot-time argument > * @mpurate_ck_name: clk name of the clock to change rate > * > diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h > index c5b3a7f..6a10ce3 100644 > --- a/arch/arm/mach-omap2/clock.h > +++ b/arch/arm/mach-omap2/clock.h > @@ -245,7 +245,6 @@ struct ti_clk_features { > extern struct ti_clk_features ti_clk_features; > > extern const struct clkops clkops_omap2_dflt_wait; > -extern const struct clkops clkops_dummy; > extern const struct clkops clkops_omap2_dflt; > > extern struct clk_functions omap2_clk_functions; > @@ -254,8 +253,6 @@ extern const struct clksel_rate gpt_32k_rates[]; > extern const struct clksel_rate gpt_sys_rates[]; > extern const struct clksel_rate gfx_l3_rates[]; > extern const struct clksel_rate dsp_ick_rates[]; > -extern struct clk_core dummy_ck_core; > -extern struct clk dummy_ck; > > extern const struct clk_hw_omap_ops clkhwops_iclk_wait; > extern const struct clk_hw_omap_ops clkhwops_wait; > @@ -280,7 +277,5 @@ extern void __iomem *clk_memmaps[]; > extern int omap2_clkops_enable_clkdm(struct clk_hw *hw); > extern void omap2_clkops_disable_clkdm(struct clk_hw *hw); > > -extern void omap_clocks_register(struct omap_clk *oclks, int cnt); > - > void __init ti_clk_init_features(void); > #endif > diff --git a/arch/arm/mach-omap2/clock_common_data.c b/arch/arm/mach-omap2/clock_common_data.c > index febd0a2..61b60df 100644 > --- a/arch/arm/mach-omap2/clock_common_data.c > +++ b/arch/arm/mach-omap2/clock_common_data.c > @@ -16,7 +16,6 @@ > * OMAP3xxx clock definition files. > */ > > -#include > #include "clock.h" > > /* clksel_rate data common to 24xx/343x */ > @@ -114,16 +113,3 @@ const struct clksel_rate div31_1to31_rates[] = { > { .div = 31, .val = 31, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, > { .div = 0 }, > }; > - > -/* Clocks shared between various OMAP SoCs */ > - > -static struct clk_ops dummy_ck_ops = {}; > - > -struct clk_core dummy_ck_core = { > - .name = "dummy_clk", > - .ops = &dummy_ck_ops, > - .flags = CLK_IS_BASIC, > -}; > -struct clk dummy_ck = { > - .core = &dummy_ck_core, > -}; > -- > 1.9.1 >