Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3965191 authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman
Browse files

ARM: OMAP3+: voltage: remove unused volt_setup_time parameter 



This is no longer needed as the ramp times are calculated from
voltage deltas + slew rates.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 5a84dc5b

arch/arm/mach-omap2/omap_twl.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -141,7 +141,6 @@ static u8 twl6030_uv_to_vsel(unsigned long uv) 
static struct omap_voltdm_pmic omap3_mpu_pmic = {

static struct omap_voltdm_pmic omap3_mpu_pmic = {

	.slew_rate		= 4000,

	.slew_rate		= 4000,

	.step_size		= 12500,

	.step_size		= 12500,

	.volt_setup_time	= 0xfff,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmax		= OMAP3_VP_VSTEPMAX_VSTEPMAX,

	.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 = {

static struct omap_voltdm_pmic omap3_core_pmic = {

	.slew_rate		= 4000,

	.slew_rate		= 4000,

	.step_size		= 12500,

	.step_size		= 12500,

	.volt_setup_time        = 0xfff,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmax		= OMAP3_VP_VSTEPMAX_VSTEPMAX,

	.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 = {

static struct omap_voltdm_pmic omap4_mpu_pmic = {

	.slew_rate		= 4000,

	.slew_rate		= 4000,

	.step_size		= 12660,

	.step_size		= 12660,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX,

	.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 = {

static struct omap_voltdm_pmic omap4_iva_pmic = {

	.slew_rate		= 4000,

	.slew_rate		= 4000,

	.step_size		= 12660,

	.step_size		= 12660,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX,

	.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 = {

static struct omap_voltdm_pmic omap4_core_pmic = {

	.slew_rate		= 4000,

	.slew_rate		= 4000,

	.step_size		= 12660,

	.step_size		= 12660,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX,

	.vp_vstepmax		= OMAP4_VP_VSTEPMAX_VSTEPMAX,

arch/arm/mach-omap2/voltage.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ struct voltagedomain { 
struct omap_voltdm_pmic {

struct omap_voltdm_pmic {

	int slew_rate;

	int slew_rate;

	int step_size;

	int step_size;

	u16 volt_setup_time;

	u16 i2c_slave_addr;

	u16 i2c_slave_addr;

	u16 volt_reg_addr;

	u16 volt_reg_addr;

	u16 cmd_reg_addr;

	u16 cmd_reg_addr;