[Acked] [Trusty/Utopic/Vivid][PATCH] mmc: sdhci-pci-o2micro: Fix Dell E5440 issue

[Andy Whitcroft]

On Tue, Dec 09, 2014 at 04:42:55PM +0800, Adam Lee wrote:
> From: Peter Guo <peter.guo at bayhubtech.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1346067
> 
> Fix Dell E5440 when reboot Linux, can't find o2micro sd host chip issue.
> 
> Fixes: 01acf6917aed (mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts)
> Signed-off-by: Peter Guo <peter.guo at bayhubtech.com>
> Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
> (cherry picked from commit 6380ea099cdd46d7377b6fbec0291cf2aa387bad)
> Signed-off-by: Adam Lee <adam.lee at canonical.com>
> ---
>  drivers/mmc/host/sdhci-pci-o2micro.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
> index f49666b..257e9ca 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.c
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
> @@ -88,8 +88,6 @@ void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip)
>  		return;
>  	scratch_32 &= ~((1 << 21) | (1 << 30));
>  
> -	/* Set RTD3 function disabled */
> -	scratch_32 |= ((1 << 29) | (1 << 28));
>  	pci_write_config_dword(chip->pdev, O2_SD_FUNC_REG3, scratch_32);
>  
>  	/* Set L1 Entrance Timer */

Looks to be an upstream cherry-pick, and specific to specific hardware.

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw