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

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

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Add support for Marvell SD8787 Wifi/BT chip
   - Improve UHS support for SDIO
   - Invent MMC_CAP_3_3V_DDR and a DT binding for eMMC DDR 3.3V mode
   - Detect Auto BKOPS enable bit
   - Export eMMC device lifetime information through sysfs
   - First take to slim down the public mmc headers to avoid abuse
   - Re-factoring of the mmc block device driver to prepare for blkmq
   - Cleanup code for the mmc block device driver
   - Clarify and cleanup code dealing with data requests
   - Cleanup some code by converting to ida_simple_ functions
   - Cleanup code dealing with card quirks
   - Cleanup private and public mmc header files

  MMC host:
   - Don't rely on public mmc headers to include non-mmc related headers
   - meson: Add support for eMMC HS400 mode
   - meson: Various cleanups and improvements
   - omap_hsmmc: Use the proper provided busy timeout from the core
   - sunxi: Enable new timings for the A64 MMC controllers
   - sunxi: Improvements for clock management
   - tmio: Improvements for SDIO interrupts
   - mxs-mmc: Add CMD23 support
   - sdhci-msm: Enable HS400 enhanced strobe mode support
   - sdhci-msm: Correct HS400 tuning sequence
   - sdhci-acpi: Support deferred probe
   - sdhci-pci: Add support for eMMC HS200 tuning mode on AMD
   - mediatek: Correct the implementation of card busy detection
   - dw_mmc: Initial support for ZX mmc controller
   - sh_mobile_sdhi: Enable support for eMMC HS200 mode
   - sh_mmcif: Various cleanups and improvements"

* tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (145 commits)
  mmc: core: add mmc prefix for blk_fixups
  mmc: core: move all quirks together into quirks.h
  mmc: core: improve the quirks for sdio devices
  mmc: core: move some sdio IDs out of quirks file
  mmc: core: change quirks.c to be a header file
  mmc: sdhci-cadence: fix bit shift of read data from PHY port
  mmc: Adding AUTO_BKOPS_EN bit set for Auto BKOPS support
  mmc: MAN_BKOPS_EN inverse debug message logic
  mmc: meson-gx: add support for HS400 mode
  mmc: meson-gx: remove unneeded checks in remove
  mmc: meson-gx: reduce bounce buffer size
  mmc: meson-gx: set max block count and request size
  mmc: meson-gx: improve interrupt handling
  mmc: meson-gx: improve meson_mmc_irq_thread
  mmc: meson-gx: improve meson_mmc_clk_set
  mmc: meson-gx: minor improvements in meson_mmc_set_ios
  mmc: meson: Assign the minimum clk rate as close to 400KHz as possible
  mmc: core: start to break apart mmc_start_areq()
  mmc: block: respect bool returned from blk_end_request()
  mmc: block: return errorcode from mmc_sd_num_wr_blocks()
  ...
parents cdc19470 8c7cdbf9

Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
	"core" - Main peripheral bus clock

	"clkin0" - Parent clock of internal mux

	"clkin1" - Other parent clock of internal mux

  The driver has an interal mux clock which switches between clkin0 and clkin1 depending on the

  The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the

  clock rate requested by the MMC core.



Example:

Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* Marvell SD8787 power sequence provider



Required properties:

- compatible: must be "mmc-pwrseq-sd8787".

- powerdown-gpios: contains a power down GPIO specifier with the

		   default active state

- reset-gpios: contains a reset GPIO specifier with the default

		   active state



Example:



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-sd8787";

		powerdown-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;

		reset-gpios = <&twl_gpio 1 GPIO_ACTIVE_LOW>;

	}

Documentation/devicetree/bindings/mmc/mmc.txt

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ Optional properties: 
- cap-mmc-hw-reset: eMMC hardware reset is supported

- cap-sdio-irq: enable SDIO IRQ signalling on this interface

- full-pwr-cycle: full power cycle of the card is supported

- mmc-ddr-3_3v: eMMC high-speed DDR mode(3.3V I/O) is supported

- mmc-ddr-1_8v: eMMC high-speed DDR mode(1.8V I/O) is supported

- mmc-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

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Optional properties: 
- bus-width:		Number of data lines.

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



- max-frequency:	Can be 200MHz, 100Mz or 50MHz (default) and used for

- max-frequency:	Can be 200MHz, 100MHz or 50MHz (default) and used for

			configuring the CCONFIG3 in the mmcss.

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

Documentation/devicetree/bindings/mmc/sdhci.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ host controllers refer to the mmc[1] bindings. 


Optional properties:

- sdhci-caps-mask: The sdhci capabilities register is incorrect. This 64bit

  property corresponds to the bits in the sdhci capabilty register. If the bit

  property corresponds to the bits in the sdhci capability register. If the bit

  is on in the mask then the bit is incorrect in the register and should be

  turned off, before applying sdhci-caps.

- sdhci-caps: The sdhci capabilities register is incorrect. This 64bit