Skip to content

Commit 7fced2a

Browse files
torvaldstorvalds
committed
Merge tag 'mmc-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC updates from Ulf Hansson: "MMC core: - Add documentation for the mmc-test driver - Register the eMMC RPMB partition with the RPMB subsystem - Some various cleanups MMC host: - dw_mmc-rockchip: Add support for the RK3576 variant - renesas_sdhi: Add support for the RZ/V2H(P) variant - sdhci_am654: Add a retry mechanism for tuning - sdhci-atmel: Convert DT bindings to json schema - sdhci-of-dwcmshc: - Add eMMC HW reset support for BlueField-3 SoC - Add support for the RK3576 variant - Add support for the Sophgo SG2042 variant - sdhci-of-ma35d1: Add new driver for the Nuvoton MA35D1 SDHCI Misc/Tee: - Add Replay Protected Memory Block (RPMB) subsystem - Let optee probe RPMB device using RPMB subsystem" * tag 'mmc-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (41 commits) mmc: core: Use dev_err_probe for deferred regulators optee: Fix a NULL vs IS_ERR() check mmc: sdhci_am654: Add prints to tuning algorithm mmc: sdhci_am654: Add retry tuning dt-bindings: mmc: Add support for rk3576 eMMC Documentation: mmc: Add mmc-test doc rpmb: fix error path in rpmb_dev_register() optee: add RPMB dependency mmc: block: add RPMB dependency mmc: core Convert UNSTUFF_BITS macro to inline function dt-bindings: mmc: sdhci-atmel: Convert to json schema mmc: core: Convert simple_stroul to kstroul mmc: core: Calculate size from pointer mmc: cqhci: Make use of cqhci_halted() routine mmc: core: Replace the argument of mmc_sd_switch() with defines mmc: dw_mmc-rockchip: Add support for rk3576 SoCs mmc: dw_mmc-rockchip: Add internal phase support dt-bindings: mmc: Add support for rk3576 dw-mshc mmc: sdhci-of-dwcmshc: Add hw_reset() support for BlueField-3 SoC mmc: core: remove left-over data structure declarations ...
2 parents 2471d2b + cd3689b commit 7fced2a

Some content is hidden

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

46 files changed

+2633
-449
lines changed

‎Documentation/ABI/testing/sysfs-class-tee

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/class/tee/tee{,priv}X/rpmb_routing_model
2+
Date: May 2024
3+
KernelVersion: 6.10
4+
Contact: [email protected]
5+
Description:
6+
RPMB frames can be routed to the RPMB device via the
7+
user-space daemon tee-supplicant or the RPMB subsystem
8+
in the kernel. The value "user" means that the driver
9+
will route the RPMB frames via user space. Conversely,
10+
"kernel" means that the frames are routed via the RPMB
11+
subsystem without assistance from tee-supplicant. It
12+
should be assumed that RPMB frames are routed via user
13+
space if the variable is absent. The primary purpose
14+
of this variable is to let systemd know whether
15+
tee-supplicant is needed in the early boot with initramfs.

‎Documentation/devicetree/bindings/mmc/atmel,sama5d2-sdhci.yaml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mmc/atmel,sama5d2-sdhci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel SDHCI controller
8+
9+
maintainers:
10+
- Aubin Constans <[email protected]>
11+
- Nicolas Ferre <[email protected]>
12+
13+
description:
14+
Bindings for the SDHCI controller found in Atmel/Microchip SoCs.
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- atmel,sama5d2-sdhci
21+
- microchip,sam9x60-sdhci
22+
- items:
23+
- enum:
24+
- microchip,sam9x7-sdhci
25+
- microchip,sama7g5-sdhci
26+
- const: microchip,sam9x60-sdhci
27+
28+
reg:
29+
maxItems: 1
30+
31+
interrupts:
32+
maxItems: 1
33+
34+
clocks:
35+
items:
36+
- description: hclock
37+
- description: multclk
38+
- description: baseclk
39+
minItems: 2
40+
41+
clock-names:
42+
items:
43+
- const: hclock
44+
- const: multclk
45+
- const: baseclk
46+
minItems: 2
47+
48+
microchip,sdcal-inverted:
49+
type: boolean
50+
description:
51+
When present, polarity on the SDCAL SoC pin is inverted. The default
52+
polarity for this signal is described in the datasheet. For instance on
53+
SAMA5D2, the pin is usually tied to the GND with a resistor and a
54+
capacitor (see "SDMMC I/O Calibration" chapter).
55+
56+
required:
57+
- compatible
58+
- reg
59+
- interrupts
60+
- clocks
61+
- clock-names
62+
63+
allOf:
64+
- $ref: sdhci-common.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- atmel,sama5d2-sdhci
71+
then:
72+
properties:
73+
clocks:
74+
minItems: 3
75+
clock-names:
76+
minItems: 3
77+
78+
unevaluatedProperties: false
79+
80+
examples:
81+
- |
82+
#include <dt-bindings/interrupt-controller/irq.h>
83+
#include <dt-bindings/clock/at91.h>
84+
mmc@a0000000 {
85+
compatible = "atmel,sama5d2-sdhci";
86+
reg = <0xa0000000 0x300>;
87+
interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
88+
clocks = <&sdmmc0_hclk>, <&sdmmc0_gclk>, <&main>;
89+
clock-names = "hclock", "multclk", "baseclk";
90+
assigned-clocks = <&sdmmc0_gclk>;
91+
assigned-clock-rates = <480000000>;
92+
};

