|
@@ -455,10 +455,14 @@ void v7_arch_cp15_set_acr(u32 acr, u32 cpu_midr, u32 cpu_rev_comb,
|
|
|
}
|
|
|
|
|
|
#if defined(CONFIG_PALMAS_POWER)
|
|
|
+__weak void board_mmc_poweron_ldo(uint voltage)
|
|
|
+{
|
|
|
+ palmas_mmc1_poweron_ldo(voltage);
|
|
|
+}
|
|
|
+
|
|
|
void vmmc_pbias_config(uint voltage)
|
|
|
{
|
|
|
u32 value = 0;
|
|
|
- struct vcores_data const *vcores = *omap_vcores;
|
|
|
|
|
|
value = readl((*ctrl)->control_pbias);
|
|
|
value &= ~SDCARD_PWRDNZ;
|
|
@@ -467,15 +471,7 @@ void vmmc_pbias_config(uint voltage)
|
|
|
value &= ~SDCARD_BIAS_PWRDNZ;
|
|
|
writel(value, (*ctrl)->control_pbias);
|
|
|
|
|
|
- if (vcores->core.pmic->i2c_slave_addr == 0x60) {
|
|
|
- if (voltage == LDO_VOLT_3V0)
|
|
|
- voltage = 0x19;
|
|
|
- else if (voltage == LDO_VOLT_1V8)
|
|
|
- voltage = 0xa;
|
|
|
- lp873x_mmc1_poweron_ldo(voltage);
|
|
|
- } else {
|
|
|
- palmas_mmc1_poweron_ldo(voltage);
|
|
|
- }
|
|
|
+ board_mmc_poweron_ldo(voltage);
|
|
|
|
|
|
value = readl((*ctrl)->control_pbias);
|
|
|
value |= SDCARD_BIAS_PWRDNZ;
|