1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
index f2cc26633cb2..14b74075589a 100644
--- a/drivers/mmc/host/sdhci-cns3xxx.c
+++ b/drivers/mmc/host/sdhci-cns3xxx.c
@@ -30,13 +30,12 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock)
         u16 clk;
         unsigned long timeout;
 
-        if (clock == host->clock)
-                return;
+        host->mmc->actual_clock = 0;
 
         sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
 
         if (clock == 0)
-                goto out;
+                return;
 
         while (host->max_clk / div > clock) {
                 /*
@@ -75,13 +74,14 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock)
 
         clk |= SDHCI_CLOCK_CARD_EN;
         sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
-out:
-        host->clock = clock;
 }
 
 static const struct sdhci_ops sdhci_cns3xxx_ops = {
         .get_max_clock  = sdhci_cns3xxx_get_max_clk,
         .set_clock      = sdhci_cns3xxx_set_clock,
+        .set_bus_width  = sdhci_set_bus_width,
+        .reset          = sdhci_reset,
+        .set_uhs_signaling = sdhci_set_uhs_signaling,
 };
 
 static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {
@@ -90,8 +90,7 @@ static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = {
                   SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
                   SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
                   SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
-                  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
-                  SDHCI_QUIRK_NONSTANDARD_CLOCK,
+                  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
 };
 
 static int sdhci_cns3xxx_probe(struct platform_device *pdev)