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

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Allow an invalid regulator in mmc_regulator_set_ocr()
   - Log about empty non-removable slots
   - Add helpers to enable/disable the vqmmc regulator

  MMC host:
   - mtk-sd: Add support for the mt8365 variant
   - renesas_sdhi: Remove support for R-Car H3 ES1.* variants
   - sdhci_am654: Add power management support
   - sdhci-cadence: Add support for eMMC hardware reset
   - sdhci-cadence: Add support for AMD Pensando Elba variant
   - sdhci-msm: Add support for the IPQ5018 variant
   - sdhci-msm: Add support for the QCM2290 variant
   - sdhci-of-arasan: Skip setting clock delay for 400KHz
   - sdhci-of-arasan: Add support for the Xilinx Versal Net variant
   - sdhci-of-arasan: Remove Intel Thunder Bay SOC support
   - sdhci-of-arasan: Add support to request the "gate" clock
   - sdhci-of-dwcmshc: Properly determine max clock on Rockchip
   - sdhci-of-esdhc: Fix quirk to ignore command inhibit for data
   - sdhci-pci-o2micro: Fix SDR50 mode timing issue

  MEMSTICK:
   - r592: Fix use-after-free bug in r592_remove due to race condition"

* tag 'mmc-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (40 commits)
  dt-bindings: mmc: sdhci-msm: Document the IPQ5018 compatible
  mmc: vub300: remove unreachable code
  mmc: sdhci-cadence: Support mmc hardware reset
  mmc: sdhci-cadence: Add AMD Pensando Elba SoC support
  mmc: sdhci-cadence: Support device specific init during probe
  mmc: sdhci-cadence: Enable device specific override of writel()
  dt-bindings: mmc: cdns: Add AMD Pensando Elba SoC
  mmc: core: Remove unused macro mmc_req_rel_wr
  mmc: sdhci-of-arasan: Skip setting clock delay for 400KHz
  mmc: sdhci-of-arasan: Add support for eMMC5.1 on Xilinx Versal Net platform
  dt-bindings: mmc: arasan,sdci: Add Xilinx Versal Net compatible
  mmc: sdhci_am654: Add support for PM suspend/resume
  mmc: core: remove unnecessary (void*) conversions
  dt-bindings: mmc: fsl-imx-esdhc: ref sdhci-common.yaml
  mmc: sdhci-of-esdhc: fix quirk to ignore command inhibit for data
  mmc: core: Log about empty non-removable slots
  dt-bindings: mmc: fujitsu: Add Socionext Synquacer
  mmc: sdricoh_cs: remove unused sdricoh_readw function
  dt-bindings: mmc: Remove bindings for Intel Thunder Bay SoC"
  mmc: sdhci-of-arasan: Remove Intel Thunder Bay SOC support
  ...
parents eb8322d7 22a4455e

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

+5 −25
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ allOf: 
            enum:

              - xlnx,zynqmp-8.9a

              - xlnx,versal-8.9a

              - xlnx,versal-net-emmc

    then:

      properties:

        clock-output-names:
@@ -62,6 +63,10 @@ properties: 
        description:

          For this device it is strongly suggested to include

          clock-output-names and '#clock-cells'.

      - const: xlnx,versal-net-emmc     # Versal Net eMMC PHY

        description:

          For this device it is strongly suggested to include

          clock-output-names and '#clock-cells'.

      - items:

          - const: intel,lgm-sdhci-5.1-emmc     # Intel LGM eMMC PHY

          - const: arasan,sdhci-5.1
@@ -88,12 +93,6 @@ properties: 
        description:

          For this device it is strongly suggested to include

          arasan,soc-ctl-syscon.

      - items:

          - const: intel,thunderbay-sdhci-5.1   # Intel Thunder Bay eMMC PHY

          - const: arasan,sdhci-5.1

        description:

          For this device it is strongly suggested to include

          clock-output-names and '#clock-cells'.



  reg:

    maxItems: 1
@@ -309,22 +308,3 @@ examples: 
                   <&scmi_clk KEEM_BAY_PSS_SD0>;

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

    };
 


  - |

    #define EMMC_XIN_CLK

    #define EMMC_AXI_CLK

    #define TBH_PSS_EMMC_RST_N

    mmc@80420000 {

          compatible = "intel,thunderbay-sdhci-5.1", "arasan,sdhci-5.1";

          interrupts = <GIC_SPI 714 IRQ_TYPE_LEVEL_HIGH>;

          reg = <0x80420000 0x400>;

          clocks = <&scmi_clk EMMC_XIN_CLK>,

                   <&scmi_clk EMMC_AXI_CLK>;

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

          phys = <&emmc_phy>;

          phy-names = "phy_arasan";

          assigned-clocks = <&scmi_clk EMMC_XIN_CLK>;

          clock-output-names = "emmc_cardclock";

          resets = <&rst_pss1 TBH_PSS_EMMC_RST_N>;

          #clock-cells = <0x0>;

    };

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

+23 −4
Original line number Diff line number Diff line
@@ -9,19 +9,18 @@ title: Cadence SD/SDIO/eMMC Host Controller (SD4HC) 
maintainers:

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



allOf:

  - $ref: mmc-controller.yaml



properties:

  compatible:

    items:

      - enum:

          - amd,pensando-elba-sd4hc

          - microchip,mpfs-sd4hc

          - socionext,uniphier-sd4hc

      - const: cdns,sd4hc



  reg:

    maxItems: 1

    minItems: 1

    maxItems: 2



  interrupts:

    maxItems: 1
@@ -120,6 +119,26 @@ required: 
  - interrupts

  - clocks



allOf:

  - $ref: mmc-controller.yaml

  - if:

      properties:

        compatible:

          contains:

            const: amd,pensando-elba-sd4hc

    then:

      properties:

        reg:

          items:

            - description: Host controller registers

            - description: Elba byte-lane enable register for writes

      required:

        - resets

    else:

      properties:

        reg:

          maxItems: 1



unevaluatedProperties: false



examples:

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Shawn Guo <shawnguo@kernel.org>



allOf:

  - $ref: mmc-controller.yaml

  - $ref: sdhci-common.yaml#



description: |

  The Enhanced Secure Digital Host Controller on Freescale i.MX family

Documentation/devicetree/bindings/mmc/fujitsu,sdhci-fujitsu.yaml

+12 −3
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - items:

          - const: socionext,synquacer-sdhci

          - const: fujitsu,mb86s70-sdhci-3.0

      - enum:

          - fujitsu,mb86s70-sdhci-3.0

          - socionext,f-sdh30-e51-mmc
@@ -29,6 +33,11 @@ properties: 
      - const: iface

      - const: core



  dma-coherent: true



  interrupts:

    maxItems: 2



  resets:

    maxItems: 1

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

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

              - mediatek,mt8192-mmc

              - mediatek,mt8195-mmc

              - mediatek,mt8365-mmc

          - const: mediatek,mt8183-mmc



  reg: