Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 728f4b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0fc04f91 d0918764

drivers/mmc/host/sdhci-of-at91.c

+10 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/mmc/host/sdhci.c

+6 −0
Original line number Diff line number Diff line
@@ -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,