msm: clock: Support multi-target compilation
Having multiple late initcalls across all the clock-$(ARCH) files
won't work when they are compiled together. Register a struct
with msm_clock_init() so that clock.c can driver the init() and
late_init() calls that need to be made per SoC.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index ffc6a30..e0613d9 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1394,7 +1394,7 @@
};
#endif
-struct clk_lookup msm_clocks_8960_dummy[] = {
+static struct clk_lookup msm_clocks_8960_dummy[] = {
CLK_DUMMY("pll2", PLL2, NULL, 0),
CLK_DUMMY("pll8", PLL8, NULL, 0),
CLK_DUMMY("pll4", PLL4, NULL, 0),
@@ -1586,7 +1586,10 @@
CLK_DUMMY("dma_bam_pclk", DMA_BAM_P_CLK, NULL, 0),
};
-unsigned msm_num_clocks_8960_dummy = ARRAY_SIZE(msm_clocks_8960_dummy);
+struct clock_init_data msm8960_dummy_clock_init_data __initdata = {
+ .table = msm_clocks_8960_dummy,
+ .size = ARRAY_SIZE(msm_clocks_8960_dummy),
+};
#define LPASS_SLIMBUS_PHYS 0x28080000
#define LPASS_SLIMBUS_BAM_PHYS 0x28084000