Skip to content
/ linux Public
forked from torvalds/linux

Commit

Permalink
Merge tag 'mmc-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history
…t/ulfh/mmc

Pull MMC updates from Ulf Hansson:
 "MMC host:
   - Convert from using tasklet to the BH workqueue
   - dw_mmc-bluefield: Add support for eMMC HW reset
   - mmc_spi: Allow spi controllers incapable of lower than 400kHz
   - sdhci: Rework code to eliminate SDHCI_QUIRK_UNSTABLE_RO_DETECT
   - sdhci-brcmstb: Add support for the BCM2712 variant
   - sdhci-esdhc-imx: Disable card-detect as system wakeup on S32G platforms
   - sdhci-msm: Add support for the SDX75 variant
   - sdhci-of-dwcmshc: Enable CQE support for some Rockchip variants
   - sdhci-of-esdhc: Convert DT-bindings to yaml
   - sdhci-sprd: Convert DT-bindings to yaml

  MEMSTICK:
   - rtsx_pci_ms: Remove the unused Realtek PCI memstick driver"

* tag 'mmc-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (26 commits)
  MAINTAINERS: add '[email protected]' as relevant mailing list for 'sdhci-esdhc-imx' driver
  mmc: sdhci-esdhc-imx: obtain the 'per' clock rate after its enablement
  mmc: sdhci-esdhc-imx: disable card detect wake for S32G based platforms
  dt-bindings: mmc: sdhci-sprd: convert to YAML
  mmc: davinci_mmc: report all possible bus widths
  mmc: dw_mmc-bluefield: Add support for eMMC HW reset
  mmc: dw_mmc: Add support for platform specific eMMC HW reset
  mmc: sdhci_am654: Constify struct regmap_config
  mmc: Convert from tasklet to BH workqueue
  mmc: sdhi: Convert from tasklet to BH workqueue
  mmc: mmc_spi: allow for spi controllers incapable of getting as low as 400k
  memstick: rtsx_pci_ms: Remove Realtek PCI memstick driver
  MAINTAINERS: drop entry for VIA SD/MMC controller
  mmc: tmio: Remove obsolete .set_pwr() callback()
  mfd: tmio: Remove obsolete .set_clk_div() callback
  mmc: sdhci-brcmstb: Add ARCH_BCM2835 option
  mmc: sdhci: Eliminate SDHCI_QUIRK_UNSTABLE_RO_DETECT
  dt-bindings: mmc: Convert fsl-esdhc.txt to yaml
  dt-bindings: mmc: mmc-spi-slot: Change voltage-ranges to uint32-matrix
  mmc: add missing MODULE_DESCRIPTION() macros
  ...
  • Loading branch information
torvalds committed Jul 16, 2024
2 parents d46ede3 + b85e021 commit 3f32ab1
Show file tree
Hide file tree
Showing 50 changed files with 556 additions and 993 deletions.
6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ properties:
- raspberrypi,4-model-b
- const: brcm,bcm2711

- description: BCM2712 based Boards
items:
- enum:
- raspberrypi,5-model-b
- const: brcm,bcm2712

- description: BCM2835 based Boards
items:
- enum:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ properties:
set when controller's internal DMA engine cannot access the DRAM memory,
like on the G12A dedicated SDIO controller.

power-domains:
maxItems: 1

required:
- compatible
- reg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ properties:
- const: brcm,sdhci-brcmstb
- items:
- enum:
- brcm,bcm2712-sdhci
- brcm,bcm74165b0-sdhci
- brcm,bcm7445-sdhci
- brcm,bcm7425-sdhci
Expand Down
105 changes: 105 additions & 0 deletions Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Freescale Enhanced Secure Digital Host Controller (eSDHC)

description:
The Enhanced Secure Digital Host Controller provides an interface
for MMC, SD, and SDIO types of memory cards.

maintainers:
- Frank Li <[email protected]>

properties:
compatible:
items:
- enum:
- fsl,mpc8536-esdhc
- fsl,mpc8378-esdhc
- fsl,p2020-esdhc
- fsl,p4080-esdhc
- fsl,t1040-esdhc
- fsl,t4240-esdhc
- fsl,ls1012a-esdhc
- fsl,ls1028a-esdhc
- fsl,ls1088a-esdhc
- fsl,ls1043a-esdhc
- fsl,ls1046a-esdhc
- fsl,ls2080a-esdhc
- const: fsl,esdhc

reg:
maxItems: 1

interrupts:
maxItems: 1

clocks:
maxItems: 1

clock-frequency:
$ref: /schemas/types.yaml#/definitions/uint32
description: specifies eSDHC base clock frequency.

sdhci,wp-inverted:
$ref: /schemas/types.yaml#/definitions/flag
deprecated: true
description:
specifies that eSDHC controller reports
inverted write-protect state; New devices should use the generic
"wp-inverted" property.

sdhci,1-bit-only:
$ref: /schemas/types.yaml#/definitions/flag
deprecated: true
description:
specifies that a controller can only handle
1-bit data transfers. New devices should use the generic
"bus-width = <1>" property.

sdhci,auto-cmd12:
$ref: /schemas/types.yaml#/definitions/flag
description:
specifies that a controller can only handle auto CMD12.

voltage-ranges:
$ref: /schemas/types.yaml#/definitions/uint32-matrix
items:
items:
- description: specifies minimum slot voltage (mV).
- description: specifies maximum slot voltage (mV).
minItems: 1
maxItems: 8

dma-coherent: true

little-endian:
$ref: /schemas/types.yaml#/definitions/flag
description:
If the host controller is little-endian mode, specify
this property. The default endian mode is big-endian.

required:
- compatible
- reg
- interrupts

allOf:
- $ref: sdhci-common.yaml#

unevaluatedProperties: false

examples:
- |
mmc@2e000 {
compatible = "fsl,mpc8378-esdhc", "fsl,esdhc";
reg = <0x2e000 0x1000>;
interrupts = <42 0x8>;
interrupt-parent = <&ipic>;
/* Filled in by U-Boot */
clock-frequency = <100000000>;
voltage-ranges = <3300 3300>;
};
52 changes: 0 additions & 52 deletions Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

This file was deleted.

16 changes: 9 additions & 7 deletions Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,19 @@ properties:
maxItems: 1

voltage-ranges:
$ref: /schemas/types.yaml#/definitions/uint32-array
$ref: /schemas/types.yaml#/definitions/uint32-matrix
description: |
Two cells are required, first cell specifies minimum slot voltage (mV),
second cell specifies maximum slot voltage (mV).
items:
- description: |
value for minimum slot voltage in mV
default: 3200
- description: |
value for maximum slot voltage in mV
default: 3400
items:
- description: |
value for minimum slot voltage in mV
default: 3200
- description: |
value for maximum slot voltage in mV
default: 3400
maxItems: 1

gpios:
description: |
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ properties:
- qcom,sdm845-sdhci
- qcom,sdx55-sdhci
- qcom,sdx65-sdhci
- qcom,sdx75-sdhci
- qcom,sm6115-sdhci
- qcom,sm6125-sdhci
- qcom,sm6350-sdhci
Expand Down
67 changes: 0 additions & 67 deletions Documentation/devicetree/bindings/mmc/sdhci-sprd.txt

This file was deleted.

Loading

0 comments on commit 3f32ab1

Please sign in to comment.