Skip to content

Commit 35a8b02

Browse files
committed
Merge tag 'mmc-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC updates from Ulf Hansson: "MMC core: - Scan the eMMC boot areas for partition table - Clarify purpose of mmc_can* functions by renaming them to mmc_card_can* - Clarify helpers for host capabilities by renaming them to mmc_host_can* - Add support for graceful host removal for SD and eMMC - Further avoid re-storing power to the eMMC before a shutdown - Add quirk to disable DDR50 tuning and use it for some Swissbit SD-cards MMC host: - mtk-sd: Add support for Dimensity 1200 MT6893 - mtk-sd: Fix condition to enable single burst type - mtk-sd: Optimize several code-paths by aggregating register-writes - renesas_sdhi: Add support for the Renesas RZ/V2N variant - sdhci-msm: Add support for the SM7150 variant - sdhci-esdhc-imx: Re-factor the system PM logic - sdhci-esdhc-imx: Lots of improvements around the tuning support - sdhci-of-arasan: Add support for the Renesas RZ/N1D variant - sdhci-of-dwcmhsc: Add Sophgo SG2044 support - sdhci-of-esdhc: Add support for the LS1021a variant - sdhci-of-k1: Add new driver to support for SpacemiT K1 controller - sdhci-pic32: Convert microchip,sdhci-pic32 DT doc to json schema - wmt-sdmmc: Convert DT doc to json schema" * tag 'mmc-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (59 commits) dt-bindings: mmc: sdhci-of-dwcmhsc: Allow use of a power-domain mmc: sdhci-esdhc-imx: fix few build warnings mmc: bcm2835: Use str_read_write() helper mmc: host: sdhci-esdhc-imx: refactor the system PM logic mmc: sdhci: export APIs for sdhci irq wakeup mmc: sdhci-of-k1: add support for SpacemiT K1 SoC dt-bindings: mmc: spacemit,sdhci: add support for K1 SoC mmc: core: Scan the eMMC boot areas for partition table dt-binding: mmc: microchip,sdhci-pic32: convert text based binding to json schema mmc: rename mmc_boot_partition_access() to mmc_host_can_access_boot() mmc: rename mmc_host_uhs() to mmc_host_can_uhs() mmc: rename mmc_host_done_complete() to mmc_host_can_done_complete() mmc: rename mmc_host_cmd23() to mmc_host_can_cmd23() mmc: sdhci-esdhc-imx: fix defined but not used warnings dt-bindings: mmc: vt8500-sdmmc: Convert to YAML dt-bindings: mmc: sdhci-msm: Add the SM7150 compatible dt-bindings: mmc: fsl,esdhc: add compatible string fsl,ls1021a-esdhc mmc: cavium-thunderx: Use non-hybrid PCI devres API dt-bindings: mmc: mtk-sd: Add support for Dimensity 1200 MT6893 dt-bindings: mmc: sdhci-of-dwcmhsc: Add Sophgo SG2044 support ...
2 parents 418da6e + d2c6acf commit 35a8b02

Some content is hidden

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

44 files changed

+1095
-380
lines changed

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,26 @@ allOf:
3838
- items:
3939
- const: clk_out_sd1
4040
- const: clk_in_sd1
41+
- if:
42+
properties:
43+
compatible:
44+
contains:
45+
const: renesas,rzn1-sdhci
46+
then:
47+
properties:
48+
interrupts:
49+
minItems: 2
4150

4251
properties:
4352
compatible:
4453
oneOf:
4554
- const: arasan,sdhci-8.9a # generic Arasan SDHCI 8.9a PHY
4655
- const: arasan,sdhci-4.9a # generic Arasan SDHCI 4.9a PHY
4756
- const: arasan,sdhci-5.1 # generic Arasan SDHCI 5.1 PHY
57+
- items:
58+
- const: renesas,r9a06g032-sdhci # Renesas RZ/N1D SoC
59+
- const: renesas,rzn1-sdhci # Renesas RZ/N1 family
60+
- const: arasan,sdhci-8.9a
4861
- items:
4962
- const: rockchip,rk3399-sdhci-5.1 # rk3399 eMMC PHY
5063
- const: arasan,sdhci-5.1
@@ -109,7 +122,14 @@ properties:
109122
- const: gate
110123

111124
interrupts:
112-
maxItems: 1
125+
minItems: 1
126+
maxItems: 2
127+
128+
interrupt-names:
129+
minItems: 1
130+
items:
131+
- const: int
132+
- const: wakeup
113133

114134
phys:
115135
maxItems: 1

Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- fsl,t1040-esdhc
2525
- fsl,t4240-esdhc
2626
- fsl,ls1012a-esdhc
27+
- fsl,ls1021a-esdhc
2728
- fsl,ls1028a-esdhc
2829
- fsl,ls1088a-esdhc
2930
- fsl,ls1043a-esdhc

Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,14 @@ properties:
5252
- const: core
5353
- const: axi
5454

55+
dma-coherent: true
56+
5557
interrupts:
5658
maxItems: 1
5759

