Commit 5bebe2c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Convert to sysfs_emit() in favor of sprintf()

   - Improve fallback to speed modes if eMMC HS200 fails

  MMC host:
   - dw_mmc: Allow variants to set minimal supported clock rate

   - dw-mmc-rockchip: Fix problems with invalid clock rates

   - litex_mmc: Add new DT based driver for the LiteX's LiteSDCard
     interface

   - litex_mmc: Add Gabriel Somlo and Joel Stanley as co-maintainers for
     LiteX

   - mtk-sd: Add support for the Mediatek MT8186 variant

   - renesas_sdhi: Add support for RZ/G2UL variant

   - renesas_sdhi: Add support for RZ/V2L variant

   - rtsx_pci: Adjust power-on sequence to conform to the SD spec

   - sdhci-am654: Add support for TI's AM62 variant

   - sdhci_am654: Fixup support for TI's AM64 variant

   - sdhci-esdhc-imx: Add support for the imx93 variant

   - sdhci-msm: Add support for the msm8953 variant

   - sdhci-pci-gli: Add support for runtime PM for the GL9763E variant

   - sdhci-pci-gli: Adjustments of the SSC function for the GL975x
     variants

   - sdhci-tegra: Add support for wake on SD card event

   - sunxi-mmc: Add support for Allwinner's F1c100s variant

   - sunxi-mmc: Add support for D1 MMC variant"

* tag 'mmc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (37 commits)
  dt-bindings: mmc: renesas,sdhi: Document RZ/G2UL SoC
  mmc: tmio: remove outdated members from host struct
  mmc: mtk-sd: Silence delay phase calculation debug log
  mmc: davinci_mmc: Handle error for clk_enable
  mmc: sdhci-pci-gli: Add runtime PM for GL9763E
  mmc: core: Drop HS400 caps unless 8-bit bus is supported too
  mmc: host: Return an error when ->enable_sdio_irq() ops is missing
  mmc: core: Improve fallback to speed modes if eMMC HS200 fails
  dt-bindings: mmc: sunxi: add Allwinner F1c100s compatible
  mmc: dw-mmc-rockchip: Fix handling invalid clock rates
  mmc: dw_mmc: Support setting f_min from host drivers
  mmc: host: Drop commas after SoC match table sentinels
  mmc: rtsx: add 74 Clocks in power on flow
  dt-bindings: mmc: renesas,sdhi: Document RZ/V2L SoC
  mmc: sh_mmcif: Simplify division/shift logic
  mmc: sdhci_am654: Add Support for TI's AM62 SoC
  dt-bindings: mmc: imx-esdhc: Add imx93 compatible string
  dt-bindings: mmc: sdhci-am654: Add compatible string for AM62 SoC
  mmc: sdhci_am654: Fix the driver data of AM64 SoC
  mmc: core: use sysfs_emit() instead of sprintf()
  ...
parents c7d4b153 dc3d879c

Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - const: allwinner,sun7i-a20-mmc

      - const: allwinner,sun8i-a83t-emmc

      - const: allwinner,sun9i-a80-mmc

      - const: allwinner,sun20i-d1-mmc

      - const: allwinner,sun50i-a64-emmc

      - const: allwinner,sun50i-a64-mmc

      - const: allwinner,sun50i-a100-emmc
@@ -49,12 +50,18 @@ properties: 
      - items:

          - const: allwinner,sun50i-h6-mmc

          - const: allwinner,sun50i-a64-mmc

      - items:

          - const: allwinner,sun20i-d1-emmc

          - const: allwinner,sun50i-a100-emmc

      - items:

          - const: allwinner,sun50i-h616-emmc

          - const: allwinner,sun50i-a100-emmc

      - items:

          - const: allwinner,sun50i-h616-mmc

          - const: allwinner,sun50i-a100-mmc

      - items:

          - const: allwinner,suniv-f1c100s-mmc

          - const: allwinner,sun7i-a20-mmc



  reg:

    maxItems: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ properties: 
          - const: fsl,imx7d-usdhc

      - items:

          - enum:

              - fsl,imx93-usdhc

              - fsl,imx8ulp-usdhc

          - const: fsl,imx8mm-usdhc

Documentation/devicetree/bindings/mmc/litex,mmc.yaml

0 → 100644
+78 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/mmc/litex,mmc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: LiteX LiteSDCard device



maintainers:

  - Gabriel Somlo <gsomlo@gmail.com>



description: |

  LiteSDCard is a small footprint, configurable SDCard core for FPGA based

  system on chips.



  The hardware source is Open Source and can be found on at

  https://github.com/enjoy-digital/litesdcard/.



allOf:

  - $ref: mmc-controller.yaml#



properties:

  compatible:

    const: litex,mmc



  reg:

    items:

      - description: PHY registers

      - description: CORE registers

      - description: DMA Reader buffer

      - description: DMA Writer buffer

      - description: IRQ registers

    minItems: 4



  reg-names:

    items:

      - const: phy

      - const: core

      - const: reader

      - const: writer

      - const: irq

    minItems: 4



  clocks:

    maxItems: 1

    description:

      Handle to reference clock.



  vmmc-supply:

    description:

      Handle to fixed-voltage supply for the card power.



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - vmmc-supply



additionalProperties: false



examples:

  - |

    mmc: mmc@12005000 {

        compatible = "litex,mmc";

        reg = <0x12005000 0x100>,

              <0x12003800 0x100>,

              <0x12003000 0x100>,

              <0x12004800 0x100>,

              <0x12004000 0x100>;

        reg-names = "phy", "core", "reader", "writer", "irq";

        clocks = <&reference_clk>;

        vmmc-supply = <&vreg_mmc>;

        interrupts = <4>;

    };

Documentation/devicetree/bindings/mmc/mtk-sd.yaml

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ properties: 
      - items:

          - const: mediatek,mt7623-mmc

          - const: mediatek,mt2701-mmc

      - items:

          - const: mediatek,mt8186-mmc

          - const: mediatek,mt8183-mmc

      - items:

          - const: mediatek,mt8192-mmc

          - const: mediatek,mt8183-mmc

Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml

+6 −1
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ properties: 
              - renesas,sdhi-r8a77990  # R-Car E3

              - renesas,sdhi-r8a77995  # R-Car D3

              - renesas,sdhi-r8a779a0  # R-Car V3U

              - renesas,sdhi-r9a07g043 # RZ/G2UL

              - renesas,sdhi-r9a07g044 # RZ/G2{L,LC}

              - renesas,sdhi-r9a07g054 # RZ/V2L

          - const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2



  reg:
@@ -107,7 +109,10 @@ allOf: 
      properties:

        compatible:

          contains:

            const: renesas,sdhi-r9a07g044

            enum:

              - renesas,sdhi-r9a07g043

              - renesas,sdhi-r9a07g044

              - renesas,sdhi-r9a07g054

    then:

      properties:

        clocks: