Commit 40aa597c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
" MMC core:
   - Enable host caps to be modified via debugfs to test speed-modes
   - Improve random I/O writes for 4k buffers for hsq enabled hosts

  MMC host:
   - atmel-mci/sdhci-of-at91: Aubin Constans takes over as maintainer
   - dw_mmc-starfive: Re-work tuning support
   - meson-gx: Fix bogus IRQ when using CMD_CFG_ERROR
   - mmci: Use peripheral flow control for the STM32 variant
   - renesas,sdhi: Add support for the RZ/G3S variant
   - sdhci-esdhc-imx: Optimize the manual tuning logic
   - sdhci-msm: Add support for the SM8650 variant
   - sdhci-npcm: Add driver to support the Nuvoton NPCM BMC variant
   - sdhci-pci-gli: Add workaround to allow GL9750 to enter ASPM L1.2"

* tag 'mmc-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (25 commits)
  dt-bindings: mmc: sdhci-msm: document the SM8650 SDHCI Controller
  mmc: meson-gx: Remove setting of CMD_CFG_ERROR
  MAINTAINERS: mmc: take over as maintainer of MCI & SDHCI MICROCHIP DRIVERS
  mmc: jz4740: Use device_get_match_data()
  mmc: sdhci-npcm: Add NPCM SDHCI driver
  dt-bindings: mmc: npcm,sdhci: Document NPCM SDHCI controller
  mmc: sdhci-pltfm: Make driver OF independent
  mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init()
  mmc: sdhci-pci: Switch to use acpi_evaluate_dsm_typed()
  mmc: debugfs: Allow host caps to be modified
  mmc: core: Always reselect card type
  mmc: mmci: use peripheral flow control for STM32
  mmc: vub300: replace deprecated strncpy with strscpy
  memstick: jmb38x_ms: Annotate struct jmb38x_ms with __counted_by
  mmc: starfive: Change tuning implementation
  dt-bindings: mmc: starfive: Remove properties from required
  mmc: hsq: Improve random I/O write performance for 4k buffers
  mmc: core: Allow dynamical updates of the number of requests for hsq
  mmc: sdhci-pci-gli: A workaround to allow GL9750 to enter ASPM L1.2
  dt-bindings: mmc: renesas,sdhi: Document RZ/G3S support
  ...
parents 0364249d 5428a40a

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

0 → 100644
+45 −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/npcm,sdhci.yaml#

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



title: NPCM SDHCI Controller



maintainers:

  - Tomer Maimon <tmaimon77@gmail.com>



allOf:

  - $ref: mmc-controller.yaml#



properties:

  compatible:

    enum:

      - nuvoton,npcm750-sdhci

      - nuvoton,npcm845-sdhci



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



unevaluatedProperties: false



examples:

  - |

    mmc@f0840000 {

      compatible = "nuvoton,npcm750-sdhci";

      reg = <0xf0840000 0x200>;

      interrupts = <0 27 4>;

      clocks = <&clk 4>;

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ properties: 
              - renesas,sdhi-r9a07g043 # RZ/G2UL

              - renesas,sdhi-r9a07g044 # RZ/G2{L,LC}

              - renesas,sdhi-r9a07g054 # RZ/V2L

              - renesas,sdhi-r9a08g045 # RZ/G3S

              - renesas,sdhi-r9a09g011 # RZ/V2M

          - const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2

      - items:
@@ -122,6 +123,7 @@ allOf: 
              - renesas,sdhi-r9a07g043

              - renesas,sdhi-r9a07g044

              - renesas,sdhi-r9a07g054

              - renesas,sdhi-r9a08g045

              - renesas,sdhi-r9a09g011

    then:

      properties:

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

+5 −4
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ properties: 
              - qcom,sm8350-sdhci

              - qcom,sm8450-sdhci

              - qcom,sm8550-sdhci

              - qcom,sm8650-sdhci

          - const: qcom,sdhci-msm-v5 # for sdcc version 5.0



  reg:
@@ -85,10 +86,10 @@ properties: 
      - const: iface

      - const: core

      - const: xo

      - const: ice

      - const: bus

      - const: cal

      - const: sleep

      - enum: [ice, bus, cal, sleep]

      - enum: [ice, bus, cal, sleep]

      - enum: [ice, bus, cal, sleep]

      - enum: [ice, bus, cal, sleep]



  dma-coherent: true

Documentation/devicetree/bindings/mmc/starfive,jh7110-mmc.yaml

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ required: 
  - clocks

  - clock-names

  - interrupts

  - starfive,sysreg



unevaluatedProperties: false
@@ -73,5 +72,4 @@ examples: 
        fifo-depth = <32>;

        fifo-watermark-aligned;

        data-addr = <0>;

        starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>;

    };

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -14110,7 +14110,7 @@ F: Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml 
F:	drivers/iio/adc/mcp3911.c









MICROCHIP MMC/SD/SDIO MCI DRIVER









M:	Ludovic Desroches <ludovic.desroches@microchip.com>









M:	Aubin Constans <aubin.constans@microchip.com>









S:	Maintained









F:	drivers/mmc/host/atmel-mci.c
















@@ -19335,7 +19335,8 @@ F:	Documentation/devicetree/bindings/mmc/sdhci-common.yaml







F:	drivers/mmc/host/sdhci*

















SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER









M:	Eugen Hristev <eugen.hristev@microchip.com>









M:	Aubin Constans <aubin.constans@microchip.com>









R:	Eugen Hristev <eugen.hristev@collabora.com>









L:	linux-mmc@vger.kernel.org









S:	Supported









F:	drivers/mmc/host/sdhci-of-at91.c