diff options
| author | Todd Poynor <toddpoynor@google.com> | 2010-10-28 20:26:32 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2010-10-28 20:26:55 -0700 |
| commit | 5ae7dfe2611bf0e4e178307ce812b82fe8a3458b (patch) | |
| tree | 0658c1e93bf7776ed0b03159a589f26fc58c5e62 /drivers/mmc | |
| parent | ca23a8826d16b49e89d463e759c4fd6baafa7e27 (diff) | |
Revert "tegra sdhci: Enable/disable SDCLK source in set_clock host_op"
This reverts commit 474c80c4fa5c263e9e2bfe3523b8528f7d87684f.
Change-Id: I7a7bd0ea2e353248dd6286bef4cc1914d3edf5bd
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 35ec8e385db8..361c8e780683 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -30,12 +30,9 @@ #define DRIVER_NAME "sdhci-tegra" -#define SDHCI_VENDOR_CLOCK_CNTRL 0x100 - struct tegra_sdhci_host { struct sdhci_host *sdhci; struct clk *clk; - int clk_enabled; }; static irqreturn_t carddetect_irq(int irq, void *data) @@ -51,26 +48,8 @@ static int tegra_sdhci_enable_dma(struct sdhci_host *host) return 0; } -static void tegra_sdhci_set_clock(struct sdhci_host *sdhci, unsigned int clock) -{ - struct tegra_sdhci_host *host = sdhci_priv(sdhci); - pr_info("tegra sdhci clock %s %u\n", - mmc_hostname(sdhci->mmc), clock); - - if (clock && !host->clk_enabled) { - clk_enable(host->clk); - sdhci_writeb(sdhci, 1, SDHCI_VENDOR_CLOCK_CNTRL); - host->clk_enabled = 1; - } else if (!clock && host->clk_enabled) { - sdhci_writeb(sdhci, 0, SDHCI_VENDOR_CLOCK_CNTRL); - clk_disable(host->clk); - host->clk_enabled = 0; - } -} - static struct sdhci_ops tegra_sdhci_ops = { .enable_dma = tegra_sdhci_enable_dma, - .set_clock = tegra_sdhci_set_clock, }; static int __devinit tegra_sdhci_probe(struct platform_device *pdev) @@ -118,7 +97,6 @@ static int __devinit tegra_sdhci_probe(struct platform_device *pdev) if (rc != 0) goto err_clkput; - host->clk_enabled = 1; sdhci->hw_name = "tegra"; sdhci->ops = &tegra_sdhci_ops; sdhci->irq = irq; |