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

Commit b5174fa3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull MMC updates from Chris Ball:

Core:
 * Support for MMC 4.5 Data Tag feature -- we tag REQ_META, so devices
   that support Data Tag will provide increased throughput for metadata.
 * Faster detection of card removal on I/O errors.

Drivers:
 * dw_mmc now supports eMMC Power Off Notify, has PCI support, and
   implements pre_req and post_req for asynchronous requests.
 * omap_hsmmc now supports device tree.
 * esdhc now has power management support.
 * sdhci-tegra now supports Tegra30 devices.
 * sdhci-spear now supports hibernation.
 * tmio_mmc now supports using a GPIO for card detection.
 * Intel PCH now supports 8-bit bus transfers.

* tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
  mmc: sh_mmcif: simplify bitmask macros
  mmc: sh_mobile_sdhi: support modular mmc-core with non-standard hotplug
  mmc: sh_mobile_sdhi: add a callback for board specific init code
  mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function
  mmc: sh_mobile_sdhi: do not manage PM clocks manually
  mmc: tmio_mmc: remove unused sdio_irq_enabled flag
  mmc: tmio_mmc: power status flag doesn't have to be exposed in platform data
  mmc: sh_mobile_sdhi: pass card hotplug GPIO number to TMIO MMC
  mmc: tmio_mmc: support the generic MMC GPIO card hotplug helper
  mmc: tmio: calculate the native hotplug condition only once
  mmc: simplify mmc_cd_gpio_request() by removing two parameters
  mmc: sdhci-pci: allow 8-bit bus width for Intel PCH
  mmc: sdhci: check interrupt flags in ISR again
  mmc: sdhci-pci: Add MSI support
  mmc: core: warn when card doesn't support HPI
  mmc: davinci: Poll status for small size transfers
  mmc: davinci: Eliminate spurious interrupts
  mmc: omap_hsmmc: Avoid a regulator voltage change with dt
  mmc: omap_hsmmc: Convert hsmmc driver to use device tree
  mmc: sdhci-pci: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for Medfield SDIO
  ...
parents afb9bd70 135111cc

Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
* TI Highspeed MMC host controller for OMAP



The Highspeed MMC Host Controller on TI OMAP family

provides an interface for MMC, SD, and SDIO types of memory cards.



Required properties:

- compatible:

 Should be "ti,omap2-hsmmc", for OMAP2 controllers

 Should be "ti,omap3-hsmmc", for OMAP3 controllers

 Should be "ti,omap4-hsmmc", for OMAP4 controllers

- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1

- reg : should contain hsmmc registers location and length



Optional properties:

ti,dual-volt: boolean, supports dual voltage cards

<supply-name>-supply: phandle to the regulator device tree node

"supply-name" examples are "vmmc", "vmmc_aux" etc

ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.

cd-gpios: GPIOs for card detection

wp-gpios: GPIOs for write protection

ti,non-removable: non-removable slot (like eMMC)

ti,needs-special-reset: Requires a special softreset sequence



Example:

	mmc1: mmc@0x4809c000 {

		compatible = "ti,omap4-hsmmc";

		reg = <0x4809c000 0x400>;

		ti,hwmods = "mmc1";

		ti,dual-volt;

		ti,bus-width = <4>;

		vmmc-supply = <&vmmc>; /* phandle to regulator node */

		ti,non-removable;

	};

arch/arm/mach-exynos/mach-nuri.c

+2 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = { 
	.max_width		= 8,

	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_DISABLE | MMC_CAP_ERASE),

				MMC_CAP_ERASE),

	.cd_type		= S3C_SDHCI_CD_PERMANENT,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};
@@ -150,8 +150,7 @@ static struct platform_device emmc_fixed_voltage = { 
static struct s3c_sdhci_platdata nuri_hsmmc2_data __initdata = {

	.max_width		= 4,

	.host_caps		= MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_DISABLE,

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.ext_cd_gpio		= EXYNOS4_GPX3(3),	/* XEINT_27 */

	.ext_cd_gpio_invert	= 1,

	.cd_type		= S3C_SDHCI_CD_GPIO,

arch/arm/mach-exynos/mach-universal_c210.c

+3 −6
Original line number Diff line number Diff line
@@ -745,8 +745,7 @@ static struct platform_device universal_gpio_keys = { 
static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = {

	.max_width		= 8,

	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_DISABLE),

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),

	.cd_type		= S3C_SDHCI_CD_PERMANENT,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};
@@ -784,8 +783,7 @@ static struct platform_device mmc0_fixed_voltage = { 
static struct s3c_sdhci_platdata universal_hsmmc2_data __initdata = {

	.max_width		= 4,

	.host_caps		= MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_DISABLE,

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.ext_cd_gpio		= EXYNOS4_GPX3(4),      /* XEINT_28 */

	.ext_cd_gpio_invert	= 1,

	.cd_type		= S3C_SDHCI_CD_GPIO,
@@ -796,8 +794,7 @@ static struct s3c_sdhci_platdata universal_hsmmc2_data __initdata = { 
static struct s3c_sdhci_platdata universal_hsmmc3_data __initdata = {

	.max_width		= 4,

	.host_caps		= MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_DISABLE,

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.cd_type		= S3C_SDHCI_CD_EXTERNAL,

};

arch/arm/mach-omap2/hsmmc.c

+1 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
	mmc->slots[0].pm_caps = c->pm_caps;

	mmc->slots[0].internal_clock = !c->ext_clock;

	mmc->dma_mask = 0xffffffff;

	mmc->max_freq = c->max_freq;

	if (cpu_is_omap44xx())

		mmc->reg_offset = OMAP4_MMC_REG_OFFSET;

	else

arch/arm/mach-omap2/hsmmc.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ struct omap2_hsmmc_info { 
	char	*name;		/* or NULL for default */

	struct platform_device *pdev;	/* mmc controller instance */

	int	ocr_mask;	/* temporary HACK */

	int	max_freq;	/* maximum clock, if constrained by external

				 * circuitry, or 0 for default */

	/* Remux (pad configuration) when powering on/off */

	void (*remux)(struct device *dev, int slot, int power_on);

	/* init some special card */