mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-09 04:36:16 +09:00
ARM: OMAP5+: vcores: Drop unnecessary #ifndefs
gpio_en field is introduced to detect if pmic is controlled by GPIO. Make this field 0 on all TPS659* pmics available on DRA7/OMAP5 based platforms and remove the #ifndefs. Reviewed-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
4ba58bdabd
commit
5328717cde
|
@ -443,15 +443,12 @@ void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic)
|
||||||
{
|
{
|
||||||
u32 offset_code;
|
u32 offset_code;
|
||||||
u32 offset = volt_mv;
|
u32 offset = volt_mv;
|
||||||
#ifndef CONFIG_DRA7XX
|
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!volt_mv)
|
if (!volt_mv)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pmic->pmic_bus_init();
|
pmic->pmic_bus_init();
|
||||||
#ifndef CONFIG_DRA7XX
|
|
||||||
/* See if we can first get the GPIO if needed */
|
/* See if we can first get the GPIO if needed */
|
||||||
if (pmic->gpio_en)
|
if (pmic->gpio_en)
|
||||||
ret = gpio_request(pmic->gpio, "PMIC_GPIO");
|
ret = gpio_request(pmic->gpio, "PMIC_GPIO");
|
||||||
|
@ -465,7 +462,7 @@ void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic)
|
||||||
/* Pull the GPIO low to select SET0 register, while we program SET1 */
|
/* Pull the GPIO low to select SET0 register, while we program SET1 */
|
||||||
if (pmic->gpio_en)
|
if (pmic->gpio_en)
|
||||||
gpio_direction_output(pmic->gpio, 0);
|
gpio_direction_output(pmic->gpio, 0);
|
||||||
#endif
|
|
||||||
/* convert to uV for better accuracy in the calculations */
|
/* convert to uV for better accuracy in the calculations */
|
||||||
offset *= 1000;
|
offset *= 1000;
|
||||||
|
|
||||||
|
@ -476,10 +473,8 @@ void do_scale_vcore(u32 vcore_reg, u32 volt_mv, struct pmic_data *pmic)
|
||||||
|
|
||||||
if (pmic->pmic_write(pmic->i2c_slave_addr, vcore_reg, offset_code))
|
if (pmic->pmic_write(pmic->i2c_slave_addr, vcore_reg, offset_code))
|
||||||
printf("Scaling voltage failed for 0x%x\n", vcore_reg);
|
printf("Scaling voltage failed for 0x%x\n", vcore_reg);
|
||||||
#ifndef CONFIG_DRA7XX
|
|
||||||
if (pmic->gpio_en)
|
if (pmic->gpio_en)
|
||||||
gpio_direction_output(pmic->gpio, 1);
|
gpio_direction_output(pmic->gpio, 1);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 optimize_vcore_voltage(struct volts const *v)
|
static u32 optimize_vcore_voltage(struct volts const *v)
|
||||||
|
|
|
@ -318,6 +318,7 @@ struct pmic_data palmas = {
|
||||||
.i2c_slave_addr = SMPS_I2C_SLAVE_ADDR,
|
.i2c_slave_addr = SMPS_I2C_SLAVE_ADDR,
|
||||||
.pmic_bus_init = sri2c_init,
|
.pmic_bus_init = sri2c_init,
|
||||||
.pmic_write = omap_vc_bypass_send_value,
|
.pmic_write = omap_vc_bypass_send_value,
|
||||||
|
.gpio_en = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The TPS659038 and TPS65917 are software-compatible, use common struct */
|
/* The TPS659038 and TPS65917 are software-compatible, use common struct */
|
||||||
|
@ -332,6 +333,7 @@ struct pmic_data tps659038 = {
|
||||||
.i2c_slave_addr = TPS659038_I2C_SLAVE_ADDR,
|
.i2c_slave_addr = TPS659038_I2C_SLAVE_ADDR,
|
||||||
.pmic_bus_init = gpi2c_init,
|
.pmic_bus_init = gpi2c_init,
|
||||||
.pmic_write = palmas_i2c_write_u8,
|
.pmic_write = palmas_i2c_write_u8,
|
||||||
|
.gpio_en = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct vcores_data omap5430_volts = {
|
struct vcores_data omap5430_volts = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user