diff options
| -rw-r--r-- | arch/arm/mach-omap2/omap_twl.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/voltage.h | 1 | 
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c index 188f21027c9..ecae9890f0f 100644 --- a/arch/arm/mach-omap2/omap_twl.c +++ b/arch/arm/mach-omap2/omap_twl.c @@ -141,7 +141,6 @@ static u8 twl6030_uv_to_vsel(unsigned long uv)  static struct omap_voltdm_pmic omap3_mpu_pmic = {  	.slew_rate		= 4000,  	.step_size		= 12500, -	.volt_setup_time	= 0xfff,  	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,  	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,  	.vp_vstepmax		= OMAP3_VP_VSTEPMAX_VSTEPMAX, @@ -158,7 +157,6 @@ static struct omap_voltdm_pmic omap3_mpu_pmic = {  static struct omap_voltdm_pmic omap3_core_pmic = {  	.slew_rate		= 4000,  	.step_size		= 12500, -	.volt_setup_time        = 0xfff,  	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,  	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,  	.vp_vstepmax		= OMAP3_VP_VSTEPMAX_VSTEPMAX, @@ -175,7 +173,6 @@ static struct omap_voltdm_pmic omap3_core_pmic = {  static struct omap_voltdm_pmic omap4_mpu_pmic = {  	.slew_rate		= 4000,  	.step_size		= 12660, -	.volt_setup_time	= 0,  	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,  	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,  	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX, @@ -193,7 +190,6 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = {  static struct omap_voltdm_pmic omap4_iva_pmic = {  	.slew_rate		= 4000,  	.step_size		= 12660, -	.volt_setup_time	= 0,  	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,  	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,  	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX, @@ -211,7 +207,6 @@ static struct omap_voltdm_pmic omap4_iva_pmic = {  static struct omap_voltdm_pmic omap4_core_pmic = {  	.slew_rate		= 4000,  	.step_size		= 12660, -	.volt_setup_time	= 0,  	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,  	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,  	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX, diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index 990c440d5c5..78923f93efd 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -129,7 +129,6 @@ struct voltagedomain {  struct omap_voltdm_pmic {  	int slew_rate;  	int step_size; -	u16 volt_setup_time;  	u16 i2c_slave_addr;  	u16 volt_reg_addr;  	u16 cmd_reg_addr;  |