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

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

ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains 



These new structs will hold the sleep voltage levels (omap_vc_params)
and voltage processor min / max voltages (omap_vp_params.) Previously
these were part of the PMIC struct, but they do not really belong there,
as they are OMAP chip specific, not PMIC specific parameters. voltdm
code is also changed to use the new structs.

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

arch/arm/mach-omap2/omap_twl.c

+0 −20
Original line number Diff line number Diff line
@@ -141,10 +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,

	.on_volt		= 1200000,

	.onlp_volt		= 1000000,

	.ret_volt		= 975000,

	.off_volt		= 600000,

	.volt_setup_time	= 0xfff,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,
@@ -162,10 +158,6 @@ static struct omap_voltdm_pmic omap3_mpu_pmic = { 
static struct omap_voltdm_pmic omap3_core_pmic = {

	.slew_rate		= 4000,

	.step_size		= 12500,

	.on_volt                = 1200000,

	.onlp_volt              = 1000000,

	.ret_volt               = 975000,

	.off_volt               = 600000,

	.volt_setup_time        = 0xfff,

	.vp_erroroffset		= OMAP3_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP3_VP_VSTEPMIN_VSTEPMIN,
@@ -183,10 +175,6 @@ static struct omap_voltdm_pmic omap3_core_pmic = { 
static struct omap_voltdm_pmic omap4_mpu_pmic = {

	.slew_rate		= 4000,

	.step_size		= 12660,

	.on_volt		= 1375000,

	.onlp_volt		= 1375000,

	.ret_volt		= 830000,

	.off_volt		= 0,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,
@@ -205,10 +193,6 @@ static struct omap_voltdm_pmic omap4_mpu_pmic = { 
static struct omap_voltdm_pmic omap4_iva_pmic = {

	.slew_rate		= 4000,

	.step_size		= 12660,

	.on_volt		= 1188000,

	.onlp_volt		= 1188000,

	.ret_volt		= 830000,

	.off_volt		= 0,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,
@@ -227,10 +211,6 @@ static struct omap_voltdm_pmic omap4_iva_pmic = { 
static struct omap_voltdm_pmic omap4_core_pmic = {

	.slew_rate		= 4000,

	.step_size		= 12660,

	.on_volt		= 1200000,

	.onlp_volt		= 1200000,

	.ret_volt		= 830000,

	.off_volt		= 0,

	.volt_setup_time	= 0,

	.vp_erroroffset		= OMAP4_VP_CONFIG_ERROROFFSET,

	.vp_vstepmin		= OMAP4_VP_VSTEPMIN_VSTEPMIN,

arch/arm/mach-omap2/vc.c

+31 −4
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm, 
	vc_cmdval |= (*target_vsel << vc->common->cmd_on_shift);

	voltdm->write(vc_cmdval, vc->cmdval_reg);



	voltdm->vc_param->on = target_volt;



	omap_vp_update_errorgain(voltdm, target_volt);



	return 0;
@@ -284,6 +286,30 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm) 
	initialized = true;

}



/**

 * omap_vc_calc_vsel - calculate vsel value for a channel

 * @voltdm: channel to calculate value for

 * @uvolt: microvolt value to convert to vsel

 *

 * Converts a microvolt value to vsel value for the used PMIC.

 * This checks whether the microvolt value is out of bounds, and

 * adjusts the value accordingly. If unsupported value detected,

 * warning is thrown.

 */

static u8 omap_vc_calc_vsel(struct voltagedomain *voltdm, u32 uvolt)

{

	if (voltdm->pmic->vddmin > uvolt)

		uvolt = voltdm->pmic->vddmin;

	if (voltdm->pmic->vddmax < uvolt) {

		WARN(1, "%s: voltage not supported by pmic: %u vs max %u\n",

			__func__, uvolt, voltdm->pmic->vddmax);

		/* Lets try maximum value anyway */

		uvolt = voltdm->pmic->vddmax;

	}



	return voltdm->pmic->uv_to_vsel(uvolt);

}



void __init omap_vc_init_channel(struct voltagedomain *voltdm)

{

	struct omap_vc_channel *vc = voltdm->vc;
@@ -335,10 +361,11 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) 
	}



	/* Set up the on, inactive, retention and off voltage */

	on_vsel = voltdm->pmic->uv_to_vsel(voltdm->pmic->on_volt);

	onlp_vsel = voltdm->pmic->uv_to_vsel(voltdm->pmic->onlp_volt);

	ret_vsel = voltdm->pmic->uv_to_vsel(voltdm->pmic->ret_volt);

	off_vsel = voltdm->pmic->uv_to_vsel(voltdm->pmic->off_volt);

	on_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->on);

	onlp_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->onlp);

	ret_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->ret);

	off_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->off);



	val = ((on_vsel << vc->common->cmd_on_shift) |

	       (onlp_vsel << vc->common->cmd_onlp_shift) |

	       (ret_vsel << vc->common->cmd_ret_shift) |

arch/arm/mach-omap2/vc.h

+7 −0
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ extern struct omap_vc_channel omap4_vc_mpu; 
extern struct omap_vc_channel omap4_vc_iva;

extern struct omap_vc_channel omap4_vc_core;



extern struct omap_vc_param omap3_mpu_vc_data;

extern struct omap_vc_param omap3_core_vc_data;



extern struct omap_vc_param omap4_mpu_vc_data;

extern struct omap_vc_param omap4_iva_vc_data;

extern struct omap_vc_param omap4_core_vc_data;



void omap_vc_init_channel(struct voltagedomain *voltdm);

int omap_vc_pre_scale(struct voltagedomain *voltdm,

		      unsigned long target_volt,

arch/arm/mach-omap2/vc3xxx_data.c

+22 −0
Original line number Diff line number Diff line
@@ -71,3 +71,25 @@ struct omap_vc_channel omap3_vc_core = { 
	.smps_cmdra_mask = OMAP3430_CMDRA1_MASK,

	.cfg_channel_sa_shift = OMAP3430_PRM_VC_SMPS_SA_SA1_SHIFT,

};



/*

 * Voltage levels for different operating modes: on, sleep, retention and off

 */

#define OMAP3_ON_VOLTAGE_UV		1200000

#define OMAP3_ONLP_VOLTAGE_UV		1000000

#define OMAP3_RET_VOLTAGE_UV		975000

#define OMAP3_OFF_VOLTAGE_UV		600000



struct omap_vc_param omap3_mpu_vc_data = {

	.on		= OMAP3_ON_VOLTAGE_UV,

	.onlp		= OMAP3_ONLP_VOLTAGE_UV,

	.ret		= OMAP3_RET_VOLTAGE_UV,

	.off		= OMAP3_OFF_VOLTAGE_UV,

};



struct omap_vc_param omap3_core_vc_data = {

	.on		= OMAP3_ON_VOLTAGE_UV,

	.onlp		= OMAP3_ONLP_VOLTAGE_UV,

	.ret		= OMAP3_RET_VOLTAGE_UV,

	.off		= OMAP3_OFF_VOLTAGE_UV,

};

arch/arm/mach-omap2/vc44xx_data.c

+28 −0
Original line number Diff line number Diff line
@@ -87,3 +87,31 @@ struct omap_vc_channel omap4_vc_core = { 
	.cfg_channel_sa_shift = OMAP4430_SA_VDD_CORE_L_SHIFT,

};



/*

 * Voltage levels for different operating modes: on, sleep, retention and off

 */

#define OMAP4_ON_VOLTAGE_UV			1375000

#define OMAP4_ONLP_VOLTAGE_UV			1375000

#define OMAP4_RET_VOLTAGE_UV			837500

#define OMAP4_OFF_VOLTAGE_UV			0



struct omap_vc_param omap4_mpu_vc_data = {

	.on			= OMAP4_ON_VOLTAGE_UV,

	.onlp			= OMAP4_ONLP_VOLTAGE_UV,

	.ret			= OMAP4_RET_VOLTAGE_UV,

	.off			= OMAP4_OFF_VOLTAGE_UV,

};



struct omap_vc_param omap4_iva_vc_data = {

	.on			= OMAP4_ON_VOLTAGE_UV,

	.onlp			= OMAP4_ONLP_VOLTAGE_UV,

	.ret			= OMAP4_RET_VOLTAGE_UV,

	.off			= OMAP4_OFF_VOLTAGE_UV,

};



struct omap_vc_param omap4_core_vc_data = {

	.on			= OMAP4_ON_VOLTAGE_UV,

	.onlp			= OMAP4_ONLP_VOLTAGE_UV,

	.ret			= OMAP4_RET_VOLTAGE_UV,

	.off			= OMAP4_OFF_VOLTAGE_UV,

};