| Message ID | 1365066351-2395-1-git-send-email-pgaikwad@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 04/04/2013 03:05 AM, Prashant Gaikwad wrote: > Use common of_clk_init() function for clocks initialization. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > --- > > Stephen, if T114 clock series is not going to make in 3.10 then I would > like Mike to take this patch. If T114 clock series makes it then I have > to rebase this patch on top of it. I'm still just hopeful that it the Tegra114 support can get into 3.10; all I'm waiting on is Mike's ack to apply it. Let's hold off on this patch until after that. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/04/2013 03:05 AM, Prashant Gaikwad wrote: > Use common of_clk_init() function for clocks initialization. Prashant, can you please resend this to Mike for inclusion in 3.11; now that we have moved the Tegra clock driver out of arch/arm/mach-tegra, we should send all clock driver changes through Mike if possible. Thanks. Just one question though: > diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c > -#include <linux/clk/tegra.h> > +#include <linux/clk-provider.h> Is clk-provider.h the right header? This code isn't a clock provider? -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" 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-tegra/common.c b/arch/arm/mach-tegra/common.c index 7cc7563..1947de8 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -23,7 +23,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/irqchip.h> -#include <linux/clk/tegra.h> +#include <linux/clk-provider.h> #include <asm/hardware/cache-l2x0.h> @@ -58,7 +58,7 @@ u32 tegra_uart_config[4] = { #ifdef CONFIG_OF void __init tegra_dt_init_irq(void) { - tegra_clocks_init(); + of_clk_init(NULL); tegra_init_irq(); irqchip_init(); } diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index b324d3f..e0565e6 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c @@ -1270,7 +1270,7 @@ static const struct of_device_id pmc_match[] __initconst = { {}, }; -void __init tegra20_clock_init(struct device_node *np) +static void __init tegra20_clock_init(struct device_node *np) { int i; struct device_node *node; @@ -1322,3 +1322,4 @@ void __init tegra20_clock_init(struct device_node *np) tegra_cpu_car_ops = &tegra20_cpu_car_ops; } +CLK_OF_DECLARE(tegra20, "nvidia,tegra20-car", tegra20_clock_init); diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 0e362ea..77dd080 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -1959,7 +1959,7 @@ static const struct of_device_id pmc_match[] __initconst = { {}, }; -void __init tegra30_clock_init(struct device_node *np) +static void __init tegra30_clock_init(struct device_node *np) { struct device_node *node; int i; @@ -2010,3 +2010,4 @@ void __init tegra30_clock_init(struct device_node *np) tegra_cpu_car_ops = &tegra30_cpu_car_ops; } +CLK_OF_DECLARE(tegra30, "nvidia,tegra30-car", tegra30_clock_init); diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c index a603b9a..ce4441a 100644 --- a/drivers/clk/tegra/clk.c +++ b/drivers/clk/tegra/clk.c @@ -72,14 +72,3 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl, } } } - -static const struct of_device_id tegra_dt_clk_match[] = { - { .compatible = "nvidia,tegra20-car", .data = tegra20_clock_init }, - { .compatible = "nvidia,tegra30-car", .data = tegra30_clock_init }, - { } -}; - -void __init tegra_clocks_init(void) -{ - of_clk_init(tegra_dt_clk_match); -} diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h index a09d7dc..35a04d8 100644 --- a/drivers/clk/tegra/clk.h +++ b/drivers/clk/tegra/clk.h @@ -498,16 +498,4 @@ void tegra_init_from_table(struct tegra_clk_init_table *tbl, void tegra_init_dup_clks(struct tegra_clk_duplicate *dup_list, struct clk *clks[], int clk_max); -#ifdef CONFIG_ARCH_TEGRA_2x_SOC -void tegra20_clock_init(struct device_node *np); -#else -static inline void tegra20_clock_init(struct device_node *np) {} -#endif /* CONFIG_ARCH_TEGRA_2x_SOC */ - -#ifdef CONFIG_ARCH_TEGRA_3x_SOC -void tegra30_clock_init(struct device_node *np); -#else -static inline void tegra30_clock_init(struct device_node *np) {} -#endif /* CONFIG_ARCH_TEGRA_3x_SOC */ - #endif /* TEGRA_CLK_H */ diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 404d6f9..2e8b399 100644 --- a/include/linux/clk/tegra.h +++ b/include/linux/clk/tegra.h @@ -122,6 +122,5 @@ static inline void tegra_cpu_clock_resume(void) void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); -void tegra_clocks_init(void); #endif /* __LINUX_CLK_TEGRA_H_ */
Use common of_clk_init() function for clocks initialization. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- Stephen, if T114 clock series is not going to make in 3.10 then I would like Mike to take this patch. If T114 clock series makes it then I have to rebase this patch on top of it. --- arch/arm/mach-tegra/common.c | 4 ++-- drivers/clk/tegra/clk-tegra20.c | 3 ++- drivers/clk/tegra/clk-tegra30.c | 3 ++- drivers/clk/tegra/clk.c | 11 ----------- drivers/clk/tegra/clk.h | 12 ------------ include/linux/clk/tegra.h | 1 - 6 files changed, 6 insertions(+), 28 deletions(-)