Commit e74e4405 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP2+: VC: support PMICs with separate voltage and command registers 



The VC layer can support PMICs with separate voltage and command
registers by putting the different registers in the PRM_VC_SMPS_VOL_RA
and PRCM_VC_SMPS_CMD_RA registers respectively.

The PMIC data must supply at least a voltage register address
(volt_reg_addr).  The command register address (cmd_reg_addr) is
optional.  If the PMIC data does not supply a separate command
register address, the VC will use the voltage register address for both.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 01f48d30

arch/arm/mach-omap2/omap_twl.c

+5 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static struct omap_volt_pmic_info omap3_mpu_volt_info = { 
	.vp_vddmax		= OMAP3430_VP1_VLIMITTO_VDDMAX,

	.vp_timeout_us		= OMAP3_VP_VLIMITTO_TIMEOUT_US,

	.i2c_slave_addr		= OMAP3_SRI2C_SLAVE_ADDR,

	.pmic_reg		= OMAP3_VDD_MPU_SR_CONTROL_REG,

	.volt_reg_addr		= OMAP3_VDD_MPU_SR_CONTROL_REG,

	.vsel_to_uv		= twl4030_vsel_to_uv,

	.uv_to_vsel		= twl4030_uv_to_vsel,

};
@@ -178,7 +178,7 @@ static struct omap_volt_pmic_info omap3_core_volt_info = { 
	.vp_vddmax		= OMAP3430_VP2_VLIMITTO_VDDMAX,

	.vp_timeout_us		= OMAP3_VP_VLIMITTO_TIMEOUT_US,

	.i2c_slave_addr		= OMAP3_SRI2C_SLAVE_ADDR,

	.pmic_reg		= OMAP3_VDD_CORE_SR_CONTROL_REG,

	.volt_reg_addr		= OMAP3_VDD_CORE_SR_CONTROL_REG,

	.vsel_to_uv		= twl4030_vsel_to_uv,

	.uv_to_vsel		= twl4030_uv_to_vsel,

};
@@ -198,7 +198,7 @@ static struct omap_volt_pmic_info omap4_mpu_volt_info = { 
	.vp_vddmax		= OMAP4_VP_MPU_VLIMITTO_VDDMAX,

	.vp_timeout_us		= OMAP4_VP_VLIMITTO_TIMEOUT_US,

	.i2c_slave_addr		= OMAP4_SRI2C_SLAVE_ADDR,

	.pmic_reg		= OMAP4_VDD_MPU_SR_VOLT_REG,

	.volt_reg_addr		= OMAP4_VDD_MPU_SR_VOLT_REG,

	.vsel_to_uv		= twl6030_vsel_to_uv,

	.uv_to_vsel		= twl6030_uv_to_vsel,

};
@@ -218,7 +218,7 @@ static struct omap_volt_pmic_info omap4_iva_volt_info = { 
	.vp_vddmax		= OMAP4_VP_IVA_VLIMITTO_VDDMAX,

	.vp_timeout_us		= OMAP4_VP_VLIMITTO_TIMEOUT_US,

	.i2c_slave_addr		= OMAP4_SRI2C_SLAVE_ADDR,

	.pmic_reg		= OMAP4_VDD_IVA_SR_VOLT_REG,

	.volt_reg_addr		= OMAP4_VDD_IVA_SR_VOLT_REG,

	.vsel_to_uv		= twl6030_vsel_to_uv,

	.uv_to_vsel		= twl6030_uv_to_vsel,

};
@@ -238,7 +238,7 @@ static struct omap_volt_pmic_info omap4_core_volt_info = { 
	.vp_vddmax		= OMAP4_VP_CORE_VLIMITTO_VDDMAX,

	.vp_timeout_us		= OMAP4_VP_VLIMITTO_TIMEOUT_US,

	.i2c_slave_addr		= OMAP4_SRI2C_SLAVE_ADDR,

	.pmic_reg		= OMAP4_VDD_CORE_SR_VOLT_REG,

	.volt_reg_addr		= OMAP4_VDD_CORE_SR_VOLT_REG,

	.vsel_to_uv		= twl6030_vsel_to_uv,

	.uv_to_vsel		= twl6030_uv_to_vsel,

};

arch/arm/mach-omap2/vc.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm, 
	vc_valid = vc->common->valid;

	vc_bypass_val_reg = vc->common->bypass_val_reg;

	vc_bypass_value = (target_vsel << vc->common->data_shift) |

			(vdd->pmic_info->pmic_reg <<

			(vdd->pmic_info->volt_reg_addr <<

			vc->common->regaddr_shift) |

			(vdd->pmic_info->i2c_slave_addr <<

			vc->common->slaveaddr_shift);
@@ -264,7 +264,7 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) 
	vc_val = vdd->read_reg(vc->common->prm_mod,

			       vc->common->smps_volra_reg);

	vc_val &= ~vc->smps_volra_mask;

	vc_val |= vdd->pmic_info->pmic_reg << vc->smps_volra_shift;

	vc_val |= vdd->pmic_info->volt_reg_addr << vc->smps_volra_shift;

	vdd->write_reg(vc_val, vc->common->prm_mod,

		       vc->common->smps_volra_reg);

arch/arm/mach-omap2/voltage.h

+4 −1
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ struct omap_volt_data { 
 * @step_size:	PMIC voltage step size (in uv)

 * @vsel_to_uv:	PMIC API to convert vsel value to actual voltage in uV.

 * @uv_to_vsel:	PMIC API to convert voltage in uV to vsel value.

 * @volt_reg_addr: voltage configuration register address

 * @cmd_reg_addr: command (on, on-LP, ret, off) configuration register address

 */

struct omap_volt_pmic_info {

	int slew_rate;
@@ -112,7 +114,8 @@ struct omap_volt_pmic_info { 
	u8 vp_vddmax;

	u8 vp_timeout_us;

	u8 i2c_slave_addr;

	u8 pmic_reg;

	u8 volt_reg_addr;

	u8 cmd_reg_addr;

	unsigned long (*vsel_to_uv) (const u8 vsel);

	u8 (*uv_to_vsel) (unsigned long uV);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE