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

Commit 3696d303 authored by Bryan Buckley's avatar Bryan Buckley Committed by Tony Lindgren
Browse files

ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1 



Remove OMAP4_USBC1_ICUSB_PWRDNZ_MASK during enable/disable PWRDNZ mode for
MMC1_PBIAS and associated extended-drain MMC1 I/O cell. This is in accordance
with the control module programming guide. This fixes a bug where if trying to
use gpio_98 or gpio_99 and MMC1 at the same time the GPIO signal will be
affected by a changing SDMMC1_VDDS.

Software must keep MMC1_PBIAS cell and MMC1_IO cell PWRDNZ signals low whenever
SDMMC1_VDDS ramps up/down or changes for cell protection purposes.

MMC1 is based on SDMMC1_VDDS whereas USBC1 is based on SIM_VDDS therefore
they can operate independently.

Signed-off-by: default avatarBryan Buckley <bryan.buckley@ti.com>
Acked-by: default avatarKishore Kadiyala <kishore.kadiyala@ti.com>
Tested-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a102a9ec

arch/arm/mach-omap2/hsmmc.c

+4 −8
Original line number Diff line number Diff line
@@ -137,8 +137,7 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot, 
	 */

	reg = omap4_ctrl_pad_readl(control_pbias_offset);

	reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

		OMAP4_MMC1_PWRDNZ_MASK |

		OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

		OMAP4_MMC1_PWRDNZ_MASK);

	omap4_ctrl_pad_writel(reg, control_pbias_offset);

}
@@ -156,8 +155,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, 
		else

			reg |= OMAP4_MMC1_PBIASLITE_VMODE_MASK;

		reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

			OMAP4_MMC1_PWRDNZ_MASK |

			OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			OMAP4_MMC1_PWRDNZ_MASK);

		omap4_ctrl_pad_writel(reg, control_pbias_offset);



		timeout = jiffies + msecs_to_jiffies(5);
@@ -171,16 +169,14 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot, 
		if (reg & OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK) {

			pr_err("Pbias Voltage is not same as LDO\n");

			/* Caution : On VMODE_ERROR Power Down MMC IO */

			reg &= ~(OMAP4_MMC1_PWRDNZ_MASK |

				OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);

			omap4_ctrl_pad_writel(reg, control_pbias_offset);

		}

	} else {

		reg = omap4_ctrl_pad_readl(control_pbias_offset);

		reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |

			OMAP4_MMC1_PWRDNZ_MASK |

			OMAP4_MMC1_PBIASLITE_VMODE_MASK |

			OMAP4_USBC1_ICUSB_PWRDNZ_MASK);

			OMAP4_MMC1_PBIASLITE_VMODE_MASK);

		omap4_ctrl_pad_writel(reg, control_pbias_offset);

	}

}