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

   1 From 68f187f8fa966229b9820edec5dda455bdff52ea 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/174] 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 --- a/drivers/mmc/host/sdhci-bcm2708.c
  14 +++ b/drivers/mmc/host/sdhci-bcm2708.c
  15 @@ -1114,11 +1114,6 @@ static unsigned int sdhci_bcm2708_quirk_
  16          return 1;
  17  }
  18
  19 -static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
  20 -{
  21 -        return 1;
  22 -}
  23 -
  24  static unsigned int sdhci_bcm2708_missing_status(struct sdhci_host *host)
  25  {
  26         return 1;
  27 @@ -1150,7 +1145,6 @@ static struct sdhci_ops sdhci_bcm2708_op
  28         .pdma_reset = sdhci_bcm2708_platdma_reset,
  29  #endif
  30         .extra_ints = sdhci_bcm2708_quirk_extra_ints,
  31 -       .uhs_broken = sdhci_bcm2708_uhs_broken,
  32  };
  33
  34  /*****************************************************************************\
  35 --- a/drivers/mmc/host/sdhci.c
  36 +++ b/drivers/mmc/host/sdhci.c
  37 @@ -1581,7 +1581,7 @@ static void sdhci_do_set_ios(struct sdhc
  38         else
  39                 ctrl &= ~SDHCI_CTRL_HISPD;
  40
  41 -       if (host->version >= SDHCI_SPEC_300 && !(host->ops->uhs_broken)) {
  42 +       if (host->version >= SDHCI_SPEC_300) {
  43                 u16 clk, ctrl_2;
  44
  45                 /* In case of UHS-I modes, set High Speed Enable */
  46 --- a/drivers/mmc/host/sdhci.h
  47 +++ b/drivers/mmc/host/sdhci.h
  48 @@ -299,7 +299,6 @@ struct sdhci_ops {
  49                                       struct mmc_data *data);
  50         unsigned int    (*extra_ints)(struct sdhci_host *host);
  51         unsigned int    (*spurious_crc_acmd51)(struct sdhci_host *host);
  52 -       unsigned int    (*uhs_broken)(struct sdhci_host *host);
  53         unsigned int    (*missing_status)(struct sdhci_host *host);
  54
  55         void    (*hw_reset)(struct sdhci_host *host);