Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: omap2: smartreflex: remove on_init control

Nothing calls omap_enable_smartreflex_on_init() any more, so it
does not need to be tracked either.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

-23
-3
arch/arm/mach-omap2/pm.h
··· 110 110 111 111 #ifdef CONFIG_POWER_AVS_OMAP 112 112 extern int omap_devinit_smartreflex(void); 113 - extern void omap_enable_smartreflex_on_init(void); 114 113 #else 115 114 static inline int omap_devinit_smartreflex(void) 116 115 { 117 116 return -EINVAL; 118 117 } 119 - 120 - static inline void omap_enable_smartreflex_on_init(void) {} 121 118 #endif 122 119 123 120 #ifdef CONFIG_TWL4030_CORE
-13
arch/arm/mach-omap2/sr_device.c
··· 26 26 #include "control.h" 27 27 #include "pm.h" 28 28 29 - static bool sr_enable_on_init; 30 - 31 29 /* Read EFUSE values from control registers for OMAP3430 */ 32 30 static void __init sr_set_nvalues(struct omap_volt_data *volt_data, 33 31 struct omap_sr_data *sr_data) ··· 142 144 143 145 sr_set_nvalues(volt_data, sr_data); 144 146 145 - sr_data->enable_on_init = sr_enable_on_init; 146 - 147 147 exit: 148 148 i++; 149 149 ··· 168 172 return -EINVAL; 169 173 } 170 174 #endif 171 - 172 - /* 173 - * API to be called from board files to enable smartreflex 174 - * autocompensation at init. 175 - */ 176 - void __init omap_enable_smartreflex_on_init(void) 177 - { 178 - sr_enable_on_init = true; 179 - } 180 175 181 176 static const char * const omap4_sr_instances[] = { 182 177 "mpu",
-4
drivers/soc/ti/smartreflex.c
··· 198 198 */ 199 199 static int sr_late_init(struct omap_sr *sr_info) 200 200 { 201 - struct omap_sr_data *pdata = sr_info->pdev->dev.platform_data; 202 201 int ret = 0; 203 202 204 203 if (sr_class->notify && sr_class->notify_flags && sr_info->irq) { ··· 207 208 goto error; 208 209 disable_irq(sr_info->irq); 209 210 } 210 - 211 - if (pdata && pdata->enable_on_init) 212 - sr_start_vddautocomp(sr_info); 213 211 214 212 return ret; 215 213
-3
include/linux/power/smartreflex.h
··· 273 273 * @senn_avgweight SENNAVGWEIGHT value of the sr AVGWEIGHT register 274 274 * @senp_avgweight SENPAVGWEIGHT value of the sr AVGWEIGHT register 275 275 * @nvalue_count: Number of distinct nvalues in the nvalue table 276 - * @enable_on_init: whether this sr module needs to enabled at 277 - * boot up or not. 278 276 * @nvalue_table: table containing the efuse offsets and nvalues 279 277 * corresponding to them. 280 278 * @voltdm: Pointer to the voltage domain associated with the SR ··· 288 290 u32 senn_avgweight; 289 291 u32 senp_avgweight; 290 292 int nvalue_count; 291 - bool enable_on_init; 292 293 struct omap_sr_nvalue_table *nvalue_table; 293 294 struct voltagedomain *voltdm; 294 295 };