‎Documentation/devicetree/bindings/mmc/nuvoton,ma35d1-sdhci.yaml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mmc/nuvoton,ma35d1-sdhci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Nuvoton MA35D1 SD/SDIO/MMC Controller
8+
9+
maintainers:
10+
- Shan-Chun Hung <[email protected]>
11+
12+
allOf:
13+
- $ref: sdhci-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- nuvoton,ma35d1-sdhci
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
pinctrl-names:
30+
minItems: 1
31+
items:
32+
- const: default
33+
- const: state_uhs
34+
35+
pinctrl-0:
36+
description:
37+
Should contain default/high speed pin ctrl.
38+
maxItems: 1
39+
40+
pinctrl-1:
41+
description:
42+
Should contain uhs mode pin ctrl.
43+
maxItems: 1
44+
45+
resets:
46+
maxItems: 1
47+
48+
nuvoton,sys:
49+
$ref: /schemas/types.yaml#/definitions/phandle
50+
description: phandle to access GCR (Global Control Register) registers.
51+
52+
required:
53+
- compatible
54+
- reg
55+
- interrupts
56+
- clocks
57+
- pinctrl-names
58+
- pinctrl-0
59+
- resets
60+
- nuvoton,sys
61+
62+
unevaluatedProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/interrupt-controller/arm-gic.h>
67+
#include <dt-bindings/clock/nuvoton,ma35d1-clk.h>
68+
#include <dt-bindings/reset/nuvoton,ma35d1-reset.h>
69+
70+
soc {
71+
#address-cells = <2>;
72+
#size-cells = <2>;
73+
mmc@40190000 {
74+
compatible = "nuvoton,ma35d1-sdhci";
75+
reg = <0x0 0x40190000 0x0 0x2000>;
76+
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
77+
clocks = <&clk SDH1_GATE>;
78+
pinctrl-names = "default", "state_uhs";
79+
pinctrl-0 = <&pinctrl_sdhci1>;
80+
pinctrl-1 = <&pinctrl_sdhci1_uhs>;
81+
resets = <&sys MA35D1_RESET_SDH1>;
82+
nuvoton,sys = <&sys>;
83+
vqmmc-supply = <&sdhci1_vqmmc_regulator>;
84+
bus-width = <8>;
85+
max-frequency = <200000000>;
86+
};
87+
};

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- renesas,sdhi-r7s9210 # SH-Mobile AG5
1919
- renesas,sdhi-r8a73a4 # R-Mobile APE6
2020
- renesas,sdhi-r8a7740 # R-Mobile A1
21+
- renesas,sdhi-r9a09g057 # RZ/V2H(P)
2122
- renesas,sdhi-sh73a0 # R-Mobile APE6
2223
- items:
2324
- enum:
@@ -75,9 +76,13 @@ properties:
7576
minItems: 1
7677
maxItems: 3
7778

78-
clocks: true
79+
clocks:
80+
minItems: 1
81+
maxItems: 4
7982

80-
clock-names: true
83+
clock-names:
84+
minItems: 1
85+
maxItems: 4
8186

8287
dmas:
8388
minItems: 4
@@ -118,7 +123,9 @@ allOf:
118123
properties:
119124
compatible:
120125
contains:
121-
const: renesas,rzg2l-sdhi
126+
enum:
127+
- renesas,sdhi-r9a09g057
128+
- renesas,rzg2l-sdhi
122129
then:
123130
properties:
124131
clocks:

‎Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ properties:
4343
- rockchip,rv1108-dw-mshc
4444
- rockchip,rv1126-dw-mshc
4545
- const: rockchip,rk3288-dw-mshc
46+
# for Rockchip RK3576 with phase tuning inside the controller
47+
- const: rockchip,rk3576-dw-mshc
4648

4749
reg:
4850
maxItems: 1

‎Documentation/devicetree/bindings/mmc/sdhci-atmel.txt

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

0 commit comments

Comments
 (0)