target/linux/sunxi/patches-3.13/170-5-mmc-fix-caps-override.patch

   1 From dffb4d4d1fe3a6ba93102756152ec4518dbeac00 Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Mon, 17 Feb 2014 17:13:19 +0100
   4 Subject: [PATCH] sunxi-mmc: Or in caps, rather then overriding them
   5
   6 Now that we use mmc_of_parse() there are already some caps set by mmc_of_parse,
   7 so or in our driver caps, rather then using an assignment. This fixes the
   8 card running only in 1 bit mode instead of 4 bit mode problem we've had
   9 since we switched to using mmc_of_parse().
  10
  11 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  12 ---
  13  drivers/mmc/host/sunxi-mmc.c | 4 ++--
  14  1 file changed, 2 insertions(+), 2 deletions(-)
  15
  16 diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
  17 index 2eaed10..d5e8ff9 100644
  18 --- a/drivers/mmc/host/sunxi-mmc.c
  19 +++ b/drivers/mmc/host/sunxi-mmc.c
  20 @@ -802,9 +802,9 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
  21         else
  22                 mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
  23
  24 -       mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
  25 +       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
  26                      MMC_CAP_SDIO_IRQ;
  27 -       mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP;
  28 +       mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP;
  29
  30         ret = mmc_add_host(mmc);
  31
  32 --
  33 1.8.5.5
  34