Commit 647412da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Export SDIO revision and info strings to userspace
   - Add support for specifying mmc/mmcblk index via mmc aliases in DT

 MMC host:
   - Enable support for async probe for all mmc host drivers
   - Enable compile testing of multiple host drivers
   - dw_mmc: Enable the Synopsys DesignWare driver for RISCV and CSKY
   - mtk-sd: Fixup support for CQHCI
   - owl-mmc: Add support for the actions,s700-mmc variant
   - renesas_sdhi: Fix regression (temporary) for re-insertion of SD cards
   - renesas_sdhi: Add support for the r8a774e1 variant
   - renesas_sdhi/tmio: Improvements for tunings
   - renesas_sdhi/tmio: Rework support for reset of controller
   - sdhci-acpi: Fix HS400 tuning for devices with invalid presets on AMDI0040
   - sdhci_am654: Improve support for tunings
   - sdhci_am654: Add support for input tap delays
   - sdhci_am654: Add workaround for card detect debounce timer
   - sdhci-am654: Add support for the TI's J7200 variants
   - sdhci-esdhc-imx: Fix support for manual tuning
   - sdhci-iproc: Enable support for eMMC DDR 3.3V for bcm2711
   - sdhci-msm: Fix stability issues with HS400 for sc7180
   - sdhci-of-sparx5: Add Sparx5 SoC eMMC driver
   - sdhci-of-esdhc: Fixup reference clock source selection
   - sdhci-pci: Add LTR support for some Intel BYT controllers
   - sdhci-pci-gli: Add CQHCI Support for GL9763E"

* tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (91 commits)
  mmc: sdhci_am654: Fix module autoload
  mmc: renesas_sdhi: workaround a regression when reinserting SD cards
  mmc: sdhci-pci-gli: Add CQHCI Support for GL9763E
  mmc: sdhci-acpi: AMDI0040: Set SDHCI_QUIRK2_PRESET_VALUE_BROKEN
  mmc: sdhci_am654: Enable tuning for SDR50
  mmc: sdhci_am654: Add support for software tuning
  mmc: sdhci_am654: Add support for input tap delay
  mmc: sdhci_am654: Fix hard coded otap delay array size
  dt-bindings: mmc: sdhci-am654: Add documentation for input tap delay
  dt-bindings: mmc: sdhci-am654: Convert sdhci-am654 controller documentation to json schema
  mmc: sdhci-of-esdhc: fix reference clock source selection
  mmc: host: fix depends for MMC_MESON_GX w/ COMPILE_TEST
  mmc: sdhci-s3c: hide forward declaration of of_device_id behind CONFIG_OF
  mmc: sdhci: fix indentation mistakes
  mmc: moxart: remove unneeded check for drvdata
  mmc: renesas_sdhi: drop local flag for tuning
  mmc: rtsx_usb_sdmmc: simplify the return expression of sd_change_phase()
  mmc: core: document mmc_hw_reset()
  mmc: mediatek: Drop pointer to mmc_host from msdc_host
  dt-bindings: mmc: owl: add compatible string actions,s700-mmc
  ...
parents dfef313e 1e23400f

Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ examples: 
    };



    mmc@5b010000 {

        compatible = "fsl,imx8qxp-usdhc";

        compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc";

        interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;

        reg = <0x5b010000 0x10000>;

        clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>,

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

+20 −17
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ description: | 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - fsl,imx25-esdhc

          - fsl,imx35-esdhc

          - fsl,imx51-esdhc
@@ -32,12 +33,14 @@ properties: 
          - fsl,imx6ull-usdhc

          - fsl,imx7d-usdhc

          - fsl,imx7ulp-usdhc

      - fsl,imx8mq-usdhc

      - items:

          - enum:

              - fsl,imx8mm-usdhc

              - fsl,imx8mn-usdhc

              - fsl,imx8mp-usdhc

      - fsl,imx8qm-usdhc

              - fsl,imx8mq-usdhc

              - fsl,imx8qxp-usdhc

          - const: fsl,imx7d-usdhc



  reg:

    maxItems: 1

Documentation/devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/mmc/microchip,dw-sparx5-sdhci.yaml#

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



title: Microchip Sparx5 Mobile Storage Host Controller Binding



allOf:

  - $ref: "mmc-controller.yaml"



maintainers:

  - Lars Povlsen <lars.povlsen@microchip.com>



# Everything else is described in the common file

properties:

  compatible:

    const: microchip,dw-sparx5-sdhci



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1

    description:

      Handle to "core" clock for the sdhci controller.



  clock-names:

    items:

      - const: core



  microchip,clock-delay:

    description: Delay clock to card to meet setup time requirements.

      Each step increase by 1.25ns.

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

    minimum: 1

    maximum: 15



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/microchip,sparx5.h>

    sdhci0: mmc@600800000 {

        compatible = "microchip,dw-sparx5-sdhci";

        reg = <0x00800000 0x1000>;

        pinctrl-0 = <&emmc_pins>;

        pinctrl-names = "default";

        clocks = <&clks CLK_ID_AUX1>;

        clock-names = "core";

        assigned-clocks = <&clks CLK_ID_AUX1>;

        assigned-clock-rates = <800000000>;

        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;

        bus-width = <8>;

        microchip,clock-delay = <10>;

    };

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ description: | 
  that requires the respective functionality should implement them using

  these definitions.



  It is possible to assign a fixed index mmcN to an MMC host controller

  (and the corresponding mmcblkN devices) by defining an alias in the

  /aliases device tree node.



properties:

  $nodename:

    pattern: "^mmc(@.*)?$"

Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml

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


  reset-gpios:

    minItems: 1

    # Put some limit to avoid false warnings

    maxItems: 32

    description:

      contains a list of GPIO specifiers. The reset GPIOs are asserted

      at initialization and prior we start the power up procedure of the card.