[PATCH 2/6] clk: tegra: make tegra_clocks_apply_init_table arch_initcall
From: Peter De Schrijver <hidden>
Date: 2014-07-15 15:25:48
Also in:
linux-devicetree, linux-tegra, lkml
Subsystem:
arm port, common clk framework, tegra clock driver, the rest · Maintainers:
Russell King, Michael Turquette, Stephen Boyd, Prashant Gaikwad, Linus Torvalds
tegra_clocks_apply_init_table needs to be called after the udelay loop has been calibrated (see 441f199a37cfd66c5dd8dd45490bd3ea6971117d why that is). On existing Tegra SoCs this was done by calling tegra_clocks_apply_init_table from tegra_dt_init. To make this also work on ARM64, we need to change this into an initcall. tegra_dt_init is called from customize_machine which is an arch_initcall. Therefore this should also work on existing 32bit Tegra SoCs. Tested on Tegra20 (ventana), Tegra30 (beaverboard), Tegra124 (jetson TK1) and Tegra132. Signed-off-by: Peter De Schrijver <redacted> --- arch/arm/mach-tegra/tegra.c | 3 --- drivers/clk/tegra/clk.c | 7 +++++-- include/linux/clk/tegra.h | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 15ac9fc..6c5cad5 100644
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c@@ -32,7 +32,6 @@ #include <linux/slab.h> #include <linux/sys_soc.h> #include <linux/usb/tegra_usb_phy.h> -#include <linux/clk/tegra.h> #include <linux/irqchip.h> #include <asm/hardware/cache-l2x0.h>
@@ -96,8 +95,6 @@ static void __init tegra_dt_init(void) tegra_pmc_init(); - tegra_clocks_apply_init_table(); - soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) goto out;
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c
index d081732..65cde4e 100644
--- a/drivers/clk/tegra/clk.c
+++ b/drivers/clk/tegra/clk.c@@ -290,10 +290,13 @@ struct clk ** __init tegra_lookup_dt_id(int clk_id, tegra_clk_apply_init_table_func tegra_clk_apply_init_table; -void __init tegra_clocks_apply_init_table(void) +static int __init tegra_clocks_apply_init_table(void) { if (!tegra_clk_apply_init_table) - return; + return 0; tegra_clk_apply_init_table(); + + return 0; } +arch_initcall(tegra_clocks_apply_init_table);
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index 3ca9fca..19c4208 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h@@ -120,6 +120,4 @@ static inline void tegra_cpu_clock_resume(void) } #endif -void tegra_clocks_apply_init_table(void); - #endif /* __LINUX_CLK_TEGRA_H_ */
--
1.7.7.rc0.72.g4b5ea.dirty