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

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Extend slot-gpio to be used for host specific card detect interrupts
   - Align to common busy polling behaviour for mmc ioctls
   - Suggest the BFQ I/O scheduler to be built along with MMC/SD support
   - Add devm_mmc_alloc_host() to enable further cleanups in host drivers

  MMC host:
   - atmel-mci: Fix race condition when stopping/starting a command
   - dw_mmc-starfive: Add new driver to support the StarFive JH7110 variant
   - dw_mmc-rockchip: Add support for the RK3588 variant
   - jz4740: Add support for the vqmmc power supply
   - meson-gx: Convert the DT bindings to the dt-schema
   - meson-gx: Enable the platform interrupt to be used for card detect
   - moxart: Set the supported maximum request/block/segment sizes
   - renesas,sdhi: Add support for the RZ/V2M variants
   - sdhci: Rework code to drop SDHCI_QUIRK_MISSING_CAPS
   - sdhci-esdhc-imx: Improve tuning logic support
   - sdhci-msm: Add support for the IPQ5332 and the IPQ9574 variants
   - sdhci-of-dwcmshc: Add the missing device table IDs for acpi
   - sdhci-of-dwcmshc: Improve clock support for the Rockchip variant
   - sdhci-of-dwcmshc: Enable support of V4 host for the BlueField-3 variant
   - sdhci-pxav2: Add support for the PXA168 V1 variant
   - sdhci-pxav2: Add support for SDIO IRQs for the PXA168 V1 variant
   - uniphier-sd: Add support for SD UHS-I speed modes"

* tag 'mmc-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (59 commits)
  mmc: meson-gx: Use devm_platform_get_and_ioremap_resource()
  mmc: meson-gx: constify member data of struct meson_host
  mmc: meson-gx: use devm_clk_get_enabled() for core clock
  mmc: core: fix return value check in devm_mmc_alloc_host()
  dt-bindings: mmc: meson-gx: fix interrupt binding
  mmc: meson-gx: support platform interrupt as card detect interrupt
  dt-bindings: mmc: meson-gx: support specifying cd interrupt
  mmc: core: support setting card detect interrupt from drivers
  mmc: starfive: Add sdio/emmc driver support
  dt-bindings: mmc: Add StarFive MMC module
  dt-bindings: mmc: sdhci-msm: Allow 1 icc path
  dt-bindings: mmc: rockchip-dw-mshc: Add RK3588 compatible string
  mmc: core: Align to common busy polling behaviour for mmc ioctls
  dt-bindings: mmc: Add resets property to cadence SDHCI binding
  mmc: meson-gx: remove meson_mmc_get_cd
  mmc: moxart: set maximum request/block/segment sizes
  mmc: sdhci-brcmstb: Use devm_platform_get_and_ioremap_resource()
  mmc: sdhci-of-dwcmshc: add the missing device table IDs for acpi
  mmc: sdhci-of-dwcmshc: Update DLL and pre-change delay for rockchip platform
  mmc: jz4740: Add support for vqmmc power supply
  ...
parents 6ffb575b 571f2351

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

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Allwinner A10 MMC Controller



allOf:

  - $ref: "mmc-controller.yaml"

  - $ref: mmc-controller.yaml



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml

0 → 100644
+76 −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/amlogic,meson-gx-mmc.yaml#

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



title: Amlogic SD / eMMC controller for S905/GXBB family SoCs



description:

  The MMC 5.1 compliant host controller on Amlogic provides the

  interface for SD, eMMC and SDIO devices



maintainers:

  - Neil Armstrong <neil.armstrong@linaro.org>



allOf:

  - $ref: mmc-controller.yaml#



properties:

  compatible:

    oneOf:

      - const: amlogic,meson-axg-mmc

      - items:

          - const: amlogic,meson-gx-mmc

          - const: amlogic,meson-gxbb-mmc



  reg:

    maxItems: 1



  interrupts:

    minItems: 1

    items:

      - description: mmc controller instance

      - description: card detect



  clocks:

    maxItems: 3



  clock-names:

    items:

      - const: core

      - const: clkin0

      - const: clkin1



  resets:

    maxItems: 1



  amlogic,dram-access-quirk:

    type: boolean

    description:

      set when controller's internal DMA engine cannot access the DRAM memory,

      like on the G12A dedicated SDIO controller.



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - resets



unevaluatedProperties: false



examples:

  - |

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

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

    mmc@70000 {

        compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

        reg = <0x70000 0x2000>;

        interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

        clocks = <&clk_mmc>, <&xtal>, <&clk_div>;

        clock-names = "core", "clkin0", "clkin1";

        pinctrl-0 = <&emm_pins>;

        resets = <&reset_mmc>;

    };

Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
Amlogic SD / eMMC controller for S905/GXBB family SoCs



The MMC 5.1 compliant host controller on Amlogic provides the

interface for SD, eMMC and SDIO devices.



This file documents the properties in addition to those available in

the MMC core bindings, documented by mmc.txt.



Required properties:

- compatible : contains one of:

  - "amlogic,meson-gx-mmc"

  - "amlogic,meson-gxbb-mmc"

  - "amlogic,meson-gxl-mmc"

  - "amlogic,meson-gxm-mmc"

  - "amlogic,meson-axg-mmc"

- clocks     : A list of phandle + clock-specifier pairs for the clocks listed in clock-names.

- clock-names: Should contain the following:

	"core" - Main peripheral bus clock

	"clkin0" - Parent clock of internal mux

	"clkin1" - Other parent clock of internal mux

  The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the

  clock rate requested by the MMC core.

- resets     : phandle of the internal reset line



Optional properties:

- amlogic,dram-access-quirk: set when controller's internal DMA engine cannot access the

  DRAM memory, like on the G12A dedicated SDIO controller.



Example:



	sd_emmc_a: mmc@70000 {

		compatible = "amlogic,meson-gxbb-mmc";

		reg = <0x0 0x70000 0x0 0x2000>;

		interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

		clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>;

		clock-names = "core", "clkin0", "clkin1";

		pinctrl-0 = <&emmc_pins>;

		resets = <&reset RESET_SD_EMMC_A>;

	};

Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdhc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Amlogic Meson SDHC controller



allOf:

  - $ref: "mmc-controller.yaml"

  - $ref: mmc-controller.yaml



maintainers:

  - Martin Blumenstingl <martin.blumenstingl@googlemail.com>

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

+3 −3
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/arasan,sdhci.yaml#"

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

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

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



title: Arasan SDHCI Controller
@@ -10,7 +10,7 @@ maintainers: 
  - Adrian Hunter <adrian.hunter@intel.com>



allOf:

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

  - $ref: mmc-controller.yaml#

  - if:

      properties:

        compatible: