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

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

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

Pull MMC update from Chris Ball:
 "MMC highlights for 3.16:

  Core:
   - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v
   - if card init at 3.3v doesn't work, try 1.8v and 1.2v too

  Drivers:
   - moxart: New driver for MOXA ART SoCs
   - rtsx_usb_sdmmc: New driver for Realtek USB card readers
   - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet
   - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
   - sunxi: New driver for Allwinner sunxi SoCs
   - usdhi6rol0: New driver for Renesas SD/SDIO controller"

* tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (95 commits)
  mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet
  mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller
  mmc: sdhci-of-esdhc: Fixup compile error
  mmc: tegra: fix reporting of base clock frequency
  mmc: tegra: disable UHS modes
  mmc: sdhci-dove: use mmc_of_parse() and remove card_tasklet CD handler
  MAINTAINERS: mmc: Add path to git tree
  mmc: dove: fix missing MACH_DOVE dependency
  mmc: sdhci: SD tuning is broken for some controllers
  mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue
  mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
  mmc: omap_hsmmc: split omap-dma header file
  mmc: omap_hsmmc: fix cmd23 multiblock read/write
  mmc: omap_hsmmc: use devm_ioremap_resource
  mmc: omap_hsmmc: use devm_request_threaded_irq
  mmc: omap_hsmmc: use devm_request_irq
  mmc: omap_hsmmc: use devm_clk_get
  mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs
  mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value
  mmc: omap: Use DIV_ROUND_UP instead of open coded
  ...
parents 23adbe12 11bc9381

Documentation/devicetree/bindings/mmc/mmc.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,8 @@ Optional properties: 
- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported

- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V I/O) is supported

- mmc-hs200-1_8v: eMMC HS200 mode(1.8V I/O) is supported

- mmc-hs200-1_8v: eMMC HS200 mode(1.8V I/O) is supported

- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported

- mmc-hs200-1_2v: eMMC HS200 mode(1.2V I/O) is supported

- mmc-hs400-1_8v: eMMC HS400 mode(1.8V I/O) is supported

- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported





*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line

*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line

polarity properties, we have to fix the meaning of the "normal" and "inverted"

polarity properties, we have to fix the meaning of the "normal" and "inverted"

Documentation/devicetree/bindings/mmc/moxa,moxart-mmc.txt

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
MOXA ART MMC Host Controller Interface



  Inherits from mmc binding[1].



  [1] Documentation/devicetree/bindings/mmc/mmc.txt



Required properties:



- compatible :	Must be "moxa,moxart-mmc" or "faraday,ftsdc010"

- reg :		Should contain registers location and length

- interrupts :	Should contain the interrupt number

- clocks :	Should contain phandle for the clock feeding the MMC controller



Optional properties:



- dmas :	Should contain two DMA channels, line request number must be 5 for

		both channels

- dma-names :	Must be "tx", "rx"



Example:



	mmc: mmc@98e00000 {

		compatible = "moxa,moxart-mmc";

		reg = <0x98e00000 0x5C>;

		interrupts = <5 0>;

		clocks = <&clk_apb>;

		dmas =  <&dma 5>,

			<&dma 5>;

		dma-names = "tx", "rx";

	};

Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -69,10 +69,6 @@ Optional properties: 




* supports-highspeed: Enables support for high speed cards (up to 50MHz)

* supports-highspeed: Enables support for high speed cards (up to 50MHz)





* caps2-mmc-hs200-1_8v: Supports mmc HS200 SDR 1.8V mode



* caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode



* broken-cd: as documented in mmc core bindings.

* broken-cd: as documented in mmc core bindings.





* vmmc-supply: The phandle to the regulator to use for vmmc.  If this is

* vmmc-supply: The phandle to the regulator to use for vmmc.  If this is
@@ -103,7 +99,6 @@ board specific portions as listed below. 
		clock-freq-min-max = <400000 200000000>;

		clock-freq-min-max = <400000 200000000>;

		num-slots = <1>;

		num-slots = <1>;

		supports-highspeed;

		supports-highspeed;

		caps2-mmc-hs200-1_8v;

		broken-cd;

		broken-cd;

		fifo-depth = <0x80>;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		card-detect-delay = <200>;

Documentation/devicetree/bindings/mmc/usdhi6rol0.txt

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
* Renesas usdhi6rol0 SD/SDIO host controller



Required properties:



- compatible:	must be

		"renesas,usdhi6rol0"

- interrupts:	3 interrupts, named "card detect", "data" and "SDIO" must be

		specified

- clocks:	a clock binding for the IMCLK input



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



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



Example:



sd0: sd@ab000000 {

	compatible = "renesas,usdhi6rol0";

	reg = <0xab000000 0x200>;

	interrupts = <0 23 0x4

		      0 24 0x4

		      0 25 0x4>;

	interrupt-names = "card detect", "data", "SDIO";

	bus-width = <4>;

	max-frequency = <50000000>;

	cap-power-off-card;

	clocks = <&imclk>;

	vmmc-supply = <&vcc_sd0>;

	vqmmc-supply = <&vccq_sd0>;

};

MAINTAINERS

+2 −1
Original line number Original line Diff line number Diff line
@@ -5974,6 +5974,7 @@ M: Chris Ball <chris@printf.net> 
M:	Ulf Hansson <ulf.hansson@linaro.org>

M:	Ulf Hansson <ulf.hansson@linaro.org>

L:	linux-mmc@vger.kernel.org

L:	linux-mmc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git

T:	git git://git.linaro.org/people/ulf.hansson/mmc.git

S:	Maintained

S:	Maintained

F:	drivers/mmc/

F:	drivers/mmc/

F:	include/linux/mmc/

F:	include/linux/mmc/
@@ -9103,7 +9104,7 @@ F: include/linux/toshiba.h 
F:	include/uapi/linux/toshiba.h

F:	include/uapi/linux/toshiba.h





TMIO MMC DRIVER

TMIO MMC DRIVER

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

M:	Ian Molton <ian.molton@codethink.co.uk>

L:	linux-mmc@vger.kernel.org

L:	linux-mmc@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/mmc/host/tmio_mmc*

F:	drivers/mmc/host/tmio_mmc*