ARM: OMAP3: clock: remove un-used core dpll re-program code
Subsystems (3)
PATCH 1/1 ARM: OMAP3: clock: remove un-used core dpll re-program code
Remove the OMAP3 core DPLL re-program code, and the associated SRAM code that does the low-level programming of the DPLL divider, idling of the SDRAM etc.
This code was never fully implemented in the kernel; things missing were driver side handling of core clock changes (they need to account for their functional clock rate being changed on-the-fly), and the whole framework required for handling this. Thus, there is not much point to keep carrying the low-level support code either.
--- arch/arm/mach-omap2/Makefile | 3 +- arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 119 ----------- arch/arm/mach-omap2/sram.c | 25 --- arch/arm/mach-omap2/sram.h | 14 -- arch/arm/mach-omap2/sram34xx.S | 346 -------------------------------- 5 files changed, 1 insertion(+), 506 deletions(-) delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c delete mode 100644 arch/arm/mach-omap2/sram34xx.S
arch/arm/mach-omap2/Makefile +1 -2
@@ -49,7 +49,6 @@ AFLAGS_sleep44xx.o :=-Wa,-march=armv7-a$(plus_sec) # Functions loaded to SRAM obj-$(CONFIG_SOC_OMAP2420) += sram242x.o obj-$(CONFIG_SOC_OMAP2430) += sram243x.o -obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o AFLAGS_sram242x.o :=-Wa,-march=armv6 AFLAGS_sram243x.o :=-Wa,-march=armv6
@@ -188,7 +187,7 @@ obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_virt_prcm_set.o obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpll.o clkt_iclk.o obj-$(CONFIG_SOC_OMAP2430) += clock2430.o obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o -obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o +obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o
arch/arm/mach-omap2/clkt34xx_dpll3m2.c deleted +0 -119
119 lines not on this page · raw message
arch/arm/mach-omap2/sram.c +0 -25
@@ -211,35 +211,10 @@ static inline int omap243x_sram_init(void)#ifdef CONFIG_ARCH_OMAP3 -static u32 (*_omap3_sram_configure_core_dpll)( -u32 m2,u32 unlock_dll,u32 f,u32 inc, -u32 sdrc_rfr_ctrl_0,u32 sdrc_actim_ctrl_a_0, -u32 sdrc_actim_ctrl_b_0,u32 sdrc_mr_0, -u32 sdrc_rfr_ctrl_1,u32 sdrc_actim_ctrl_a_1, -u32 sdrc_actim_ctrl_b_1,u32 sdrc_mr_1); - -u32 omap3_configure_core_dpll (u32 m2,u32 unlock_dll,u32 f,u32 inc, -u32 sdrc_rfr_ctrl_0,u32 sdrc_actim_ctrl_a_0, -u32 sdrc_actim_ctrl_b_0,u32 sdrc_mr_0, -u32 sdrc_rfr_ctrl_1,u32 sdrc_actim_ctrl_a_1, -u32 sdrc_actim_ctrl_b_1,u32 sdrc_mr_1) -{ -BUG_ON (!_omap3_sram_configure_core_dpll); -return _omap3_sram_configure_core_dpll ( - m2, unlock_dll, f, inc, - sdrc_rfr_ctrl_0, sdrc_actim_ctrl_a_0, - sdrc_actim_ctrl_b_0, sdrc_mr_0, - sdrc_rfr_ctrl_1, sdrc_actim_ctrl_a_1, - sdrc_actim_ctrl_b_1, sdrc_mr_1); -} -void omap3_sram_restore_context (void ) {omap_sram_reset (); - _omap3_sram_configure_core_dpll = -omap_sram_push (omap3_sram_configure_core_dpll, - omap3_sram_configure_core_dpll_sz);omap_push_sram_idle (); }
arch/arm/mach-omap2/sram.h +0 -14
@@ -15,12 +15,6 @@ extern void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type);extern u32 omap2_set_prcm (u32 dpll_ctrl_val,u32 sdrc_rfr_val,int bypass); -extern u32 omap3_configure_core_dpll ( -u32 m2,u32 unlock_dll,u32 f,u32 inc, -u32 sdrc_rfr_ctrl_0,u32 sdrc_actim_ctrl_a_0, -u32 sdrc_actim_ctrl_b_0,u32 sdrc_mr_0, -u32 sdrc_rfr_ctrl_1,u32 sdrc_actim_ctrl_a_1, -u32 sdrc_actim_ctrl_b_1,u32 sdrc_mr_1);extern void omap3_sram_restore_context (void );/* Do not use these */
@@ -52,14 +46,6 @@ extern void omap243x_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type);extern unsigned long omap243x_sram_reprogram_sdrc_sz; -extern u32 omap3_sram_configure_core_dpll ( -u32 m2,u32 unlock_dll,u32 f,u32 inc, -u32 sdrc_rfr_ctrl_0,u32 sdrc_actim_ctrl_a_0, -u32 sdrc_actim_ctrl_b_0,u32 sdrc_mr_0, -u32 sdrc_rfr_ctrl_1,u32 sdrc_actim_ctrl_a_1, -u32 sdrc_actim_ctrl_b_1,u32 sdrc_mr_1); -extern unsigned long omap3_sram_configure_core_dpll_sz; -#ifdef CONFIG_PM extern void omap_push_sram_idle (void );#else
arch/arm/mach-omap2/sram34xx.S deleted +0 -346
346 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP3: clock: remove un-used core dpll re-program code
Quoted 9 lines · Tero Kristo
Remove the OMAP3 core DPLL re-program code, and the associated SRAM code that does the low-level programming of the DPLL divider, idling of the SDRAM etc.
This code was never fully implemented in the kernel; things missing were driver side handling of core clock changes (they need to account for their functional clock rate being changed on-the-fly), and the whole framework required for handling this. Thus, there is not much point to keep carrying the low-level support code either.
OK I'm applying this into omap-for-v4.3/soc. If we ever need the code it will be in the git history.
Regards,
Tony
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP3: clock: remove un-used core dpll re-program code
Quoted 5 lines · Tony Lindgren
Quoted 4 lines · Tero Kristo
Remove the OMAP3 core DPLL re-program code, and the associated SRAM code that does the low-level programming of the DPLL divider, idling of the SDRAM etc.
Quoted 8 lines
Quoted 5 lines
This code was never fully implemented in the kernel; things missing were driver side handling of core clock changes (they need to account for their functional clock rate being changed on-the-fly), and the whole framework required for handling this. Thus, there is not much point to keep carrying the low-level support code either.
OK I'm applying this into omap-for-v4.3/soc. If we ever need the code it will be in the git history.
Actually I'll wait on this one and apply it later on as it currently adds merge conflicts into Linux next.
Regards,
Tony
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP3: clock: remove un-used core dpll re-program code
Quoted 12 lines · Tony Lindgren
Quoted 11 lines · Tony Lindgren
Quoted 9 lines · Tero Kristo
Remove the OMAP3 core DPLL re-program code, and the associated SRAM code that does the low-level programming of the DPLL divider, idling of the SDRAM etc.
This code was never fully implemented in the kernel; things missing were driver side handling of core clock changes (they need to account for their functional clock rate being changed on-the-fly), and the whole framework required for handling this. Thus, there is not much point to keep carrying the low-level support code either.
Quoted 5 lines
Quoted 2 lines
OK I'm applying this into omap-for-v4.3/soc. If we ever need the code it will be in the git history.
Actually I'll wait on this one and apply it later on as it currently adds merge conflicts into Linux next.
Looks like this needs to be updated to apply on v4.3-rc4, can you please repost?
Using v4.3-rc4 as the base for v4.4 because it contains most of the mmc fixes.
Regards,
Tony
PATCH 1/1 ARM: OMAP3: clock: remove un-used core dpll re-program code
Quoted 13 lines · Tony Lindgren
Quoted 12 lines · Tony Lindgren
Quoted 11 lines · Tony Lindgren
Quoted 9 lines · Tero Kristo
Remove the OMAP3 core DPLL re-program code, and the associated SRAM code that does the low-level programming of the DPLL divider, idling of the SDRAM etc.
This code was never fully implemented in the kernel; things missing were driver side handling of core clock changes (they need to account for their functional clock rate being changed on-the-fly), and the whole framework required for handling this. Thus, there is not much point to keep carrying the low-level support code either.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
OK I'm applying this into omap-for-v4.3/soc. If we ever need the code it will be in the git history.
Actually I'll wait on this one and apply it later on as it currently adds merge conflicts into Linux next.
Looks like this needs to be updated to apply on v4.3-rc4, can you please repost?
Ok, just posted it.
-Tero
Quoted 8 lines
Using v4.3-rc4 as the base for v4.4 because it contains most of the mmc fixes.
Regards,
Tony