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

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

Pull MMC updates from Ulf Hansson:

 - dt-bindings: Increase maximum supported frequency to 384MHz

 - dw_mmc-rockchip: Add support for the rk3128 variant

 - meson-gx: Add support for SDIO interrupts

 - mtk-sd: Add support for MT6795 Helio X10 variant

 - sdhci: Improve the code by centralizing the CMD/DATA reset handling

 - sdhci-msm:
     - Add support for the sdm670 variant
     - Add support for the sm6115 variant

 - sdhci-omap: Make Vignesh replace Kishon as the maintainer

 - sdhci-pci-o2micro: Disable fragile support for DDR50 in favor of
   SDR50

 - sdhci-sprd: Fix clock divider limitation

* tag 'mmc-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (31 commits)
  mmc: sdhci: Centralize CMD and DATA reset handling
  mmc: sdhci: Get rid of SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS
  mmc: sdhci: Remove misleading comment about resets
  mmc: sdhci: Separate out sdhci_reset_for_all()
  MAINTAINERS: Add Vignesh as maintainer of TI SDHCI OMAP DRIVER
  mmc: sdhci-msm: add compatible string check for sdm670
  dt-bindings: mmc: sdhci-msm: add sdm670 compatible
  mmc: wmt-sdmmc: Fix an error handling path in wmt_mci_probe()
  mmc: rtsx_usb_sdmmc: Remove the unneeded result variable
  mmc: sdhci-of-aspeed: Add dependency on ARCH_ASPEED
  mmc: mtk-sd: Add support for MT6795 Helio X10
  mmc: mtk-sd: Reorder of_device_id and platform data by name
  mmc: sdhci-sprd: Fix the limitation of div
  dt-bindings: mmc: sdhci-msm: Add pinctrl-1 property
  dt-bindings: mmc: rockchip: add rockchip,rk3128-dw-mshc
  dt-bindings: mmc: renesas,sdhi: Add iommus property
  mmc: sdhci_am654: Remove the unneeded result variable
  mmc: meson-gx: add SDIO interrupt support
  mmc: meson-gx: adjust and re-use constant IRQ_EN_MASK
  mmc: jz4740_mmc: Fix error check for dma_map_sg
  ...
parents ebcfaeec 178422c2

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ title: Cadence SD/SDIO/eMMC Host Controller (SD4HC) 


maintainers:

  - Masahiro Yamada <yamada.masahiro@socionext.com>

  - Piotr Sroka <piotrs@cadence.com>



allOf:

  - $ref: mmc-controller.yaml

Documentation/devicetree/bindings/mmc/mmc-controller.yaml

+10 −3
Original line number Diff line number Diff line
@@ -88,11 +88,18 @@ properties: 
    default: 1



  max-frequency:

    description:

      Maximum operating frequency of the bus.

    description: |

      Maximum operating frequency of the bus:

        - for eMMC, the maximum supported frequency is 200MHz,

        - for SD/SDIO cards the SDR104 mode has a max supported

          frequency of 208MHz,

        - some mmc host controllers do support a max frequency upto

          384MHz.

      So, lets keep the maximum supported value here.



    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 400000

    maximum: 200000000

    maximum: 384000000



  disable-wp:

    $ref: /schemas/types.yaml#/definitions/flag

Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ properties: 
  reg:

    maxItems: 1



  spi-max-frequency: true



  interrupts:

    maxItems: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
          - mediatek,mt2701-mmc

          - mediatek,mt2712-mmc

          - mediatek,mt6779-mmc

          - mediatek,mt6795-mmc

          - mediatek,mt7620-mmc

          - mediatek,mt7622-mmc

          - mediatek,mt8135-mmc

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

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ properties: 
        - tx

        - rx



  iommus:

    maxItems: 1



  power-domains:

    maxItems: 1