diff mbox series

clk: clps711x: Remove board support

Message ID 20181220085433.20334-1-shc_work@mail.ru (mailing list archive)
State Accepted, archived
Headers show
Series clk: clps711x: Remove board support | expand

Commit Message

Alexander Shiyan Dec. 20, 2018, 8:54 a.m. UTC 
Since board support for the CLPS711X platform was removed,
remove the board support from the clk-clps711x driver.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/clk/clk-clps711x.c | 61 +++++++++-------------------------------------
 1 file changed, 11 insertions(+), 50 deletions(-)

Comments

Arnd Bergmann Dec. 20, 2018, 3:14 p.m. UTC | #1 
On Thu, Dec 20, 2018 at 9:54 AM Alexander Shiyan <shc_work@mail.ru> wrote:
>
> Since board support for the CLPS711X platform was removed,
> remove the board support from the clk-clps711x driver.
>
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  drivers/clk/clk-clps711x.c | 61 +++++++++-------------------------------------
>  1 file changed, 11 insertions(+), 50 deletions(-)

Acked-by: Arnd Bergmann <arnd@arndb.de>
Stephen Boyd Dec. 20, 2018, 7:42 p.m. UTC | #2 
Quoting Alexander Shiyan (2018-12-20 00:54:33)
> Since board support for the CLPS711X platform was removed,
> remove the board support from the clk-clps711x driver.

Can you reference the commit where the platform was removed in the
commit text here? It helps me know if there are dependencies.
Arnd Bergmann Dec. 20, 2018, 10:44 p.m. UTC | #3 
On Thu, Dec 20, 2018 at 8:42 PM Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting Alexander Shiyan (2018-12-20 00:54:33)
> > Since board support for the CLPS711X platform was removed,
> > remove the board support from the clk-clps711x driver.
>
> Can you reference the commit where the platform was removed in the
> commit text here? It helps me know if there are dependencies.

This was a while back, in commit 4a56f46a7dc6 ("ARM: clps711x:
Remove boards support"), which made it into linux-4.8.

      Arnd
Stephen Boyd Dec. 20, 2018, 11:30 p.m. UTC | #4 
Quoting Arnd Bergmann (2018-12-20 14:44:03)
> On Thu, Dec 20, 2018 at 8:42 PM Stephen Boyd <sboyd@kernel.org> wrote:
> >
> > Quoting Alexander Shiyan (2018-12-20 00:54:33)
> > > Since board support for the CLPS711X platform was removed,
> > > remove the board support from the clk-clps711x driver.
> >
> > Can you reference the commit where the platform was removed in the
> > commit text here? It helps me know if there are dependencies.
> 
> This was a while back, in commit 4a56f46a7dc6 ("ARM: clps711x:
> Remove boards support"), which made it into linux-4.8.
> 

Thanks!
Stephen Boyd Jan. 9, 2019, 8:54 p.m. UTC | #5 
Quoting Alexander Shiyan (2018-12-20 00:54:33)
> Since board support for the CLPS711X platform was removed,
> remove the board support from the clk-clps711x driver.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---

Applied to clk-next
diff mbox series

Patch

diff --git a/drivers/clk/clk-clps711x.c b/drivers/clk/clk-clps711x.c
index 2c04396402ab..c36c47bdba02 100644
--- a/drivers/clk/clk-clps711x.c
+++ b/drivers/clk/clk-clps711x.c
@@ -44,21 +44,21 @@  struct clps711x_clk {
 	struct clk_hw_onecell_data	clk_data;
 };
 
-static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base,
-						       u32 fref)
+static void __init clps711x_clk_init_dt(struct device_node *np)
 {
-	u32 tmp, f_cpu, f_pll, f_bus, f_tim, f_pwm, f_spi;
+	u32 tmp, f_cpu, f_pll, f_bus, f_tim, f_pwm, f_spi, fref = 0;
 	struct clps711x_clk *clps711x_clk;
-	unsigned i;
+	void __iomem *base;
+
+	WARN_ON(of_property_read_u32(np, "startup-frequency", &fref));
 
-	if (!base)
-		return ERR_PTR(-ENOMEM);
+	base = of_iomap(np, 0);
+	BUG_ON(!base);
 
 	clps711x_clk = kzalloc(struct_size(clps711x_clk, clk_data.hws,
 					   CLPS711X_CLK_MAX),
 			       GFP_KERNEL);
-	if (!clps711x_clk)
-		return ERR_PTR(-ENOMEM);
+	BUG_ON(!clps711x_clk);
 
 	spin_lock_init(&clps711x_clk->lock);
 
@@ -137,52 +137,13 @@  static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base,
 		clk_hw_register_fixed_factor(NULL, "uart", "bus", 0, 1, 10);
 	clps711x_clk->clk_data.hws[CLPS711X_CLK_TICK] =
 		clk_hw_register_fixed_rate(NULL, "tick", NULL, 0, 64);
-	for (i = 0; i < CLPS711X_CLK_MAX; i++)
-		if (IS_ERR(clps711x_clk->clk_data.hws[i]))
+	for (tmp = 0; tmp < CLPS711X_CLK_MAX; tmp++)
+		if (IS_ERR(clps711x_clk->clk_data.hws[tmp]))
 			pr_err("clk %i: register failed with %ld\n",
-			       i, PTR_ERR(clps711x_clk->clk_data.hws[i]));
-
-	return clps711x_clk;
-}
-
-void __init clps711x_clk_init(void __iomem *base)
-{
-	struct clps711x_clk *clps711x_clk;
-
-	clps711x_clk = _clps711x_clk_init(base, 73728000);
-
-	BUG_ON(IS_ERR(clps711x_clk));
-
-	/* Clocksource */
-	clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER1],
-			    NULL, "clps711x-timer.0");
-	clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER2],
-			    NULL, "clps711x-timer.1");
-
-	/* Drivers */
-	clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_PWM],
-			    NULL, "clps711x-pwm");
-	clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_UART],
-			    NULL, "clps711x-uart.0");
-	clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_UART],
-			    NULL, "clps711x-uart.1");
-}
-
-#ifdef CONFIG_OF
-static void __init clps711x_clk_init_dt(struct device_node *np)
-{
-	void __iomem *base = of_iomap(np, 0);
-	struct clps711x_clk *clps711x_clk;
-	u32 fref = 0;
-
-	WARN_ON(of_property_read_u32(np, "startup-frequency", &fref));
-
-	clps711x_clk = _clps711x_clk_init(base, fref);
-	BUG_ON(IS_ERR(clps711x_clk));
+			       tmp, PTR_ERR(clps711x_clk->clk_data.hws[tmp]));
 
 	clps711x_clk->clk_data.num = CLPS711X_CLK_MAX;
 	of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
 			       &clps711x_clk->clk_data);
 }
 CLK_OF_DECLARE(clps711x, "cirrus,ep7209-clk", clps711x_clk_init_dt);
-#endif