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

Commit 3e21e5dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Add TRACE support to be able to debug request flow
   - Extend/improve reset support for (e)MMC
   - Convert MMC pwrseq to platform device drivers
   - Use IDA for indexes
   - Some additional minor improvements

  MMC host:
   - sdhci: Re-factoring, clean-ups and improvements
   - sdhci-acpi|pci: Use MMC_CAP_AGGRESSIVE_PM for Broxton
   - omap/omap_hsmmc: Convert to use dma_request_chan()
   - usdhi6rol0: Add support for UHS modes
   - sh_mmcif: Update runtime PM support
   - tmio: Wolfram Sang steps in as maintainer
   - tmio: Add UHS-I mode support
   - sh_mobile_sdhi: Add UHS-I mode support
   - tmio/sdhi: Re-factoring, clean-ups and improvements
   - dw_mmc: Re-factoring and clean-ups
   - davinci: Convert to use dma_request_chan()"

* tag 'mmc-v4.7' of git://git.linaro.org/people/ulf.hansson/mmc: (99 commits)
  mmc: mmc: Fix partition switch timeout for some eMMCs
  mmc: sh_mobile_sdhi: enable SDIO IRQs for RCar Gen3
  mmc: sdio: fall back to SDIO 1.0 for broken 1.1 cards
  mmc: sdhci-st: correct name of sd-uhs-sdr50 property
  MAINTAINERS: update entry for TMIO MMC driver
  mmc: block: improve logging of handling emmc timeouts
  mmc: sdhci: removed unneeded function wrappers
  mmc: core: remove the invalid message in mmc_select_timing
  mmc: core: fix using wrong io voltage if mmc_select_hs200 fails
  mmc: sdhci-of-arasan: fix set_clock when a phy is supported
  mmc: omap: Use dma_request_chan() for requesting DMA channel
  mmc: mmc: Attempt to flush cache before reset
  mmc: sh_mobile_sdhi: check return value when changing clk
  mmc: sh_mobile_sdhi: only change the clock on RCar Gen2+
  mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
  mmc: sh_mobile_sdhi: make clk_update function more compact
  mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel
  mmc: sdhci-of-at91: add presets setup
  mmc: usdhi6rol0: add pinctrl to set pin drive strength
  mmc: usdhi6rol0: add support for UHS modes
  ...
parents d9dce51c 1c447116

Documentation/devicetree/bindings/mmc/sdhci-st.txt

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ Optional properties: 
- vqmmc-supply:		Phandle to the regulator dt node, mentioned as the vcc/vdd

			supply in eMMC/SD specs.



- sd-uhs--sdr50:	To enable the SDR50 in the mmcss.

- sd-uhs-sdr50:	To enable the SDR50 in the mmcss.

			See:  Documentation/devicetree/bindings/mmc/mmc.txt.



- sd-uhs-sdr104:	To enable the SDR104 in the mmcss.

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+3 −0
Original line number Diff line number Diff line
@@ -26,3 +26,6 @@ Required properties: 


Optional properties:

- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable

- pinctrl-names: should be "default", "state_uhs"

- pinctrl-0: should contain default/high speed pin ctrl

- pinctrl-1: should contain uhs mode pin ctrl

Documentation/devicetree/bindings/mmc/usdhi6rol0.txt

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ Optional properties: 


- vmmc-supply:	a phandle of a regulator, supplying Vcc to the card

- vqmmc-supply:	a phandle of a regulator, supplying VccQ to the card

- pinctrl-names: Can contain a "default" entry and a "state_uhs"

                 entry. The state_uhs entry is used together with the default

                 entry when the board requires distinct settings for UHS speeds.



- pinctrl-N: One property for each name listed in pinctrl-names, see

             ../pinctrl/pinctrl-bindings.txt.



Additionally any standard mmc bindings from mmc.txt can be used.

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -11246,14 +11246,13 @@ S: Maintained 
F:	drivers/media/i2c/tc358743*

F:	include/media/i2c/tc358743.h



TMIO MMC DRIVER

M:	Ian Molton <ian@mnementh.co.uk>

TMIO/SDHI MMC DRIVER

M:	Wolfram Sang <wsa+renesas@sang-engineering.com>

L:	linux-mmc@vger.kernel.org

S:	Maintained

S:	Supported

F:	drivers/mmc/host/tmio_mmc*

F:	drivers/mmc/host/sh_mobile_sdhi.c

F:	include/linux/mmc/tmio.h

F:	include/linux/mmc/sh_mobile_sdhi.h

F:	include/linux/mfd/tmio.h



TMP401 HARDWARE MONITOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

arch/arm/mach-davinci/devices-da8xx.c

+0 −20
Original line number Diff line number Diff line
@@ -751,16 +751,6 @@ static struct resource da8xx_mmcsd0_resources[] = { 
		.end	= IRQ_DA8XX_MMCSDINT0,

		.flags	= IORESOURCE_IRQ,

	},

	{		/* DMA RX */

		.start	= DA8XX_DMA_MMCSD0_RX,

		.end	= DA8XX_DMA_MMCSD0_RX,

		.flags	= IORESOURCE_DMA,

	},

	{		/* DMA TX */

		.start	= DA8XX_DMA_MMCSD0_TX,

		.end	= DA8XX_DMA_MMCSD0_TX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct platform_device da8xx_mmcsd0_device = {
@@ -788,16 +778,6 @@ static struct resource da850_mmcsd1_resources[] = { 
		.end	= IRQ_DA850_MMCSDINT0_1,

		.flags	= IORESOURCE_IRQ,

	},

	{		/* DMA RX */

		.start	= DA850_DMA_MMCSD1_RX,

		.end	= DA850_DMA_MMCSD1_RX,

		.flags	= IORESOURCE_DMA,

	},

	{		/* DMA TX */

		.start	= DA850_DMA_MMCSD1_TX,

		.end	= DA850_DMA_MMCSD1_TX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct platform_device da850_mmcsd1_device = {