AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

MMC host:

Browse Source 
- sdhci: Fix bug when using SDIO IRQ
  - sdhci-of-at91: Fix eMMC DDR52 card detection
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY3kLxAAoJEP4mhCVzWIwpBrUP/2ryfeCSgs0vVvkSkglhj9Hz
 p/k160btHjTNQ869u9cx62BB/GE+zZH1D3qrx6crgAtuG3e2F077LDFq4EttI1ik
 skeW4ZDbkG0JxKu8E3U/jzYRLeEQn9xIskgtuQafrIZmMh66zOGm64tw+eOhPVBA
 Q5OjkutDsD5Jb6cS3gRAXrPeXZ2Ba59frW/507HjqC5LHygki92Jjo/tDioxDwTE
 YVnR3+iHv+1ZjXrS+BD8UfqX1ExCKQqEJ+XQITKDn5srKA7v/jVfNDnYuv0Drvoh
 r2zj5iaXY5WB72gHLM/xNSBw5J+pUR5OpxtW7z9Y0v5yb7GRZHG3/MYwqtalIyQ4
 5U68u+BGrf1mlKTc1Nf3/BclA2248+Gc6y6XYzqOLKeNIRd28hmgVqlWI7RSidNj
 1Yn0kpMG3iveRSNZWJkQ4FrGRfV4Kr+tp3A8gMOB+hO9UCmK8r5FLODn4/OXOomz
 62H5eADvtVX5huJcggkYxVZfH1AJ3i6H3rc547zUM+e6wQgaKnD/Tr/zALLjRMb/
 G2NOEoBIJcFDa0np4wP4HW9tzbWCLc4OG/941T5z34BTlc9Gq8pmtdbkkNuKX51J
 PGweMTRTy9Uz7pmMYrsVoV20vbyBcBKd9ASu0JpBCVw2slYsbfznkr9euAyQc/33
 XmspOzj37ILfV6+7u/fv
 =f2SA
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "Here are a couple of mmc fixes intended for v4.11 rc5.

  MMC host:
   - sdhci: Fix bug when using SDIO IRQ
   - sdhci-of-at91: Fix eMMC DDR52 card detection"

* tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-at91: fix MMC_DDR_52 timing selection
  mmc: sdhci: Disable runtime pm when the sdio_irq is enabled
This commit is contained in:
Linus Torvalds 2017-03-31 12:05:05 -07:00
commit 728f4b3aa6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/sdhci-of-at91.c
View File

@ -29,6 +29,8 @@
#include "sdhci-pltfm.h"
#define SDMMC_MC1R 0x204
#define SDMMC_MC1R_DDR BIT(3)
#define SDMMC_CACR 0x230
#define SDMMC_CACR_CAPWREN BIT(0)
#define SDMMC_CACR_KEY (0x46 << 8)
@ -103,11 +105,18 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode,
sdhci_set_power_noreg(host, mode, vdd);
}
void sdhci_at91_set_uhs_signaling(struct sdhci_host *host, unsigned int timing)
{
if (timing == MMC_TIMING_MMC_DDR52)
sdhci_writeb(host, SDMMC_MC1R_DDR, SDMMC_MC1R);
sdhci_set_uhs_signaling(host, timing);
}
static const struct sdhci_ops sdhci_at91_sama5d2_ops = {
.set_clock = sdhci_at91_set_clock,
.set_bus_width = sdhci_set_bus_width,
.reset = sdhci_reset,
.set_uhs_signaling = sdhci_set_uhs_signaling,
.set_uhs_signaling = sdhci_at91_set_uhs_signaling,
.set_power = sdhci_at91_set_power,
};

6
drivers/mmc/host/sdhci.c
View File

@ -1830,6 +1830,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
struct sdhci_host *host = mmc_priv(mmc);
unsigned long flags;
if (enable)
pm_runtime_get_noresume(host->mmc->parent);
spin_lock_irqsave(&host->lock, flags);
if (enable)
host->flags |= SDHCI_SDIO_IRQ_ENABLED;
@ -1838,6 +1841,9 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
sdhci_enable_sdio_irq_nolock(host, enable);
spin_unlock_irqrestore(&host->lock, flags);
if (!enable)
pm_runtime_put_noidle(host->mmc->parent);
}
static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,