mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +00:00
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>
This commit is contained in:
parent
e1d3cd9451
commit
00a5d41ee1
@ -110,14 +110,11 @@ extern u16 pm44xx_errata;
|
|||||||
|
|
||||||
#ifdef CONFIG_POWER_AVS_OMAP
|
#ifdef CONFIG_POWER_AVS_OMAP
|
||||||
extern int omap_devinit_smartreflex(void);
|
extern int omap_devinit_smartreflex(void);
|
||||||
extern void omap_enable_smartreflex_on_init(void);
|
|
||||||
#else
|
#else
|
||||||
static inline int omap_devinit_smartreflex(void)
|
static inline int omap_devinit_smartreflex(void)
|
||||||
{
|
{
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void omap_enable_smartreflex_on_init(void) {}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_TWL4030_CORE
|
#ifdef CONFIG_TWL4030_CORE
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
#include "control.h"
|
#include "control.h"
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
|
|
||||||
static bool sr_enable_on_init;
|
|
||||||
|
|
||||||
/* Read EFUSE values from control registers for OMAP3430 */
|
/* Read EFUSE values from control registers for OMAP3430 */
|
||||||
static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
|
static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
|
||||||
struct omap_sr_data *sr_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_set_nvalues(volt_data, sr_data);
|
||||||
|
|
||||||
sr_data->enable_on_init = sr_enable_on_init;
|
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
@ -173,15 +169,6 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
|
|||||||
}
|
}
|
||||||
#endif
|
#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[] = {
|
static const char * const omap4_sr_instances[] = {
|
||||||
"mpu",
|
"mpu",
|
||||||
"iva",
|
"iva",
|
||||||
|
@ -198,7 +198,6 @@ static void sr_stop_vddautocomp(struct omap_sr *sr)
|
|||||||
*/
|
*/
|
||||||
static int sr_late_init(struct omap_sr *sr_info)
|
static int sr_late_init(struct omap_sr *sr_info)
|
||||||
{
|
{
|
||||||
struct omap_sr_data *pdata = sr_info->pdev->dev.platform_data;
|
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (sr_class->notify && sr_class->notify_flags && sr_info->irq) {
|
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);
|
disable_irq(sr_info->irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pdata && pdata->enable_on_init)
|
|
||||||
sr_start_vddautocomp(sr_info);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
@ -273,8 +273,6 @@ struct omap_sr_nvalue_table {
|
|||||||
* @senn_avgweight SENNAVGWEIGHT value of the sr AVGWEIGHT register
|
* @senn_avgweight SENNAVGWEIGHT value of the sr AVGWEIGHT register
|
||||||
* @senp_avgweight SENPAVGWEIGHT 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
|
* @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
|
* @nvalue_table: table containing the efuse offsets and nvalues
|
||||||
* corresponding to them.
|
* corresponding to them.
|
||||||
* @voltdm: Pointer to the voltage domain associated with the SR
|
* @voltdm: Pointer to the voltage domain associated with the SR
|
||||||
@ -290,7 +288,6 @@ struct omap_sr_data {
|
|||||||
u32 senn_avgweight;
|
u32 senn_avgweight;
|
||||||
u32 senp_avgweight;
|
u32 senp_avgweight;
|
||||||
int nvalue_count;
|
int nvalue_count;
|
||||||
bool enable_on_init;
|
|
||||||
struct omap_sr_nvalue_table *nvalue_table;
|
struct omap_sr_nvalue_table *nvalue_table;
|
||||||
struct voltagedomain *voltdm;
|
struct voltagedomain *voltdm;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user