| Message ID | 1372322299-25046-5-git-send-email-t-kristo@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Tero Kristo (2013-06-27 01:38:19) > cclock7xx_data.c now contains only init function and the clkdev mapping > that is still needed by some drivers. Eventually most of this file can > be removed, once a common location for the clk init can be found, and > the clkdev mapping is no longer needed. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- > arch/arm/mach-omap2/cclock7xx_data.c | 93 ++++++++++++++++++++++++++++++++++ > 1 file changed, 93 insertions(+) > create mode 100644 arch/arm/mach-omap2/cclock7xx_data.c Why not drivers/clk/omap/clk-dra7xx.c? Regards, Mike > > diff --git a/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c > new file mode 100644 > index 0000000..dba528a > --- /dev/null > +++ b/arch/arm/mach-omap2/cclock7xx_data.c > @@ -0,0 +1,83 @@ > +/* > + * DRA7xx Clock data > + * > + * Copyright (C) 2013 Texas Instruments, Inc. > + * > + * Paul Walmsley (paul@pwsan.com) > + * Rajendra Nayak (rnayak@ti.com) > + * Benoit Cousson (b-cousson@ti.com) > + * Mike Turquette (mturquette@linaro.org) > + * Tero Kristo (t-kristo@ti.com) > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#include <linux/kernel.h> > +#include <linux/list.h> > +#include <linux/clk-provider.h> > +#include <linux/clkdev.h> > +#include <linux/io.h> > +#include <linux/clk/omap.h> > + > +#include "soc.h" > +#include "clock.h" > + > +#define DRA7_DPLL_ABE_DEFFREQ 361267200 > +#define DRA7_DPLL_GMAC_DEFFREQ 1000000000 > + > +/* > + * clkdev > + */ > + > +static struct omap_dt_clk dra7xx_clks[] = { > + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), > + DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin2"), > + DT_CLK("48820000.timer", "timer_sys_ck", "timer_sys_clk_div"), > + DT_CLK("48822000.timer", "timer_sys_ck", "timer_sys_clk_div"), > + DT_CLK("48824000.timer", "timer_sys_ck", "timer_sys_clk_div"), > + DT_CLK("48826000.timer", "timer_sys_ck", "timer_sys_clk_div"), > + DT_CLK(NULL, "sys_clkin", "sys_clkin1"), > +}; > + > +int __init dra7xx_clk_init(void) > +{ > + struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck; > + int rc; > + /* > + * Must stay commented until all OMAP SoC drivers are > + * converted to runtime PM, or drivers may start crashing > + * > + * omap2_clk_disable_clkdm_control(); > + */ > + > + dt_omap_clk_init(); > + > + omap_dt_clocks_register(dra7xx_clks, ARRAY_SIZE(dra7xx_clks)); > + > + omap2_clk_disable_autoidle_all(); > + > + abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux"); > + sys_clkin2 = clk_get_sys(NULL, "sys_clkin2"); > + dpll_ck = clk_get_sys(NULL, "dpll_abe_ck"); > + > + rc = clk_set_parent(abe_dpll_mux, sys_clkin2); > + if (!rc) > + rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ); > + if (rc) > + pr_err("%s: failed to configure ABE DPLL!\n", __func__); > + > + dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck"); > + rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ); > + if (rc) > + pr_err("%s: failed to configure GMAC DPLL!\n", __func__); > + > + return 0; > +} > -- > 1.7.9.5 -- 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
On 06/29/2013 12:04 AM, Mike Turquette wrote: > Quoting Tero Kristo (2013-06-27 01:38:19) >> cclock7xx_data.c now contains only init function and the clkdev mapping >> that is still needed by some drivers. Eventually most of this file can >> be removed, once a common location for the clk init can be found, and >> the clkdev mapping is no longer needed. >> >> Signed-off-by: Tero Kristo <t-kristo@ti.com> >> --- >> arch/arm/mach-omap2/cclock7xx_data.c | 93 ++++++++++++++++++++++++++++++++++ >> 1 file changed, 93 insertions(+) >> create mode 100644 arch/arm/mach-omap2/cclock7xx_data.c > > Why not drivers/clk/omap/clk-dra7xx.c? Hi Mike, Same as O5, I can move this over in next rev. -Tero > > Regards, > Mike > >> >> diff --git a/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c >> new file mode 100644 >> index 0000000..dba528a >> --- /dev/null >> +++ b/arch/arm/mach-omap2/cclock7xx_data.c >> @@ -0,0 +1,83 @@ >> +/* >> + * DRA7xx Clock data >> + * >> + * Copyright (C) 2013 Texas Instruments, Inc. >> + * >> + * Paul Walmsley (paul@pwsan.com) >> + * Rajendra Nayak (rnayak@ti.com) >> + * Benoit Cousson (b-cousson@ti.com) >> + * Mike Turquette (mturquette@linaro.org) >> + * Tero Kristo (t-kristo@ti.com) >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#include <linux/kernel.h> >> +#include <linux/list.h> >> +#include <linux/clk-provider.h> >> +#include <linux/clkdev.h> >> +#include <linux/io.h> >> +#include <linux/clk/omap.h> >> + >> +#include "soc.h" >> +#include "clock.h" >> + >> +#define DRA7_DPLL_ABE_DEFFREQ 361267200 >> +#define DRA7_DPLL_GMAC_DEFFREQ 1000000000 >> + >> +/* >> + * clkdev >> + */ >> + >> +static struct omap_dt_clk dra7xx_clks[] = { >> + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), >> + DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin2"), >> + DT_CLK("48820000.timer", "timer_sys_ck", "timer_sys_clk_div"), >> + DT_CLK("48822000.timer", "timer_sys_ck", "timer_sys_clk_div"), >> + DT_CLK("48824000.timer", "timer_sys_ck", "timer_sys_clk_div"), >> + DT_CLK("48826000.timer", "timer_sys_ck", "timer_sys_clk_div"), >> + DT_CLK(NULL, "sys_clkin", "sys_clkin1"), >> +}; >> + >> +int __init dra7xx_clk_init(void) >> +{ >> + struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck; >> + int rc; >> + /* >> + * Must stay commented until all OMAP SoC drivers are >> + * converted to runtime PM, or drivers may start crashing >> + * >> + * omap2_clk_disable_clkdm_control(); >> + */ >> + >> + dt_omap_clk_init(); >> + >> + omap_dt_clocks_register(dra7xx_clks, ARRAY_SIZE(dra7xx_clks)); >> + >> + omap2_clk_disable_autoidle_all(); >> + >> + abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux"); >> + sys_clkin2 = clk_get_sys(NULL, "sys_clkin2"); >> + dpll_ck = clk_get_sys(NULL, "dpll_abe_ck"); >> + >> + rc = clk_set_parent(abe_dpll_mux, sys_clkin2); >> + if (!rc) >> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ); >> + if (rc) >> + pr_err("%s: failed to configure ABE DPLL!\n", __func__); >> + >> + dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck"); >> + rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ); >> + if (rc) >> + pr_err("%s: failed to configure GMAC DPLL!\n", __func__); >> + >> + return 0; >> +} >> -- >> 1.7.9.5 -- 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/arch/arm/mach-omap2/cclock7xx_data.c b/arch/arm/mach-omap2/cclock7xx_data.c new file mode 100644 index 0000000..dba528a --- /dev/null +++ b/arch/arm/mach-omap2/cclock7xx_data.c @@ -0,0 +1,83 @@ +/* + * DRA7xx Clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * Paul Walmsley (paul@pwsan.com) + * Rajendra Nayak (rnayak@ti.com) + * Benoit Cousson (b-cousson@ti.com) + * Mike Turquette (mturquette@linaro.org) + * Tero Kristo (t-kristo@ti.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include <linux/io.h> +#include <linux/clk/omap.h> + +#include "soc.h" +#include "clock.h" + +#define DRA7_DPLL_ABE_DEFFREQ 361267200 +#define DRA7_DPLL_GMAC_DEFFREQ 1000000000 + +/* + * clkdev + */ + +static struct omap_dt_clk dra7xx_clks[] = { + DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), + DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48036000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("4803e000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48086000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48088000.timer", "timer_sys_ck", "sys_clkin2"), + DT_CLK("48820000.timer", "timer_sys_ck", "timer_sys_clk_div"), + DT_CLK("48822000.timer", "timer_sys_ck", "timer_sys_clk_div"), + DT_CLK("48824000.timer", "timer_sys_ck", "timer_sys_clk_div"), + DT_CLK("48826000.timer", "timer_sys_ck", "timer_sys_clk_div"), + DT_CLK(NULL, "sys_clkin", "sys_clkin1"), +}; + +int __init dra7xx_clk_init(void) +{ + struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck; + int rc; + /* + * Must stay commented until all OMAP SoC drivers are + * converted to runtime PM, or drivers may start crashing + * + * omap2_clk_disable_clkdm_control(); + */ + + dt_omap_clk_init(); + + omap_dt_clocks_register(dra7xx_clks, ARRAY_SIZE(dra7xx_clks)); + + omap2_clk_disable_autoidle_all(); + + abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux"); + sys_clkin2 = clk_get_sys(NULL, "sys_clkin2"); + dpll_ck = clk_get_sys(NULL, "dpll_abe_ck"); + + rc = clk_set_parent(abe_dpll_mux, sys_clkin2); + if (!rc) + rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ); + if (rc) + pr_err("%s: failed to configure ABE DPLL!\n", __func__); + + dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck"); + rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ); + if (rc) + pr_err("%s: failed to configure GMAC DPLL!\n", __func__); + + return 0; +}
cclock7xx_data.c now contains only init function and the clkdev mapping that is still needed by some drivers. Eventually most of this file can be removed, once a common location for the clk init can be found, and the clkdev mapping is no longer needed. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/cclock7xx_data.c | 93 ++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 arch/arm/mach-omap2/cclock7xx_data.c