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

Commit 2f422f94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc 

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

  MMC host:
   - sdhci: Fix regression setting power on Trats2 board
   - sdhci-pci: Add support and PCI IDs for more Broxton host controllers"

* tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
  mmc: sdhci: Fix regression setting power on Trats2 board
parents 6a7c9243 01d6b2a4

drivers/mmc/host/sdhci-pci-core.c

+25 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot) 
	slot->cd_idx = 0;

	slot->cd_override_level = true;

	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD)

		slot->host->mmc_host_ops.get_cd = bxt_get_cd;
@@ -1171,6 +1172,30 @@ static const struct pci_device_id pci_ids[] = { 
		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sd,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_BXTM_EMMC,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_emmc,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_BXTM_SDIO,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sdio,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_BXTM_SD,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sd,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_APL_EMMC,

drivers/mmc/host/sdhci-pci.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#define PCI_DEVICE_ID_INTEL_BXT_SD	0x0aca

#define PCI_DEVICE_ID_INTEL_BXT_EMMC	0x0acc

#define PCI_DEVICE_ID_INTEL_BXT_SDIO	0x0ad0

#define PCI_DEVICE_ID_INTEL_BXTM_SD	0x1aca

#define PCI_DEVICE_ID_INTEL_BXTM_EMMC	0x1acc

#define PCI_DEVICE_ID_INTEL_BXTM_SDIO	0x1ad0

#define PCI_DEVICE_ID_INTEL_APL_SD	0x5aca

#define PCI_DEVICE_ID_INTEL_APL_EMMC	0x5acc

#define PCI_DEVICE_ID_INTEL_APL_SDIO	0x5ad0

drivers/mmc/host/sdhci-pxav3.c

+22 −0
Original line number Diff line number Diff line
@@ -309,8 +309,30 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) 
		__func__, uhs, ctrl_2);

}



static void pxav3_set_power(struct sdhci_host *host, unsigned char mode,

			    unsigned short vdd)

{

	struct mmc_host *mmc = host->mmc;

	u8 pwr = host->pwr;



	sdhci_set_power(host, mode, vdd);



	if (host->pwr == pwr)

		return;



	if (host->pwr == 0)

		vdd = 0;



	if (!IS_ERR(mmc->supply.vmmc)) {

		spin_unlock_irq(&host->lock);

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		spin_lock_irq(&host->lock);

	}

}



static const struct sdhci_ops pxav3_sdhci_ops = {

	.set_clock = sdhci_set_clock,

	.set_power = pxav3_set_power,

	.platform_send_init_74_clocks = pxav3_gen_init_74_clocks,

	.get_max_clock = sdhci_pltfm_clk_get_max_clock,

	.set_bus_width = sdhci_set_bus_width,

drivers/mmc/host/sdhci.c

+30 −9
Original line number Diff line number Diff line
@@ -1210,10 +1210,24 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 
}

EXPORT_SYMBOL_GPL(sdhci_set_clock);



static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,

static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode,

				unsigned short vdd)

{

	struct mmc_host *mmc = host->mmc;



	spin_unlock_irq(&host->lock);

	mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

	spin_lock_irq(&host->lock);



	if (mode != MMC_POWER_OFF)

		sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);

	else

		sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);

}



void sdhci_set_power(struct sdhci_host *host, unsigned char mode,

		     unsigned short vdd)

{

	u8 pwr = 0;



	if (mode != MMC_POWER_OFF) {
@@ -1245,7 +1259,6 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, 
		sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);

		if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)

			sdhci_runtime_pm_bus_off(host);

		vdd = 0;

	} else {

		/*

		 * Spec says that we should clear the power reg before setting
@@ -1276,12 +1289,20 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode, 
		if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)

			mdelay(10);

	}



	if (!IS_ERR(mmc->supply.vmmc)) {

		spin_unlock_irq(&host->lock);

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		spin_lock_irq(&host->lock);

}

EXPORT_SYMBOL_GPL(sdhci_set_power);



static void __sdhci_set_power(struct sdhci_host *host, unsigned char mode,

			      unsigned short vdd)

{

	struct mmc_host *mmc = host->mmc;



	if (host->ops->set_power)

		host->ops->set_power(host, mode, vdd);

	else if (!IS_ERR(mmc->supply.vmmc))

		sdhci_set_power_reg(host, mode, vdd);

	else

		sdhci_set_power(host, mode, vdd);

}



/*****************************************************************************\
@@ -1431,7 +1452,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) 
		}

	}



	sdhci_set_power(host, ios->power_mode, ios->vdd);

	__sdhci_set_power(host, ios->power_mode, ios->vdd);



	if (host->ops->platform_send_init_74_clocks)

		host->ops->platform_send_init_74_clocks(host, ios->power_mode);

drivers/mmc/host/sdhci.h

+4 −0
Original line number Diff line number Diff line
@@ -529,6 +529,8 @@ struct sdhci_ops { 
#endif



	void	(*set_clock)(struct sdhci_host *host, unsigned int clock);

	void	(*set_power)(struct sdhci_host *host, unsigned char mode,

			     unsigned short vdd);



	int		(*enable_dma)(struct sdhci_host *host);

	unsigned int	(*get_max_clock)(struct sdhci_host *host);
@@ -660,6 +662,8 @@ static inline bool sdhci_sdio_irq_enabled(struct sdhci_host *host) 
}



void sdhci_set_clock(struct sdhci_host *host, unsigned int clock);

void sdhci_set_power(struct sdhci_host *host, unsigned char mode,

		     unsigned short vdd);

void sdhci_set_bus_width(struct sdhci_host *host, int width);

void sdhci_reset(struct sdhci_host *host, u8 mask);

void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing);