From 49a9ee9b574052f862e97f14b3a2ffa81d29c39d Mon Sep 17 00:00:00 2001 From: Jeetesh Burman Date: Thu, 18 Jun 2015 11:20:50 +0530 Subject: [PATCH] Revert "mmc: tegra: disable card clk before setting tap" This reverts commit f9b36d3b89f76cc48678eeb7a27cb980e89901d0. Signed-off-by: Jeetesh Burman Change-Id: Ie862afeda5e7e5b360775248fbbc49a031528a0b Reviewed-on: http://git-master/r/759476 GVS: Gerrit_Virtual_Submit Reviewed-by: Winnie Hsu --- drivers/mmc/host/sdhci-tegra.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 30a44e83215..c119e2e043e 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -1747,7 +1747,6 @@ static void sdhci_tegra_set_tap_delay(struct sdhci_host *sdhci, unsigned int tap_delay) { u32 vendor_ctrl; - u16 clk; /* Max tap delay value is 255 */ if (tap_delay > MAX_TAP_VALUES) { @@ -1758,20 +1757,11 @@ static void sdhci_tegra_set_tap_delay(struct sdhci_host *sdhci, return; } - clk = sdhci_readw(sdhci, SDHCI_CLOCK_CONTROL); - clk &= ~SDHCI_CLOCK_CARD_EN; - sdhci_writew(sdhci, clk, SDHCI_CLOCK_CONTROL); - vendor_ctrl = sdhci_readl(sdhci, SDHCI_VNDR_CLK_CTRL); vendor_ctrl &= ~(SDHCI_VNDR_CLK_CTRL_TAP_VALUE_MASK << SDHCI_VNDR_CLK_CTRL_TAP_VALUE_SHIFT); vendor_ctrl |= (tap_delay << SDHCI_VNDR_CLK_CTRL_TAP_VALUE_SHIFT); sdhci_writel(sdhci, vendor_ctrl, SDHCI_VNDR_CLK_CTRL); - - clk = sdhci_readw(sdhci, SDHCI_CLOCK_CONTROL); - clk |= SDHCI_CLOCK_CARD_EN; - sdhci_writew(sdhci, clk, SDHCI_CLOCK_CONTROL); - } static void sdhci_tegra_set_trim_delay(struct sdhci_host *sdhci, -- 2.39.2