60+
iommus:
61+
maxItems: 1
62+
5863
marvell,pad-type:
5964
$ref: /schemas/types.yaml#/definitions/string
6065
enum:
@@ -142,7 +147,7 @@ properties:
142147
This property provides the re-tuning counter.
143148
144149
allOf:
145-
- $ref: mmc-controller.yaml#
150+
- $ref: sdhci-common.yaml#
146151
- if:
147152
properties:
148153
compatible:
@@ -164,26 +169,6 @@ allOf:
164169

165170
marvell,pad-type: false
166171

167-
- if:
168-
properties:
169-
compatible:
170-
contains:
171-
enum:
172-
- marvell,armada-cp110-sdhci
173-
- marvell,armada-ap807-sdhci
174-
- marvell,armada-ap806-sdhci
175-
176-
then:
177-
properties:
178-
clocks:
179-
minItems: 2
180-
181-
clock-names:
182-
items:
183-
- const: core
184-
- const: axi
185-
186-
187172
required:
188173
- compatible
189174
- reg

Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mmc/microchip,sdhci-pic32.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip PIC32 SDHI Controller
8+
9+
description:
10+
The Microchip PIC32 family of microcontrollers (MCUs) includes models with
11+
Secure Digital Host Controller Interface (SDHCI) controllers, allowing them
12+
to interface with Secure Digital (SD) cards. This interface is used for reading,
13+
writing, and managing data on SD cards, enabling storage and data transfer
14+
capabilities in embedded systems.
15+
16+
allOf:
17+
- $ref: mmc-controller.yaml
18+
19+
maintainers:
20+
- Ulf Hansson <ulf.hansson@linaro.org>
21+
22+
properties:
23+
compatible:
24+
const: microchip,pic32mzda-sdhci
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
clocks:
33+
maxItems: 2
34+
35+
clock-names:
36+
items:
37+
- const: base_clk
38+
- const: sys_clk
39+
40+
required:
41+
- compatible
42+
- reg
43+
- interrupts
44+
- clocks
45+
- clock-names
46+
- pinctrl-names
47+
- pinctrl-0
48+
49+
unevaluatedProperties: false
50+
51+
examples:
52+
- |
53+
#include <dt-bindings/interrupt-controller/irq.h>
54+
#include <dt-bindings/clock/microchip,pic32-clock.h>
55+
mmc@1f8ec000 {
56+
compatible = "microchip,pic32mzda-sdhci";
57+
reg = <0x1f8ec000 0x100>;
58+
interrupts = <191 IRQ_TYPE_LEVEL_HIGH>;
59+
clocks = <&rootclk REF4CLK>, <&rootclk PB5CLK>;
60+
clock-names = "base_clk", "sys_clk";
61+
bus-width = <4>;
62+
cap-sd-highspeed;
63+
pinctrl-names = "default";
64+
pinctrl-0 = <&pinctrl_sdhc1>;
65+
};
66+
...

Documentation/devicetree/bindings/mmc/mtk-sd.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- const: mediatek,mt2701-mmc
3333
- items:
3434
- enum:
35+
- mediatek,mt6893-mmc
3536
- mediatek,mt8186-mmc
3637
- mediatek,mt8188-mmc
3738
- mediatek,mt8192-mmc
@@ -299,6 +300,7 @@ allOf:
299300
properties:
300301
compatible:
301302
enum:
303+
- mediatek,mt6893-mmc
302304
- mediatek,mt8186-mmc
303305
- mediatek,mt8188-mmc
304306
- mediatek,mt8195-mmc

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ properties:
6969
- renesas,sdhi-r9a09g011 # RZ/V2M
7070
- const: renesas,rzg2l-sdhi
7171
- items:
72-
- const: renesas,sdhi-r9a09g047 # RZ/G3E
72+
- enum:
73+
- renesas,sdhi-r9a09g047 # RZ/G3E
74+
- renesas,sdhi-r9a09g056 # RZ/V2N
7375
- const: renesas,sdhi-r9a09g057 # RZ/V2H(P)
7476

7577
reg:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ properties:
6060
- qcom,sm6125-sdhci
6161
- qcom,sm6350-sdhci
6262
- qcom,sm6375-sdhci
63+
- qcom,sm7150-sdhci
6364
- qcom,sm8150-sdhci
6465
- qcom,sm8250-sdhci
6566
- qcom,sm8350-sdhci

Documentation/devicetree/bindings/mmc/sdhci.txt

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

Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ properties:
1919
- rockchip,rk3562-dwcmshc
2020
- rockchip,rk3576-dwcmshc
2121
- const: rockchip,rk3588-dwcmshc
22+
- items:
23+
- const: sophgo,sg2044-dwcmshc
24+
- const: sophgo,sg2042-dwcmshc
2225
- enum:
2326
- rockchip,rk3568-dwcmshc
2427
- rockchip,rk3588-dwcmshc
@@ -117,10 +120,6 @@ allOf:
117120
required:
118121
- power-domains
119122

120-
else:
121-
properties:
122-
power-domains: false
123-
124123
unevaluatedProperties: false
125124

126125
examples:

0 commit comments

Comments
 (0)