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

Commit f43b179b authored Oct 11, 2014 by Linus Torvalds

Merge tag 'mmc-v3.18-1' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Fix SDIO IRQ bug
   - MMC regulator improvements
   - Fix slot-gpio card detect bug
   - Add support for Driver Stage Register
   - Convert the common MMC OF parser to use GPIO descriptors
   - Convert MMC_CAP2_NO_MULTI_READ into a callback, ->multi_io_quirk()
   - Some additional minor fixes

  MMC host:
   - mmci: Support Qualcomm specific DML layer for DMA
   - dw_mmc: Use common MMC regulators
   - dw_mmc: Add support for Rock-chips RK3288
   - tmio: Enable runtime PM support
   - tmio: Add support for R-Car Gen2 SoCs
   - tmio: Several fixes and improvements
   - omap_hsmmc: Removed Balaji from MAINTAINERS
   - jz4740: add DMA and pre/post support
   - sdhci: Add support for Intel Braswell
   - sdhci: Several fixes and improvements"

* tag 'mmc-v3.18-1' of git://git.linaro.org/people/ulf.hansson/mmc: (119 commits)
  ARM: dts: fix MMC2 regulators for Exynos5420 Arndale Octa board
  mmc: sdhci-acpi: Fix Braswell eMMC timeout clock frequency
  mmc: sdhci-acpi: Pass HID and UID to probe_slot
  mmc: sdhci-acpi: Get UID directly from acpi_device
  mmc, sdhci, bcm-kona, LLVMLinux: Remove use of __initconst
  mmc: sdhci-pci: Fix Braswell eMMC timeout clock frequency
  mmc: sdhci: Let a driver override timeout clock frequency
  mmc: sdhci-pci: Add Bay Trail and Braswell SD card detect
  mmc: sdhci-pci: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel BYT host controllers
  mmc: sdhci-acpi: Add a HID and UID for a SD Card host controller
  mmc: sdhci-acpi: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel host controllers
  mmc: sdhci: Add quirk for always getting TC with stop cmd
  mmc: core: restore detect line inversion semantics
  mmc: Fix incorrect warning when setting 0 Hz via debugfs
  mmc: Fix use of wrong device in mmc_gpiod_free_cd()
  mmc: atmel-mci: fix mismatched section on atmci_cleanup_slot
  mmc: rtsx_pci: Set power related cap2 macros
  mmc: core: Add new power_mode MMC_POWER_UNDEFINED
  mmc: sdhci: execute tuning when device is not busy
  mmc: atmel-mci: Release mmc resources on failure in probe
  ..

parents a2ce3527 583f958b

Documentation/devicetree/bindings/mmc/mmc.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,8 @@ Optional properties:
	- 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_8v: eMMC HS400 mode(1.8V I/O) is supported
	- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported		- mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported
			- dsr: Value the card's (optional) Driver Stage Register (DSR) should be
			programmed with. Valid range: [0 .. 0xffff].

	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/rockchip-dw-mshc.txt

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,12 +10,14 @@ extensions to the Synopsys Designware Mobile Storage Host Controller.
	Required Properties:		Required Properties:

	* compatible: should be		* compatible: should be
	- "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following		- "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following,
			before RK3288
			- "rockchip,rk3288-dw-mshc": for Rockchip RK3288

	Example:		Example:

	rkdwmmc0@12200000 {		rkdwmmc0@12200000 {
	compatible = "rockchip,rk2928-dw-mshc";		compatible = "rockchip,rk3288-dw-mshc";
	reg = <0x12200000 0x1000>;		reg = <0x12200000 0x1000>;
	interrupts = <0 75 0>;		interrupts = <0 75 0>;
	#address-cells = <1>;		#address-cells = <1>;

Documentation/devicetree/bindings/mmc/tmio_mmc.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,9 @@ Required properties:
	"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC		"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC
	"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC		"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
	"renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC		"renesas,sdhi-r8a7791" - SDHI IP on R8A7791 SoC
			"renesas,sdhi-r8a7792" - SDHI IP on R8A7792 SoC
			"renesas,sdhi-r8a7793" - SDHI IP on R8A7793 SoC
			"renesas,sdhi-r8a7794" - SDHI IP on R8A7794 SoC

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

MAINTAINERS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6616,10 +6616,9 @@ S: Maintained
	F: drivers/mmc/host/omap.c		F: drivers/mmc/host/omap.c

	OMAP HS MMC SUPPORT		OMAP HS MMC SUPPORT
	M: Balaji T K <balajitk@ti.com>
	L: linux-mmc@vger.kernel.org		L: linux-mmc@vger.kernel.org
	L: linux-omap@vger.kernel.org		L: linux-omap@vger.kernel.org
	S: Maintained		S: Orphan
	F: drivers/mmc/host/omap_hsmmc.c		F: drivers/mmc/host/omap_hsmmc.c

	OMAP RANDOM NUMBER GENERATOR SUPPORT		OMAP RANDOM NUMBER GENERATOR SUPPORT

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,8 @@
	samsung,dw-mshc-ddr-timing = <1 2>;		samsung,dw-mshc-ddr-timing = <1 2>;
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
	vmmc-supply = <&ldo10_reg>;		vmmc-supply = <&ldo19_reg>;
			vqmmc-supply = <&ldo13_reg>;
	bus-width = <4>;		bus-width = <4>;
	cap-sd-highspeed;		cap-sd-highspeed;
	};		};