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

Commit 07f00f06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - A couple of changes to improve the support for erase/discard/trim cmds
   - Add eMMC HS400 enhanced strobe support
   - Show OCR and DSR registers in SYSFS for MMC/SD cards
   - Correct and improve busy detection logic for MMC switch (CMD6) cmds
   - Disable HPI cmds for certain broken Hynix eMMC cards
   - Allow MMC hosts to specify non-support for SD and MMC cmds
   - Some minor additional fixes

  MMC host:
   - sdhci: Re-works, fixes and clean-ups
   - sdhci: Add HW auto re-tuning support
   - sdhci: Re-factor code to prepare for adding support for eMMC CMDQ
   - sdhci-esdhc-imx: Fixes and clean-ups
   - sdhci-esdhc-imx: Update system PM support
   - sdhci-esdhc-imx: Enable HW auto re-tuning
   - sdhci-bcm2835: Remove driver as sdhci-iproc is used instead
   - sdhci-brcmstb: Add new driver for Broadcom BRCMSTB SoCs
   - sdhci-msm: Add support for UHS cards
   - sdhci-tegra: Improve support for UHS cards
   - sdhci-of-arasan: Update phy support for Rockchip SoCs
   - sdhci-of-arasan: Deploy enhanced strobe support
   - dw_mmc: Some fixes and clean-ups
   - dw_mmc: Enable support for erase/discard/trim cmds
   - dw_mmc: Enable CMD23 support
   - mediatek: Some fixes related to the eMMC HS400 support
   - sh_mmcif: Improve support for HW busy detection
   - rtsx_pci: Enable support for erase/discard/trim cmds"

* tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc: (135 commits)
  mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue
  mmc: rtsx_pci: Enable MMC_CAP_ERASE to allow erase/discard/trim requests
  mmc: rtsx_pci: Use the provided busy timeout from the mmc core
  mmc: sdhci-pltfm: Drop define for SDHCI_PLTFM_PMOPS
  mmc: sdhci-pltfm: Convert to use the SET_SYSTEM_SLEEP_PM_OPS
  mmc: sdhci-pltfm: Make sdhci_pltfm_suspend|resume() static
  mmc: sdhci-esdhc-imx: Use common sdhci_suspend|resume_host()
  mmc: sdhci-esdhc-imx: Assign system PM ops within #ifdef CONFIG_PM_SLEEP
  mmc: sdhci-sirf: Remove non needed #ifdef CONFIG_PM* for dev_pm_ops
  mmc: sdhci-s3c: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
  mmc: sdhci-pxav3: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
  mmc: sdhci-of-esdhc: Simplify code by using SIMPLE_DEV_PM_OPS
  mmc: sdhci-acpi: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
  mmc: sdhci-pci-core: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
  mmc: Change the max discard sectors and erase response when HW busy detect
  phy: rockchip-emmc: Wait even longer for the DLL to lock
  phy: rockchip-emmc: Be tolerant to card clock of 0 in power on
  mmc: sdhci-of-arasan: Revert: Always power the PHY off/on when clock changes
  mmc: sdhci-msm: Add support for UHS cards
  mmc: sdhci-msm: Add set_uhs_signaling() implementation
  ...
parents 27acbec3 6ea62579

Documentation/devicetree/bindings/mmc/arasan,sdhci.txt

+33 −2
Original line number Diff line number Diff line
@@ -9,8 +9,12 @@ Device Tree Bindings for the Arasan SDHCI Controller 
  [4] Documentation/devicetree/bindings/phy/phy-bindings.txt



Required Properties:

  - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a' or

                'arasan,sdhci-4.9a' or 'arasan,sdhci-5.1'

  - compatible: Compatibility string.  One of:

    - "arasan,sdhci-8.9a": generic Arasan SDHCI 8.9a PHY

    - "arasan,sdhci-4.9a": generic Arasan SDHCI 4.9a PHY

    - "arasan,sdhci-5.1": generic Arasan SDHCI 5.1 PHY

    - "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1": rk3399 eMMC PHY

      For this device it is strongly suggested to include arasan,soc-ctl-syscon.

  - reg: From mmc bindings: Register location and length.

  - clocks: From clock bindings: Handles to clock inputs.

  - clock-names: From clock bindings: Tuple including "clk_xin" and "clk_ahb"
