Commit 00a5d41e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e1d3cd94

arch/arm/mach-omap2/pm.h

+0 −3
Original line number Diff line number Diff line
@@ -110,14 +110,11 @@ extern u16 pm44xx_errata; 


#ifdef CONFIG_POWER_AVS_OMAP

extern int omap_devinit_smartreflex(void);

extern void omap_enable_smartreflex_on_init(void);

#else

static inline int omap_devinit_smartreflex(void)

{

	return -EINVAL;

}



static inline void omap_enable_smartreflex_on_init(void) {}

#endif



#ifdef CONFIG_TWL4030_CORE

arch/arm/mach-omap2/sr_device.c

+0 −13
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include "control.h"

#include "pm.h"



static bool sr_enable_on_init;



/* Read EFUSE values from control registers for OMAP3430 */

static void __init sr_set_nvalues(struct omap_volt_data *volt_data,

				struct omap_sr_data *sr_data)
@@ -144,8 +142,6 @@ static int __init sr_init_by_name(const char *name, const char *voltdm) 


	sr_set_nvalues(volt_data, sr_data);



	sr_data->enable_on_init = sr_enable_on_init;



exit:

	i++;
@@ -173,15 +169,6 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) 
}

#endif



/*

 * API to be called from board files to enable smartreflex

 * autocompensation at init.

 */

void __init omap_enable_smartreflex_on_init(void)

{

	sr_enable_on_init = true;

}



static const char * const omap4_sr_instances[] = {

	"mpu",

	"iva",

drivers/soc/ti/smartreflex.c

+0 −4
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ static void sr_stop_vddautocomp(struct omap_sr *sr) 
 */

static int sr_late_init(struct omap_sr *sr_info)

{

	struct omap_sr_data *pdata = sr_info->pdev->dev.platform_data;

	int ret = 0;



	if (sr_class->notify && sr_class->notify_flags && sr_info->irq) {
@@ -209,9 +208,6 @@ static int sr_late_init(struct omap_sr *sr_info) 
		disable_irq(sr_info->irq);

	}



	if (pdata && pdata->enable_on_init)

		sr_start_vddautocomp(sr_info);



	return ret;



error:

include/linux/power/smartreflex.h

+0 −3
Original line number Diff line number Diff line
@@ -273,8 +273,6 @@ struct omap_sr_nvalue_table { 
 * @senn_avgweight	SENNAVGWEIGHT value of the sr AVGWEIGHT register

 * @senp_avgweight	SENPAVGWEIGHT value of the sr AVGWEIGHT register

 * @nvalue_count:	Number of distinct nvalues in the nvalue table

 * @enable_on_init:	whether this sr module needs to enabled at

 *			boot up or not.

 * @nvalue_table:	table containing the  efuse offsets and nvalues

 *			corresponding to them.

 * @voltdm:		Pointer to the voltage domain associated with the SR
@@ -290,7 +288,6 @@ struct omap_sr_data { 
	u32				senn_avgweight;

	u32				senp_avgweight;

	int				nvalue_count;

	bool				enable_on_init;

	struct omap_sr_nvalue_table	*nvalue_table;

	struct voltagedomain		*voltdm;

};