clk: versatile: Drop the legacy IM-PD1 clock code
Subsystems (2)
PATCH 1/1 clk: versatile: Drop the legacy IM-PD1 clock code
Now that the non-DT IM-PD1 support code has been removed, drop the clock related code from clk-impd1.c.
---
This is depends on the pending IM-PD1 DT support Linus has queued up. Perhaps apply on top of his PR '[GIT PULL] Versatile changes for v5.8 take 1'.
drivers/clk/versatile/clk-impd1.c | 121 ------------------- include/linux/platform_data/clk-integrator.h | 2 - 2 files changed, 123 deletions(-) delete mode 100644 include/linux/platform_data/clk-integrator.h
drivers/clk/versatile/clk-impd1.c +0 -121
@@ -8,7 +8,6 @@#include <linux/err.h> #include <linux/io.h> #include <linux/platform_device.h> -#include <linux/platform_data/clk-integrator.h> #include <linux/module.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h>
@@ -20,26 +19,6 @@#define IMPD1_OSC2 0x04#define IMPD1_LOCK 0x08 -struct impd1_clk { -char *pclkname; -struct clk *pclk; -char *vco1name; -struct clk *vco1clk; -char *vco2name; -struct clk *vco2clk; -struct clk *mmciclk; -char *uartname; -struct clk *uartclk; -char *spiname; -struct clk *spiclk; -char *scname; -struct clk *scclk; -struct clk_lookup *clks[15 ]; -}; - -/* One entry for each connected IM-PD1 LM */ -static struct impd1_clk impd1_clks[4 ]; -/* * There are two VCO's on the IM-PD1 */
@@ -80,106 +59,6 @@ static const struct clk_icst_desc impd1_icst2_desc = { .lock_offset = IMPD1_LOCK, }; -/** -* integrator_impd1_clk_init() - set up the integrator clock tree -* @base: base address of the logic module (LM) -* @id: the ID of this LM -*/ -void integrator_impd1_clk_init (void __iomem *base,unsigned int id) -{ -struct impd1_clk *imc; -struct clk *clk; -struct clk *pclk; -int i; - -if (id >3 ) { -pr_crit ("no more than 4 LMs can be attached\n" ); -return ; - } - imc = &impd1_clks[id]; - -/* Register the fixed rate PCLK */ - imc->pclkname =kasprintf (GFP_KERNEL ,"lm%x-pclk" , id); - pclk =clk_register_fixed_rate (NULL , imc->pclkname,NULL ,0 ,0 ); - imc->pclk = pclk; - - imc->vco1name =kasprintf (GFP_KERNEL ,"lm%x-vco1" , id); - clk =icst_clk_register (NULL , &impd1_icst1_desc, imc->vco1name,NULL , - base); - imc->vco1clk = clk; - imc->clks[0 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:01000" , id); - imc->clks[1 ] =clkdev_alloc (clk,NULL ,"lm%x:01000" , id); - -/* VCO2 is also called "CLK2" */ - imc->vco2name =kasprintf (GFP_KERNEL ,"lm%x-vco2" , id); - clk =icst_clk_register (NULL , &impd1_icst2_desc, imc->vco2name,NULL , - base); - imc->vco2clk = clk; - -/* MMCI uses CLK2 right off */ - imc->clks[2 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00700" , id); - imc->clks[3 ] =clkdev_alloc (clk,NULL ,"lm%x:00700" , id); - -/* UART reference clock divides CLK2 by a fixed factor 4 */ - imc->uartname =kasprintf (GFP_KERNEL ,"lm%x-uartclk" , id); - clk =clk_register_fixed_factor (NULL , imc->uartname, imc->vco2name, -CLK_IGNORE_UNUSED ,1 ,4 ); - imc->uartclk = clk; - imc->clks[4 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00100" , id); - imc->clks[5 ] =clkdev_alloc (clk,NULL ,"lm%x:00100" , id); - imc->clks[6 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00200" , id); - imc->clks[7 ] =clkdev_alloc (clk,NULL ,"lm%x:00200" , id); - -/* SPI PL022 clock divides CLK2 by a fixed factor 64 */ - imc->spiname =kasprintf (GFP_KERNEL ,"lm%x-spiclk" , id); - clk =clk_register_fixed_factor (NULL , imc->spiname, imc->vco2name, -CLK_IGNORE_UNUSED ,1 ,64 ); - imc->clks[8 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00300" , id); - imc->clks[9 ] =clkdev_alloc (clk,NULL ,"lm%x:00300" , id); - -/* The GPIO blocks and AACI have only PCLK */ - imc->clks[10 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00400" , id); - imc->clks[11 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00500" , id); - imc->clks[12 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00800" , id); - -/* Smart Card clock divides CLK2 by a fixed factor 4 */ - imc->scname =kasprintf (GFP_KERNEL ,"lm%x-scclk" , id); - clk =clk_register_fixed_factor (NULL , imc->scname, imc->vco2name, -CLK_IGNORE_UNUSED ,1 ,4 ); - imc->scclk = clk; - imc->clks[13 ] =clkdev_alloc (pclk,"apb_pclk" ,"lm%x:00600" , id); - imc->clks[14 ] =clkdev_alloc (clk,NULL ,"lm%x:00600" , id); - -for (i =0 ; i <ARRAY_SIZE (imc->clks); i++) -clkdev_add (imc->clks[i]); -} -EXPORT_SYMBOL_GPL (integrator_impd1_clk_init); - -void integrator_impd1_clk_exit (unsigned int id) -{ -int i; -struct impd1_clk *imc; - -if (id >3 ) -return ; - imc = &impd1_clks[id]; - -for (i =0 ; i <ARRAY_SIZE (imc->clks); i++) -clkdev_drop (imc->clks[i]); -clk_unregister (imc->spiclk); -clk_unregister (imc->uartclk); -clk_unregister (imc->vco2clk); -clk_unregister (imc->vco1clk); -clk_unregister (imc->pclk); -kfree (imc->scname); -kfree (imc->spiname); -kfree (imc->uartname); -kfree (imc->vco2name); -kfree (imc->vco1name); -kfree (imc->pclkname); -} -EXPORT_SYMBOL_GPL (integrator_impd1_clk_exit); -static int integrator_impd1_clk_spawn (struct device *dev,struct device_node *parent,struct device_node *np)
include/linux/platform_data/clk-integrator.h deleted +0 -2
@@ -1,2 +0,0 @@ -void integrator_impd1_clk_init (void __iomem *base,unsigned int id); -void integrator_impd1_clk_exit (unsigned int id);
Signature · 1 line
2.20.1
Quoted 8 lines · Rob Herring
Now that the non-DT IM-PD1 support code has been removed, drop the clock related code from
clk-impd1.c.Cc Linus Walleij <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 4 lines
---
This is depends on the pending IM-PD1 DT support Linus has queued up. Perhaps apply on top of his PR '[GIT PULL] Versatile changes for v5.8 take 1'.
I was actually gonna wait until next kernel cycle to do these cleanups, but fine with me :D
If the clk maintainers are OK with it, I would have the ARM SoC folks apply this on top of my Versatile patches in the ARM SoC tree.
Yours,
Linus Walleij
Stephen Boyd
maintainerQuoting Linus Walleij (2020-04-29 05:14:34)
Quoted 15 lines · Rob Herring
Quoted 9 lines
Now that the non-DT IM-PD1 support code has been removed, drop the clock related code from
clk-impd1.c.Cc Linus Walleij <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Rob Herring <[email protected]>Quoted 4 lines
---
This is depends on the pending IM-PD1 DT support Linus has queued up. Perhaps apply on top of his PR '[GIT PULL] Versatile changes for v5.8 take 1'.
Quoted 8 lines
I was actually gonna wait until next kernel cycle to do these cleanups, but fine with me :D
Reviewed-by Linus Walleij <[email protected]>If the clk maintainers are OK with it, I would have the ARM SoC folks apply this on top of my Versatile patches in the ARM SoC tree.
Go for it!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoting Rob Herring (2020-04-28 13:49:45)
Quoted 9 lines
Now that the non-DT IM-PD1 support code has been removed, drop the clock related code from
clk-impd1.c.Cc Linus Walleij <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Rob Herring <[email protected]>---
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel