mmc: tegra: Consider zero trim value as valid

Trim value of 0 is also valid and needs to be set explicitly as the
default trim value after reset could be non-zero in some cases.

Bug 1156152

Reviewed-on: http://git-master/r/225170
(cherry picked from commit 68348589552f26e8d217ab2bd9bd87ceef279844)
Change-Id: I19148189082368a2bb21450478bcfc566c2e43ca
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/226687
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index cd0697e7e06ea9230775ba8d3a5626411e78b125..a851fbb18e4b2462a1f6acd240aa7c1c20ac4cda 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -542,12 +542,10 @@ static void tegra_sdhci_reset_exit(struct sdhci_host *host, u8 mask)
                }
        }
        if (soc_data->nvquirks & NVQUIRK_SET_TRIM_DELAY) {
-               if (plat->trim_delay) {
-                       vendor_ctrl &= ~(0x1F <<
-                       SDHCI_VNDR_CLK_CTRL_TRIM_VALUE_SHIFT);
-                       vendor_ctrl |= (plat->trim_delay <<
-                       SDHCI_VNDR_CLK_CTRL_TRIM_VALUE_SHIFT);
-               }
+               vendor_ctrl &= ~(0x1F <<
+               SDHCI_VNDR_CLK_CTRL_TRIM_VALUE_SHIFT);
+               vendor_ctrl |= (plat->trim_delay <<
+               SDHCI_VNDR_CLK_CTRL_TRIM_VALUE_SHIFT);
        }
        if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR50_TUNING)
                vendor_ctrl |= SDHCI_VNDR_CLK_CTRL_SDR50_TUNING;