Skip to content

Commit 3f32ab1

Browse files
committed
Merge tag 'mmc-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/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 's32@nxp.com' 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 ...
2 parents d46ede3 + b85e021 commit 3f32ab1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+556
-993
lines changed

Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ properties:
2323
- raspberrypi,4-model-b
2424
- const: brcm,bcm2711
2525

26+
- description: BCM2712 based Boards
27+
items:
28+
- enum:
29+
- raspberrypi,5-model-b
30+
- const: brcm,bcm2712
31+
2632
- description: BCM2835 based Boards
2733
items:
2834
- enum:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ properties:
5151
set when controller's internal DMA engine cannot access the DRAM memory,
5252
like on the G12A dedicated SDIO controller.
5353

54+
power-domains:
55+
maxItems: 1
56+
5457
required:
5558
- compatible
5659
- reg

Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- const: brcm,sdhci-brcmstb
2121
- items:
2222
- enum:
23+
- brcm,bcm2712-sdhci
2324
- brcm,bcm74165b0-sdhci
2425
- brcm,bcm7445-sdhci
2526
- brcm,bcm7425-sdhci
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mmc/fsl,esdhc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale Enhanced Secure Digital Host Controller (eSDHC)
8+
9+
description:
10+
The Enhanced Secure Digital Host Controller provides an interface
11+
for MMC, SD, and SDIO types of memory cards.
12+
13+
maintainers:
14+
- Frank Li <Frank.Li@nxp.com>
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- fsl,mpc8536-esdhc
21+
- fsl,mpc8378-esdhc
22+
- fsl,p2020-esdhc
23+
- fsl,p4080-esdhc
24+
- fsl,t1040-esdhc
25+
- fsl,t4240-esdhc
26+
- fsl,ls1012a-esdhc
27+
- fsl,ls1028a-esdhc
28+
- fsl,ls1088a-esdhc
29+
- fsl,ls1043a-esdhc
30+
- fsl,ls1046a-esdhc
31+
- fsl,ls2080a-esdhc
32+
- const: fsl,esdhc
33+
34+
reg:
35+
maxItems: 1
36+
37+
interrupts:
38+
maxItems: 1
39+
40+
clocks:
41+
maxItems: 1
42+
43+
clock-frequency:
44+
$ref: /schemas/types.yaml#/definitions/uint32
45+
description: specifies eSDHC base clock frequency.
46+
47+
sdhci,wp-inverted:
48+
$ref: /schemas/types.yaml#/definitions/flag
49+
deprecated: true
50+
description:
51+
specifies that eSDHC controller reports
52+
inverted write-protect state; New devices should use the generic
53+
"wp-inverted" property.
54+
55+
sdhci,1-bit-only:
56+
$ref: /schemas/types.yaml#/definitions/flag
57+
deprecated: true
58+
description:
59+
specifies that a controller can only handle
60+
1-bit data transfers. New devices should use the generic
61+
"bus-width = <1>" property.
62+
63+
sdhci,auto-cmd12:
64+
$ref: /schemas/types.yaml#/definitions/flag
65+
description:
66+
specifies that a controller can only handle auto CMD12.
67+
68+
voltage-ranges:
69+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
70+
items:
71+
items:
72+
- description: specifies minimum slot voltage (mV).
73+
- description: specifies maximum slot voltage (mV).
74+
minItems: 1
75+
maxItems: 8
76+
77+
dma-coherent: true
78+
79+
little-endian:
80+
$ref: /schemas/types.yaml#/definitions/flag
81+
description:
82+
If the host controller is little-endian mode, specify
83+
this property. The default endian mode is big-endian.
84+
85+
required:
86+
- compatible
87+
- reg
88+
- interrupts
89+
90+
allOf:
91+
- $ref: sdhci-common.yaml#
92+
93+
unevaluatedProperties: false
94+
95+
examples:
96+
- |
97+
mmc@2e000 {
98+
compatible = "fsl,mpc8378-esdhc", "fsl,esdhc";
99+
reg = <0x2e000 0x1000>;
100+
interrupts = <42 0x8>;
101+
interrupt-parent = <&ipic>;
102+
/* Filled in by U-Boot */
103+
clock-frequency = <100000000>;
104+
voltage-ranges = <3300 3300>;
105+
};

Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.

Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@ properties:
2727
maxItems: 1
2828

2929
voltage-ranges:
30-
$ref: /schemas/types.yaml#/definitions/uint32-array
30+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
3131
description: |
3232
Two cells are required, first cell specifies minimum slot voltage (mV),
3333
second cell specifies maximum slot voltage (mV).
3434
items:
35-
- description: |
36-
value for minimum slot voltage in mV
37-
default: 3200
38-
- description: |
39-
value for maximum slot voltage in mV
40-
default: 3400
35+
items:
36+
- description: |
37+
value for minimum slot voltage in mV
38+
default: 3200
39+
- description: |
40+
value for maximum slot voltage in mV
41+
default: 3400
42+
maxItems: 1
4143

4244
gpios:
4345
description: |

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ properties:
5151
- qcom,sdm845-sdhci
5252
- qcom,sdx55-sdhci
5353
- qcom,sdx65-sdhci
54+
- qcom,sdx75-sdhci
5455
- qcom,sm6115-sdhci
5556
- qcom,sm6125-sdhci
5657
- qcom,sm6350-sdhci

Documentation/devicetree/bindings/mmc/sdhci-sprd.txt

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)