| Message ID | 1357282858-2112-5-git-send-email-pgaikwad@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Prashant Gaikwad (2013-01-03 23:00:56) > Use common of_clk_init() function for clock initialization. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Tony, Can I get a Tested-by from you before I take this in? Thanks, Mike > --- > drivers/clk/clk-vt8500.c | 15 ++++----------- > 1 files changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c > index fe25570..3ce1c3e 100644 > --- a/drivers/clk/clk-vt8500.c > +++ b/drivers/clk/clk-vt8500.c > @@ -272,7 +272,7 @@ static __init void vtwm_device_clk_init(struct device_node *node) > rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); > clk_register_clkdev(clk, clk_name, NULL); > } > - > +CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init); > > /* PLL clock related functions */ > > @@ -502,20 +502,13 @@ static void __init vt8500_pll_init(struct device_node *node) > { > vtwm_pll_clk_init(node, PLL_TYPE_VT8500); > } > +CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init); > > static void __init wm8650_pll_init(struct device_node *node) > { > vtwm_pll_clk_init(node, PLL_TYPE_WM8650); > } > - > -static const __initconst struct of_device_id clk_match[] = { > - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, > - { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, }, > - { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, }, > - { .compatible = "via,vt8500-device-clock", > - .data = vtwm_device_clk_init, }, > - { /* sentinel */ } > -}; > +CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init); > > void __init vtwm_clk_init(void __iomem *base) > { > @@ -524,5 +517,5 @@ void __init vtwm_clk_init(void __iomem *base) > > pmc_base = base; > > - of_clk_init(clk_match); > + of_clk_init(NULL); > } > -- > 1.7.4.1
On Fri, 2013-01-18 at 09:56 -0800, Mike Turquette wrote: > Quoting Prashant Gaikwad (2013-01-03 23:00:56) > > Use common of_clk_init() function for clock initialization. > > > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > > Tony, > > Can I get a Tested-by from you before I take this in? > Tested-by: Tony Prisk <linux@prisktech.co.nz> FYI: This will need another patch to complete as we added another set of clocks to this clk-vt8500.c for 3.9. > Thanks, > Mike > > > --- > > drivers/clk/clk-vt8500.c | 15 ++++----------- > > 1 files changed, 4 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c > > index fe25570..3ce1c3e 100644 > > --- a/drivers/clk/clk-vt8500.c > > +++ b/drivers/clk/clk-vt8500.c > > @@ -272,7 +272,7 @@ static __init void vtwm_device_clk_init(struct device_node *node) > > rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); > > clk_register_clkdev(clk, clk_name, NULL); > > } > > - > > +CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init); > > > > /* PLL clock related functions */ > > > > @@ -502,20 +502,13 @@ static void __init vt8500_pll_init(struct device_node *node) > > { > > vtwm_pll_clk_init(node, PLL_TYPE_VT8500); > > } > > +CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init); > > > > static void __init wm8650_pll_init(struct device_node *node) > > { > > vtwm_pll_clk_init(node, PLL_TYPE_WM8650); > > } > > - > > -static const __initconst struct of_device_id clk_match[] = { > > - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, > > - { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, }, > > - { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, }, > > - { .compatible = "via,vt8500-device-clock", > > - .data = vtwm_device_clk_init, }, > > - { /* sentinel */ } > > -}; > > +CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init); > > > > void __init vtwm_clk_init(void __iomem *base) > > { > > @@ -524,5 +517,5 @@ void __init vtwm_clk_init(void __iomem *base) > > > > pmc_base = base; > > > > - of_clk_init(clk_match); > > + of_clk_init(NULL); > > } > > -- > > 1.7.4.1 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c index fe25570..3ce1c3e 100644 --- a/drivers/clk/clk-vt8500.c +++ b/drivers/clk/clk-vt8500.c @@ -272,7 +272,7 @@ static __init void vtwm_device_clk_init(struct device_node *node) rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); clk_register_clkdev(clk, clk_name, NULL); } - +CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init); /* PLL clock related functions */ @@ -502,20 +502,13 @@ static void __init vt8500_pll_init(struct device_node *node) { vtwm_pll_clk_init(node, PLL_TYPE_VT8500); } +CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init); static void __init wm8650_pll_init(struct device_node *node) { vtwm_pll_clk_init(node, PLL_TYPE_WM8650); } - -static const __initconst struct of_device_id clk_match[] = { - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, - { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, }, - { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, }, - { .compatible = "via,vt8500-device-clock", - .data = vtwm_device_clk_init, }, - { /* sentinel */ } -}; +CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init); void __init vtwm_clk_init(void __iomem *base) { @@ -524,5 +517,5 @@ void __init vtwm_clk_init(void __iomem *base) pmc_base = base; - of_clk_init(clk_match); + of_clk_init(NULL); }
Use common of_clk_init() function for clock initialization. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- drivers/clk/clk-vt8500.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-)