target/linux/brcm2708/patches-3.10/0101-sdhci-sdhci_bcm2708_uhs_broken-should-be-handled-thr.patch

   1 From 84a69f4eea629347522bcb4e7fe6a04ed687686e Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Wed, 13 Nov 2013 11:40:56 +0000
   4 Subject: [PATCH 101/196] sdhci: sdhci_bcm2708_uhs_broken should be handled
   5  through caps reported
   6
   7 ---
   8  drivers/mmc/host/sdhci-bcm2708.c | 6 ------
   9  drivers/mmc/host/sdhci.c         | 2 +-
  10  drivers/mmc/host/sdhci.h         | 1 -
  11  3 files changed, 1 insertion(+), 8 deletions(-)
  12
  13 diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
  14 index c775666..2797ae6 100644
  15 --- a/drivers/mmc/host/sdhci-bcm2708.c
  16 +++ b/drivers/mmc/host/sdhci-bcm2708.c
  17 @@ -1114,11 +1114,6 @@ static unsigned int sdhci_bcm2708_quirk_spurious_crc_acmd51(struct sdhci_host *h
  18          return 1;
  19  }
  20
  21 -static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
  22 -{
  23 -        return 1;
  24 -}
  25 -
  26  static unsigned int sdhci_bcm2708_missing_status(struct sdhci_host *host)
  27  {
  28         return 1;
  29 @@ -1150,7 +1145,6 @@ static struct sdhci_ops sdhci_bcm2708_ops = {
  30         .pdma_reset = sdhci_bcm2708_platdma_reset,
  31  #endif
  32         .extra_ints = sdhci_bcm2708_quirk_extra_ints,
  33 -       .uhs_broken = sdhci_bcm2708_uhs_broken,
  34  };
  35
  36  /*****************************************************************************\
  37 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
  38 index 237158c..9c93e00 100644
  39 --- a/drivers/mmc/host/sdhci.c
  40 +++ b/drivers/mmc/host/sdhci.c
  41 @@ -1581,7 +1581,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
  42         else
  43                 ctrl &= ~SDHCI_CTRL_HISPD;
  44
  45 -       if (host->version >= SDHCI_SPEC_300 && !(host->ops->uhs_broken)) {
  46 +       if (host->version >= SDHCI_SPEC_300) {
  47                 u16 clk, ctrl_2;
  48
  49                 /* In case of UHS-I modes, set High Speed Enable */
  50 diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
  51 index fc6fcf3..9c3970b 100644
  52 --- a/drivers/mmc/host/sdhci.h
  53 +++ b/drivers/mmc/host/sdhci.h
  54 @@ -299,7 +299,6 @@ struct sdhci_ops {
  55                                       struct mmc_data *data);
  56         unsigned int    (*extra_ints)(struct sdhci_host *host);
  57         unsigned int    (*spurious_crc_acmd51)(struct sdhci_host *host);
  58 -       unsigned int    (*uhs_broken)(struct sdhci_host *host);
  59         unsigned int    (*missing_status)(struct sdhci_host *host);
  60
  61         void    (*hw_reset)(struct sdhci_host *host);
  62 --
  63 1.9.1
  64