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

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Allow more host caps to be modified through debugfs
   - Skip to set the default 200mA SD current limit

  MMC host:
   - Convert a few more DT bindings to the DT schema
   - dw_mmc: Add Shawn Lin as co-maintainer for the dw_mmc drivers
   - dw_mmc-rockchip:
       - Add memory clock auto-gating support
       - Add support for the RK3506 variant
   - meson-mx-sdio:
       - Ignore disabled "mmc-slot" child-nodes
       - Refactoring and general code improvements
   - renesas_sdhi:
       - Enable bigger data ports where available
       - Manage reset in probe and during system-wide suspend/resume
   - sdhci-brcmstb:
       - Add support for the BCM72116 and BCM74371 variants
       - Save/restore registers during system-wide suspend/resume
   - sdhci-msm:
       - Add support for the sm8750 and the Kaanapali variants
       - Avoid early clock doubling during HS400 transition
   - sdhci-of-dwcmshc:
       - Add command queue support for Rockchip SOCs
       - Add support for the Eswin EIC7700 variant"

* tag 'mmc-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (40 commits)
  mmc: sdhci-of-dwcmshc: reduce CIT for better performance
  mmc: sdhci-of-dwcmshc: Disable internal clock auto gate for Rockchip SOCs
  mmc: sdhci-msm: Avoid early clock doubling during HS400 transition
  MAINTAINERS: Add Shawn Lin as co-maintainer for dw_mmc drivers
  mmc: sdhci-of-dwcmshc: Fix command queue support for RK3576
  mmc: renesas_sdhi: Add suspend/resume hooks
  mmc: renesas_sdhi: Switch to SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() and pm_ptr()
  mmc: renesas_sdhi: Deassert the reset signal on probe
  dt-bindings: mmc: am654: Simplify dma-coherent property
  mmc: meson-mx-sdio: Ignore disabled "mmc-slot" child-nodes
  mmc: meson-mx-sdio: Fix indentation in meson_mx_mmc_irq_thread()
  mmc: meson-mx-sdio: Use dev_err_probe() where appropriate
  mmc: meson-mx-sdio: Use devm_mmc_alloc_host() helper
  mmc: meson-mx-sdio: Refactor internal clock initialization
  mmc: meson-mx-sdio: Use devm_clk_get_enabled()
  mmc: meson-mx-sdio: Switch to regmap for register access
  mmc: core: add WQ_PERCPU to alloc_workqueue users
  mmc: dw_mmc-rockchip: Add memory clock auto-gating support
  mmc: omap: add WQ_PERCPU to alloc_workqueue users
  mmc: mtk-sd: replace use of system_wq with system_percpu_wq
  ...
parents 52206f82 79cf71c0

Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml

+2 −0
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ properties: 
      - items:

          - enum:

              - brcm,bcm2712-sdhci

              - brcm,bcm72116-sdhci

              - brcm,bcm74165b0-sdhci

              - brcm,bcm7445-sdhci

              - brcm,bcm7425-sdhci

              - brcm,bcm74371-sdhci

          - const: brcm,sdhci-brcmstb



  reg:

Documentation/devicetree/bindings/mmc/davinci_mmc.txt

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
* TI Highspeed MMC host controller for DaVinci



The Highspeed MMC Host Controller on TI DaVinci family

provides an interface for MMC, SD and SDIO types of memory cards.



This file documents the properties used by the davinci_mmc driver.



Required properties:

- compatible:

 Should be "ti,da830-mmc": for da830, da850, dm365

 Should be "ti,dm355-mmc": for dm355, dm644x



Optional properties:

- bus-width: Number of data lines, can be <1>, <4>, or <8>, default <1>

- max-frequency: Maximum operating clock frequency, default 25MHz.

- dmas: List of DMA specifiers with the controller specific format

	as described in the generic DMA client binding. A tx and rx

	specifier is required.

- dma-names: RX and TX  DMA request names. These strings correspond

	1:1 with the DMA specifiers listed in dmas.



Example:

mmc0: mmc@1c40000 {

	compatible = "ti,da830-mmc",

	reg = <0x40000 0x1000>;

	interrupts = <16>;

	bus-width = <4>;

	max-frequency = <50000000>;

	dmas = <&edma 16

		&edma 17>;

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

};

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ properties: 
              - rockchip,rk3328-dw-mshc

              - rockchip,rk3368-dw-mshc

              - rockchip,rk3399-dw-mshc

              - rockchip,rk3506-dw-mshc

              - rockchip,rk3528-dw-mshc

              - rockchip,rk3562-dw-mshc

              - rockchip,rk3568-dw-mshc

Documentation/devicetree/bindings/mmc/sdhci-am654.yaml

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ properties: 
      - const: clk_ahb

      - const: clk_xin



  dma-coherent:

    type: boolean

  dma-coherent: true



  # PHY output tap delays:

  # Used to delay the data valid window and align it to the sampling clock.

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

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
* SOCIONEXT Milbeaut SDHCI controller



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

and the properties used by the sdhci_milbeaut driver.



Required properties:

- compatible: "socionext,milbeaut-m10v-sdhci-3.0"

- clocks: Must contain an entry for each entry in clock-names. It is a

  list of phandles and clock-specifier pairs.

  See ../clocks/clock-bindings.txt for details.

- clock-names: Should contain the following two entries:

	"iface" - clock used for sdhci interface

	"core"  - core clock for sdhci controller



Optional properties:

- fujitsu,cmd-dat-delay-select: boolean property indicating that this host

  requires the CMD_DAT_DELAY control to be enabled.



Example:

	sdhci3: mmc@1b010000 {

		compatible = "socionext,milbeaut-m10v-sdhci-3.0";

		reg = <0x1b010000 0x10000>;

		interrupts = <0 265 0x4>;

		voltage-ranges = <3300 3300>;

		bus-width = <4>;

		clocks = <&clk 7>, <&ahb_clk>;

		clock-names = "core", "iface";

		cap-sdio-irq;

		fujitsu,cmd-dat-delay-select;

	};