Commit 2d274536 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Improve RPMB frame handling code
   - Add support for a new max-sd-hs-hz DT property to limit frequency
   - Add support to manage regulator-under-voltage events
   - Support regulator-under-voltage for eMMC to mitigate data
     corruptions
   - Add mmc_read_tuning() to allow a host to validate its tuning
     sequence
   - Add some helpers to align checks for CMD23 support
   - Read the CCCR register for SDIO over SPI rather than the
     unsupported CMD7

  MMC host:
   - Add COMPILE_TEST option for a couple of drivers
   - Convert drivers to use the modern PM macros
   - dw_mmc-exynos: Enable support for the Exynos8890 variant
   - mmc_spi: Don't use crc ack during multiple block read
   - renesas_sdhi: Enable 64-bit polling mode for R-Car gen3 and
     RZ/G2L SoCs
   - rtsx_usb: Add support for over-current-protection
   - sdhci-cadence: Add support for multi-block read gap tuning
   - sdhci-msm:
       - Add support for tuning for SDR50 mode for SD cards
       - Enable support for the Lemans variant
   - sdhci-pci: Disable SD card clock before update for a few
     Intel platforms
   - sdhci-pxav3: Add support for UHS pinctrl settings
   - tmio: Add 64-bit read/write support in polling mode

  MEMSTICK:
   - Convert to use timeouts to prevent indefinite waiting
   - rtsx_usb: Add support for over-current-protection"

* tag 'mmc-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (77 commits)
  dt-bindings: mmc: samsung,exynos-dw-mshc: add specific compatible for exynos8890
  mmc: select REGMAP_MMIO with MMC_LOONGSON2
  mmc: add COMPILE_TEST to multiple drivers
  mmc: core: Improve RPMB frame handling code
  mmc: core: Fix variable shadowing in mmc_route_rpmb_frames()
  mmc: core: Parse and use the new max-sd-hs-hz DT property
  dt-bindings: mmc: controller: Add max-sd-hs-hz property
  mmc: sdhci-msm: Enable tuning for SDR50 mode for SD card
  dt-bindings: mmc: sdhci-msm: Document the Lemans compatible
  mmc: sh_mmcif: Remove dummy PM resume callback
  dt-bindings: mmc: sdhci-pxa: Add minItems to pinctrl-names
  mmc: sdio: Drop dev_pm_domain_detach() call
  mmc: dw_mmc-rockchip: use modern PM macros
  mmc: dw_mmc-pci: use modern PM macros
  mmc: dw_mmc-k3: use modern PM macros
  mmc: dw_mmc: exynos: use modern PM macros
  mmc: via-sdmmc: use modern PM macros
  mmc: sdhci-msm: use modern PM macros
  mmc: mtk-sd: use modern PM macros
  mmc: wmt-sdmmc: use modern PM macros
  ...
parents e93bcbaa 7aada81c

Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ required: 


allOf:

  - $ref: sdhci-common.yaml#

  - $ref: mmc-controller-common.yaml#



unevaluatedProperties: false

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

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ properties: 
    minimum: 400000

    maximum: 384000000



  max-sd-hs-hz:

    description: |

      Maximum frequency (in Hz) to be used for SD cards operating in

      High-Speed (HS) mode.

    minimum: 400000

    maximum: 50000000

    default: 50000000



  disable-wp:

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

    description:

Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
              - samsung,exynos5433-dw-mshc-smu

              - samsung,exynos7885-dw-mshc-smu

              - samsung,exynos850-dw-mshc-smu

              - samsung,exynos8890-dw-mshc-smu

              - samsung,exynos8895-dw-mshc-smu

          - const: samsung,exynos7-dw-mshc-smu

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ properties: 
              - qcom,qcs615-sdhci

              - qcom,qcs8300-sdhci

              - qcom,qdu1000-sdhci

              - qcom,sa8775p-sdhci

              - qcom,sar2130p-sdhci

              - qcom,sc7180-sdhci

              - qcom,sc7280-sdhci

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

+28 −3
Original line number Diff line number Diff line
@@ -44,12 +44,29 @@ allOf: 
          items:

            - const: default

            - const: state_cmd_gpio

        pinctrl-0:

          description:

            Should contain default pinctrl.

          minItems: 1



        pinctrl-1:

          description:

            Should switch CMD pin to GPIO mode as a high output.

  - if:

      properties:

        compatible:

          contains:

            const: mrvl,pxav3-mmc

    then:

      properties:

        pinctrl-names:

          description:

            Optional for increasing stability of the controller at fast bus clocks.

          items:

            - const: default

            - const: state_uhs

          minItems: 1



        pinctrl-1:

          description:

            Should switch the drive strength of the data pins to high.



properties:

  compatible:
@@ -82,6 +99,14 @@ properties: 
      - const: io

      - const: core



  pinctrl-names: true



  pinctrl-0:

    description:

      Should contain default pinctrl.



  pinctrl-1: true



  mrvl,clk-delay-cycles:

    description: Specify a number of cycles to delay for tuning.

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