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

Commit 17ece345 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Add support to enable irq wake for slot gpio
   - Remove MMC_CAP2_HC_ERASE_SZ and make it the default behaviour
   - Improve R1 response error checks for stop commands
   - Cleanup and clarify some MMC specific code
   - Keep card runtime resumed while adding SDIO function devices
   - Use device_property_read instead of of_property_read in mmc_of_parse()
   - Move boot partition locking into a driver op to enable proper I/O scheduling
   - Move multi/single-ioctl() to use block layer to enable proper I/O scheduling
   - Delete bounce buffer Kconfig option
   - Improve the eMMC HW reset support provided via the eMMC pwrseq
   - Add host API to manage SDIO IRQs from a workqueue

  MMC host:
   - dw_mmc: Drop support for multiple slots
   - dw_mmc: Use device_property_read instead of of_property_read
   - dw_mmc-rockchip: Optional improved tuning to greatly decrease tuning time
   - dw_mmc: Prevent rpm suspend for SDIO IRQs instead of always for SDIO cards
   - dw_mmc: Convert to use MMC_CAP2_SDIO_IRQ_NOTHREAD for SDIO IRQs
   - omap_hsmmc: Convert to mmc regulator APIs to consolidate code
   - omap_hsmmc: Deprecate "vmmc_aux" in DT and use "vqmmc" instead
   - tmio: make sure SDIO gets reinitialized after resume
   - sdhi: add CMD23 support to R-Car Gen2 & Gen3
   - tmio: add CMD23 support
   - sdhi/tmio: Refactor code and rename files to simplify Kconfig options
   - sdhci-pci: Enable card detect wake for Intel BYT-related SD controllers
   - sdhci-pci: Add support for Intel CNP
   - sdhci-esdhc-imx: Remove ENGcm07207 workaround - allow multi block transfers
   - sdhci-esdhc-imx: Allow all supported prescaler values
   - sdhci-esdhc-imx: Fix DAT line software reset
   - sdhci-esdhc: Add SDHCI_QUIRK_32BIT_DMA_ADDR
   - atmel-mci: Drop AVR32 support"

* tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (86 commits)
  mmc: dw_mmc: remove the unnecessary slot variable
  mmc: dw_mmc: use the 'slot' instead of 'cur_slot'
  mmc: dw_mmc: remove the 'id' arguments about functions relevant to slot
  mmc: dw_mmc: change the array of slots
  mmc: dw_mmc: remove the loop about finding slots
  mmc: dw_mmc: deprecated the "num-slots" property
  mmc: dw_mmc-rockchip: parse rockchip, desired-num-phases from DT
  dt-bindings: rockchip-dw-mshc: add optional rockchip, desired-num-phases
  mmc: renesas-sdhi: improve checkpatch cleanness
  mmc: tmio: improve checkpatch cleanness
  mmc: sdhci-pci: Enable card detect wake for Intel BYT-related SD controllers
  mmc: slot-gpio: Add support to enable irq wake on cd_irq
  mmc: core: Remove MMC_CAP2_HC_ERASE_SZ
  mmc: core: for data errors, take response of stop cmd into account
  mmc: core: check also R1 response for stop commands
  mmc: core: Clarify code for sending CSD
  mmc: core: Drop mmc_all_send_cid() and use mmc_send_cxd_native() instead
  mmc: core: Re-factor code for sending CID
  mmc: core: Remove redundant code in mmc_send_cid()
  mmc: core: Make mmc_can_reset() static
  ...
parents 650fc870 e47c0b96

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

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required Properties: 
	- "rockchip,rk3288-dw-mshc": for Rockchip RK3288

	- "rockchip,rv1108-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RV1108

	- "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3036

	- "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3328

	- "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3368

	- "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc": for Rockchip RK3399
@@ -31,6 +32,10 @@ Optional Properties: 
  probing, low speeds or in case where all phases work at tuning time.

  If not specified 0 deg will be used.



* rockchip,desired-num-phases: The desired number of times that the host

  execute tuning when needed. If not specified, the host will do tuning

  for 360 times, namely tuning for each degree.



Example:



	rkdwmmc0@12200000 {

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Required properties: 
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

"supply-name" examples are "vmmc", "vmmc_aux"(deprecated)/"vqmmc" etc

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

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

ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -12915,7 +12915,7 @@ M: Wolfram Sang <wsa+renesas@sang-engineering.com> 
L:	linux-mmc@vger.kernel.org

S:	Supported

F:	drivers/mmc/host/tmio_mmc*

F:	drivers/mmc/host/sh_mobile_sdhi.c

F:	drivers/mmc/host/renesas_sdhi*

F:	include/linux/mfd/tmio.h



TMP401 HARDWARE MONITOR DRIVER

arch/arm/boot/dts/omap3-overo-base.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -74,16 +74,6 @@ 
		gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;		/* gpio_16: WiFi nReset */

		startup-delay-us = <10000>;

	};



	/* Regulator to trigger the nReset signal of the Bluetooth module */

	w3cbw003c_bt_nreset: regulator-w3cbw003c-bt-nreset {

		compatible = "regulator-fixed";

		regulator-name = "regulator-w3cbw003c-bt-nreset";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;		/* gpio_164: BT nReset */

		startup-delay-us = <10000>;

	};

};



&omap3_pmx_core {
@@ -191,7 +181,6 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

	vmmc-supply = <&w3cbw003c_npoweron>;

	vqmmc-supply = <&w3cbw003c_bt_nreset>;

	vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;

	bus-width = <4>;

	cap-sdio-irq;

drivers/mmc/core/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -61,24 +61,6 @@ config MMC_BLOCK_MINORS 


	  If unsure, say 8 here.



config MMC_BLOCK_BOUNCE

	bool "Use bounce buffer for simple hosts"

	depends on MMC_BLOCK

	default y

	help

	  SD/MMC is a high latency protocol where it is crucial to

	  send large requests in order to get high performance. Many

	  controllers, however, are restricted to continuous memory

	  (i.e. they can't do scatter-gather), something the kernel

	  rarely can provide.



	  Say Y here to help these restricted hosts by bouncing

	  requests back and forth from a large buffer. You will get

	  a big performance gain at the cost of up to 64 KiB of

	  physical memory.



	  If unsure, say Y here.



config SDIO_UART

	tristate "SDIO UART/GPS class support"

	depends on TTY