diff options
| author | David Lechner <david@lechnology.com> | 2018-01-20 04:20:22 +0100 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2018-02-19 11:55:15 +0100 |
| commit | 96c081735d5197d9d4fa0b6ce84cffa3bb197474 (patch) | |
| tree | 54606e24a0afc246be11cb3f80f0560c2ccbe323 /arch/arm/mach-davinci/include | |
| parent | ARM: davinci: board-da830-evm: fix unused const variable warning (diff) | |
| download | linux-96c081735d5197d9d4fa0b6ce84cffa3bb197474.tar.xz linux-96c081735d5197d9d4fa0b6ce84cffa3bb197474.zip | |
ARM: davinci: move davinci_clk_init() to init_time
This moves the call of davinci_clk_init() from map_io to init_time for all
boards.
This is the proper place to init clocks. This is also done in preparation
for moving to the common clock framework.
dm646x is a special case because we need to handle different ref_clk rates
depending on which board is being used. The clock init in this case is
modified to set the rate before registering the clocks instead of using
davinci_set_refclk_rate() to recalculate the entire clock tree after all
of the clocks are registered.
Also, the cpu_clks field is removed from struct davinci_soc_info since it
is no longer needed.
Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 19b9346e147e..f0d5e858f158 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -53,7 +53,6 @@ struct davinci_soc_info { u32 jtag_id_reg; struct davinci_id *ids; unsigned long ids_num; - struct clk_lookup *cpu_clks; u32 *psc_bases; unsigned long psc_bases_num; u32 pinmux_base; diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index fe2d77654c06..9fd6d0125762 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -88,7 +88,10 @@ extern unsigned int da850_max_speed; #define DA8XX_ARM_RAM_BASE 0xffff0000 void da830_init(void); +void da830_init_time(void); + void da850_init(void); +void da850_init_time(void); int da830_register_edma(struct edma_rsv_info *rsv); int da850_register_edma(struct edma_rsv_info *rsv[2]); |