mmc: tegra: Enable tegra_sdhci_get_ro for t114
Naveen Kumar Arepalli [Wed, 22 May 2013 06:34:17 +0000 (11:34 +0530)]
Enable tegra_sdhci_get_ro for t114, because we are using
wp gpio for sdmmc

Bug 1288218

Change-Id: I1e0922da98071cd1ec4d03e35c550c472ac60621
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/231443
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>

drivers/mmc/host/sdhci-tegra.c

index 9c0066f..98cea16 100644 (file)
@@ -378,7 +378,6 @@ static const struct file_operations sdhci_host_dfs_fops = {
 
 static u32 tegra_sdhci_readl(struct sdhci_host *host, int reg)
 {
-#ifndef CONFIG_ARCH_TEGRA_11x_SOC
        u32 val;
 
        if (unlikely(reg == SDHCI_PRESENT_STATE)) {
@@ -386,7 +385,6 @@ static u32 tegra_sdhci_readl(struct sdhci_host *host, int reg)
                val = readl(host->ioaddr + reg);
                return val | SDHCI_WRITE_PROTECT;
        }
-#endif
        return readl(host->ioaddr + reg);
 }
 
@@ -649,7 +647,6 @@ static unsigned int tegra_sdhci_get_cd(struct sdhci_host *sdhci)
        return tegra_host->card_present;
 }
 
-#ifndef CONFIG_ARCH_TEGRA_11x_SOC
 static unsigned int tegra_sdhci_get_ro(struct sdhci_host *sdhci)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(sdhci);
@@ -661,7 +658,6 @@ static unsigned int tegra_sdhci_get_ro(struct sdhci_host *sdhci)
 
        return gpio_get_value(plat->wp_gpio);
 }
-#endif
 
 static int tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
                unsigned int uhs)
@@ -2240,9 +2236,7 @@ err_root:
 }
 
 static struct sdhci_ops tegra_sdhci_ops = {
-#ifndef CONFIG_ARCH_TEGRA_11x_SOC
        .get_ro     = tegra_sdhci_get_ro,
-#endif
        .get_cd     = tegra_sdhci_get_cd,
        .read_l     = tegra_sdhci_readl,
        .read_w     = tegra_sdhci_readw,