Commit 8b06f753 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Increase the timeout period of the ACMD41 command
   - Add card entry for quirks to debugfs
   - Add mmc_gpiod_set_cd_config() function
   - Store owner from SDIO modules with sdio_register_driver()

  MMC host:
   - atmel-mci: Some cleanups and a switch to use dev_err_probe()
   - renesas_sdhi:
      - Add support for RZ/G2L, RZ/G3S and RZ/V2M variants
      - Set the SDBUF after reset
   - sdhci: Add support for "Tuning Error" interrupts
   - sdhci-acpi:
      - Add quirk to enable pull-up on the card-detect GPIO on Asus
        T100TA
      - Disable write protect detection on Toshiba WT10-A
      - Fix Lenovo Yoga Tablet 2 Pro 1380 sdcard slot not working
   - sdhci_am654:
      - Re-work and fix the tuning support for multiple speed-modes
      - Add tuning algorithm for delay chain
   - sdhci-esdhc-imx: Add NXP S32G3 support
   - sdhci-of-dwcmshc:
      - Add tuning support for Sophgo CV1800B and SG200X
      - Implement SDHCI CQE support
   - sdhci-pci-gli: Use the proper pci_set_power_state() instead of
     PMCSR writes"

  MEMSTICK:
   - Convert a couple of drivers to use the ->remove_new() callback"

* tag 'mmc-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (59 commits)
  mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs
  dt-bindings: mmc: renesas,sdhi: Document RZ/G2L family compatibility
  dt-bindings: mmc: renesas,sdhi: Group single const value items into an enum list
  mmc: renesas_sdhi: Set the SDBUF after reset
  mmc: core: Increase the timeout period of the ACMD41 command
  mmc: core: Convert to use __mmc_poll_for_busy() SD_APP_OP_COND too
  mmc: atmel-mci: Switch to use dev_err_probe()
  mmc: atmel-mci: Incapsulate used to be a platform data into host structure
  mmc: atmel-mci: Replace platform device pointer by generic one
  mmc: atmel-mci: Use temporary variable for struct device
  mmc: atmel-mci: Get rid of platform data leftovers
  mmc: sdhci-of-dwcmshc: Add tuning support for Sophgo CV1800B and SG200X
  mmc: sdhci-of-dwcmshc: Remove useless "&" of th1520_execute_tuning
  mmc: sdhci-s3c: Choose sdhci_ops based on variant
  mmc: sdhci_am654: Constify struct sdhci_ops
  mmc: sdhci-sprd: Constify struct sdhci_ops
  mmc: sdhci-omap: Constify struct sdhci_ops
  mmc: sdhci-esdhc-mcf: Constify struct sdhci_ops
  mmc: slot-gpio: Use irq_handler_t type
  mmc: sdhci-acpi: Add quirk to enable pull-up on the card-detect GPIO on Asus T100TA
  ...
parents 8b35a3bb 35eea0de

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

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ properties: 
          - enum:

              - fsl,imxrt1170-usdhc

          - const: fsl,imxrt1050-usdhc

      - items:

          - const: nxp,s32g3-usdhc

          - const: nxp,s32g2-usdhc



  reg:

    maxItems: 1

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

+16 −23
Original line number Diff line number Diff line
@@ -12,16 +12,13 @@ maintainers: 
properties:

  compatible:

    oneOf:

      - items:

          - const: renesas,sdhi-sh73a0  # R-Mobile APE6

      - items:

          - const: renesas,sdhi-r7s72100 # RZ/A1H

      - items:

          - const: renesas,sdhi-r7s9210 # SH-Mobile AG5

      - items:

          - const: renesas,sdhi-r8a73a4 # R-Mobile APE6

      - items:

          - const: renesas,sdhi-r8a7740 # R-Mobile A1

      - enum:

          - renesas,sdhi-mmc-r8a77470 # RZ/G1C

          - renesas,sdhi-r7s72100 # RZ/A1H

          - renesas,sdhi-r7s9210 # SH-Mobile AG5

          - renesas,sdhi-r8a73a4 # R-Mobile APE6

          - renesas,sdhi-r8a7740 # R-Mobile A1

          - renesas,sdhi-sh73a0  # R-Mobile APE6

      - items:

          - enum:

              - renesas,sdhi-r8a7778 # R-Car M1
@@ -40,8 +37,6 @@ properties: 
              - renesas,sdhi-r8a7793  # R-Car M2-N

              - renesas,sdhi-r8a7794  # R-Car E2

          - const: renesas,rcar-gen2-sdhi # R-Car Gen2 and RZ/G1

      - items:

          - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)

      - items:

          - enum:

              - renesas,sdhi-r8a774a1  # RZ/G2M
@@ -56,11 +51,6 @@ properties: 
              - renesas,sdhi-r8a77980  # R-Car V3H

              - renesas,sdhi-r8a77990  # R-Car E3

              - renesas,sdhi-r8a77995  # R-Car D3

              - renesas,sdhi-r9a07g043 # RZ/G2UL and RZ/Five

              - 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:

          - enum:
@@ -69,6 +59,14 @@ properties: 
              - renesas,sdhi-r8a779g0  # R-Car V4H

              - renesas,sdhi-r8a779h0  # R-Car V4M

          - const: renesas,rcar-gen4-sdhi # R-Car Gen4

      - items:

          - enum:

              - renesas,sdhi-r9a07g043 # RZ/G2UL and RZ/Five

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

              - renesas,sdhi-r9a07g054 # RZ/V2L

              - renesas,sdhi-r9a08g045 # RZ/G3S

              - renesas,sdhi-r9a09g011 # RZ/V2M

          - const: renesas,rzg2l-sdhi



  reg:

    maxItems: 1
@@ -120,12 +118,7 @@ allOf: 
      properties:

        compatible:

          contains:

            enum:

              - renesas,sdhi-r9a07g043

              - renesas,sdhi-r9a07g044

              - renesas,sdhi-r9a07g054

              - renesas,sdhi-r9a08g045

              - renesas,sdhi-r9a09g011

            const: renesas,rzg2l-sdhi

    then:

      properties:

        clocks:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8616,7 +8616,7 @@ F: Documentation/devicetree/bindings/crypto/fsl,sec-v4.0* 
F:	drivers/crypto/caam/









FREESCALE COLDFIRE M5441X MMC DRIVER









M:	Angelo Dureghello <angelo.dureghello@timesys.com>









M:	Angelo Dureghello <adureghello@baylibre.com>









L:	linux-mmc@vger.kernel.org









S:	Maintained









F:	drivers/mmc/host/sdhci-esdhc-mcf.c
































drivers/bluetooth/btmrvl_sdio.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -1736,7 +1736,6 @@ static struct sdio_driver bt_mrvl_sdio = {







	.probe		= btmrvl_sdio_probe,









	.remove		= btmrvl_sdio_remove,









	.drv = {









		.owner = THIS_MODULE,









		.coredump = btmrvl_sdio_coredump,









		.pm = &btmrvl_sdio_pm_ops,









	}
































drivers/bluetooth/btmtksdio.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -1519,7 +1519,6 @@ static struct sdio_driver btmtksdio_driver = {







	.remove		= btmtksdio_remove,









	.id_table	= btmtksdio_table,









	.drv = {









		.owner = THIS_MODULE,









		.pm = BTMTKSDIO_PM_OPS,









	}









};