@@ -22,6 +26,17 @@ Required Properties for "arasan,sdhci-5.1": 
  - phys: From PHY bindings: Phandle for the Generic PHY for arasan.

  - phy-names:  MUST be "phy_arasan".



Optional Properties:

  - arasan,soc-ctl-syscon: A phandle to a syscon device (see ../mfd/syscon.txt)

    used to access core corecfg registers.  Offsets of registers in this

    syscon are determined based on the main compatible string for the device.

  - clock-output-names: If specified, this will be the name of the card clock

    which will be exposed by this device.  Required if #clock-cells is

    specified.

  - #clock-cells: If specified this should be the value <0>.  With this property

    in place we will export a clock representing the Card Clock.  This clock

    is expected to be consumed by our PHY.  You must also specify



Example:

	sdhci@e0100000 {

		compatible = "arasan,sdhci-8.9a";
@@ -42,3 +57,19 @@ Example: 
		phys = <&emmc_phy>;

		phy-names = "phy_arasan";

	} ;



	sdhci: sdhci@fe330000 {

		compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1";

		reg = <0x0 0xfe330000 0x0 0x10000>;

		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>;

		clock-names = "clk_xin", "clk_ahb";

		arasan,soc-ctl-syscon = <&grf>;

		assigned-clocks = <&cru SCLK_EMMC>;

		assigned-clock-rates = <200000000>;

		clock-output-names = "emmc_cardclock";

		phys = <&emmc_phy>;

		phy-names = "phy_arasan";

		#clock-cells = <0>;

		status = "disabled";

	};

Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
Broadcom BCM2835 SDHCI controller



This file documents differences between the core properties described

by mmc.txt and the properties that represent the BCM2835 controller.



Required properties:

- compatible : Should be "brcm,bcm2835-sdhci".

- clocks : The clock feeding the SDHCI controller.



Example:



sdhci: sdhci {

	compatible = "brcm,bcm2835-sdhci";

	reg = <0x7e300000 0x100>;

	interrupts = <2 30>;

	clocks = <&clk_mmc>;

	bus-width = <4>;

};

Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* BROADCOM BRCMSTB/BMIPS SDHCI Controller



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

and the properties used by the sdhci-brcmstb driver.



NOTE: The driver disables all UHS speed modes by default and depends

on Device Tree properties to enable them for SoC/Board combinations

that support them.



Required properties:

- compatible: "brcm,bcm7425-sdhci"



Refer to clocks/clock-bindings.txt for generic clock consumer properties.



Example:



	sdhci@f03e0100 {

		compatible = "brcm,bcm7425-sdhci";

		reg = <0xf03e0000 0x100>;

		interrupts = <0x0 0x26 0x0>;

		sdhci,auto-cmd12;

		clocks = <&sw_sdio>;

		sd-uhs-sdr50;

		sd-uhs-ddr50;

	};



	sdhci@f03e0300 {

		non-removable;

		bus-width = <0x8>;

		compatible = "brcm,bcm7425-sdhci";

		reg = <0xf03e0200 0x100>;

		interrupts = <0x0 0x27 0x0>;

		sdhci,auto-cmd12;

		clocks = <sw_sdio>;

		mmc-hs200-1_8v;

	};

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ Optional properties: 
  transparent level shifters on the outputs of the controller. Two cells are

  required, first cell specifies minimum slot voltage (mV), second cell

  specifies maximum slot voltage (mV). Several ranges could be specified.

- fsl,tuning-start-tap: Specify the start dealy cell point when send first CMD19

  in tuning procedure.

- fsl,tuning-step: Specify the increasing delay cell steps in tuning procedure.

  The uSDHC use one delay cell as default increasing step to do tuning process.

  This property allows user to change the tuning step to more than one delay

Documentation/devicetree/bindings/mmc/mmc.txt

+4 −0
Original line number Diff line number Diff line
@@ -46,8 +46,12 @@ Optional properties: 
- 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

- mmc-hs400-enhanced-strobe: eMMC HS400 enhanced strobe mode is supported

- dsr: Value the card's (optional) Driver Stage Register (DSR) should be

  programmed with. Valid range: [0 .. 0xffff].

- no-sdio: controller is limited to send sdio cmd during initialization

- no-sd: controller is limited to send sd cmd during initialization

- no-mmc: controller is limited to send mmc cmd during initialization



*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"