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

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

Pull MMC updates from Ulf Hansson:
 "Me and Chris Ball decided to try out using my MMC tree as the primary
  one, to simplify handling of patches.

  This pull does thus contains all the MMC patches for 3.17 rc1, no pull
  from Chris this time.

  Details:

  MMC core:
   - forward compatibility for eMMC
   - fix some blacklisted cards with broken secure discard

  MMC host:
   - mmci: Add support for Qualcomm variant
   - mmci: Fix regression for arm_variant
   - sdhci: Various fixes and cleanups
   - sdhci: Improve external VDD regulator support
   - sdhci: Support for DDR50 1.8V mode for BayTrail
   - sdhci-st: Add driver for ST SDHCI controller
   - sh-mmcif: DMA fixes
   - omap_hsmmc: Add support for SDIO interrupts
   - sdhci-pci: Add support for Intel Quark X1000
   - dw_mmc: Update the reset sequence
   - s3cmci: port DMA code to dmaengine API"

* tag 'mmc-v3.17-1' of git://git.linaro.org/people/ulf.hansson/mmc: (67 commits)
  mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed
  mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
  mmc: mmci: Reverse IRQ handling for the arm_variant
  mmc: mmci: Move all CMD irq handling to mmci_cmd_irq()
  mmc: mmci: Remove redundant check of status for DATA irq
  mmc: dw_mmc: change to use recommended reset procedure
  mmc: sdhci-pxav3: Use devm_* managed helpers
  mmc: tmio: Configure DMA slave bus width
  mmc: sh_mmcif: Configure DMA slave bus width
  mmc: sh_mmcif: Fix DMA slave address configuration
  mmc: sh_mmcif: Document DT bindings
  mmc: sdhci-pci: remove PCI PM functions in suspend/resume callback
  mmc: Do not advertise secure discard if it is blacklisted
  mmc: sdhci-msm: Get COMPILE_TEST support
  mmc: sdhci-msm: Remove unnecessary header file inclusion
  mmc: sdhci-msm: Fix the binding example
  mmc: sdhci: add DDR50 1.8V mode support for BayTrail eMMC Controller
  mmc: sdhci: Preset value not supported in Baytrail eMMC
  mmc: MMC_USDHI6ROL0 should depend on HAS_DMA
  mmc: MMC_SH_MMCIF should depend on HAS_DMA
  ...
parents d429a363 c83c8737

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

+5 −12
Original line number Diff line number Diff line
@@ -46,13 +46,14 @@ Required Properties: 
      - if CIU clock divider value is 0 (that is divide by 1), both tx and rx

        phase shift clocks should be 0.



Required properties for a slot:

Required properties for a slot (Deprecated - Recommend to use one slot per host):



* gpios: specifies a list of gpios used for command, clock and data bus. The

  first gpio is the command line and the second gpio is the clock line. The

  rest of the gpios (depending on the bus-width property) are the data lines in

  no particular order. The format of the gpio specifier depends on the gpio

  controller.

(Deprecated - Refer to Documentation/devicetree/binding/pinctrl/samsung-pinctrl.txt)



Example:
@@ -69,21 +70,13 @@ Example: 


	dwmmc0@12200000 {

		num-slots = <1>;

		supports-highspeed;

		cap-mmc-highspeed;

		cap-sd-highspeed;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

			gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,

				<&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,

				<&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,

				<&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,

				<&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;

		};

	};

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

+5 −7
Original line number Diff line number Diff line
@@ -34,13 +34,11 @@ Example: 
		num-slots = <1>;

		vmmc-supply = <&ldo12>;

		fifo-depth = <0x100>;

		supports-highspeed;

		pinctrl-names = "default";

		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;

		slot@0 {

			reg = <0>;

		bus-width = <4>;

		disable-wp;

		cd-gpios = <&gpio10 3 0>;

		};

		cap-mmc-highspeed;

		cap-sd-highspeed;

	};

Documentation/devicetree/bindings/mmc/mmc.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ Optional properties: 
- cap-power-off-card: powering off the card is safe

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

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

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

- mmc-highspeed-ddr-1_2v: eMMC high-speed DDR mode(1.2V 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

- 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

Documentation/devicetree/bindings/mmc/renesas,mmcif.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* Renesas Multi Media Card Interface (MMCIF) Controller



This file documents differences between the core properties in mmc.txt

and the properties used by the MMCIF device.





Required properties:



- compatible: must contain one of the following

	- "renesas,mmcif-r8a7740" for the MMCIF found in r8a7740 SoCs

	- "renesas,mmcif-r8a7790" for the MMCIF found in r8a7790 SoCs

	- "renesas,mmcif-r8a7791" for the MMCIF found in r8a7791 SoCs

	- "renesas,sh-mmcif" for the generic MMCIF



- clocks: reference to the functional clock



- dmas: reference to the DMA channels, one per channel name listed in the

  dma-names property.

- dma-names: must contain "tx" for the transmit DMA channel and "rx" for the

  receive DMA channel.





Example: R8A7790 (R-Car H2) MMCIF0



	mmcif0: mmc@ee200000 {

		compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";

		reg = <0 0xee200000 0 0x80>;

		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7790_CLK_MMCIF0>;

		dmas = <&dmac0 0xd1>, <&dmac0 0xd2>;

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

	};

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

+4 −4
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ Example: 
		bus-width = <8>;

		non-removable;



		vmmc = <&pm8941_l20>;

		vqmmc = <&pm8941_s3>;

		vmmc-supply = <&pm8941_l20>;

		vqmmc-supply = <&pm8941_s3>;



		pinctrl-names = "default";

		pinctrl-0 = <&sdc1_clk &sdc1_cmd &sdc1_data>;
@@ -44,8 +44,8 @@ Example: 
		bus-width = <4>;

		cd-gpios = <&msmgpio 62 0x1>;



		vmmc = <&pm8941_l21>;

		vqmmc = <&pm8941_l13>;

		vmmc-supply = <&pm8941_l21>;

		vqmmc-supply = <&pm8941_l13>;



		pinctrl-names = "default";

		pinctrl-0 = <&sdc2_clk &sdc2_cmd &sdc2_data>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE