Skip to content

Commit 647412d

Browse files
committed
Merge tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC updates from Ulf Hansson: "MMC core: - Export SDIO revision and info strings to userspace - Add support for specifying mmc/mmcblk index via mmc aliases in DT MMC host: - Enable support for async probe for all mmc host drivers - Enable compile testing of multiple host drivers - dw_mmc: Enable the Synopsys DesignWare driver for RISCV and CSKY - mtk-sd: Fixup support for CQHCI - owl-mmc: Add support for the actions,s700-mmc variant - renesas_sdhi: Fix regression (temporary) for re-insertion of SD cards - renesas_sdhi: Add support for the r8a774e1 variant - renesas_sdhi/tmio: Improvements for tunings - renesas_sdhi/tmio: Rework support for reset of controller - sdhci-acpi: Fix HS400 tuning for devices with invalid presets on AMDI0040 - sdhci_am654: Improve support for tunings - sdhci_am654: Add support for input tap delays - sdhci_am654: Add workaround for card detect debounce timer - sdhci-am654: Add support for the TI's J7200 variants - sdhci-esdhc-imx: Fix support for manual tuning - sdhci-iproc: Enable support for eMMC DDR 3.3V for bcm2711 - sdhci-msm: Fix stability issues with HS400 for sc7180 - sdhci-of-sparx5: Add Sparx5 SoC eMMC driver - sdhci-of-esdhc: Fixup reference clock source selection - sdhci-pci: Add LTR support for some Intel BYT controllers - sdhci-pci-gli: Add CQHCI Support for GL9763E" * tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (91 commits) mmc: sdhci_am654: Fix module autoload mmc: renesas_sdhi: workaround a regression when reinserting SD cards mmc: sdhci-pci-gli: Add CQHCI Support for GL9763E mmc: sdhci-acpi: AMDI0040: Set SDHCI_QUIRK2_PRESET_VALUE_BROKEN mmc: sdhci_am654: Enable tuning for SDR50 mmc: sdhci_am654: Add support for software tuning mmc: sdhci_am654: Add support for input tap delay mmc: sdhci_am654: Fix hard coded otap delay array size dt-bindings: mmc: sdhci-am654: Add documentation for input tap delay dt-bindings: mmc: sdhci-am654: Convert sdhci-am654 controller documentation to json schema mmc: sdhci-of-esdhc: fix reference clock source selection mmc: host: fix depends for MMC_MESON_GX w/ COMPILE_TEST mmc: sdhci-s3c: hide forward declaration of of_device_id behind CONFIG_OF mmc: sdhci: fix indentation mistakes mmc: moxart: remove unneeded check for drvdata mmc: renesas_sdhi: drop local flag for tuning mmc: rtsx_usb_sdmmc: simplify the return expression of sd_change_phase() mmc: core: document mmc_hw_reset() mmc: mediatek: Drop pointer to mmc_host from msdc_host dt-bindings: mmc: owl: add compatible string actions,s700-mmc ...
2 parents dfef313 + 1e23400 commit 647412d

105 files changed

Lines changed: 1743 additions & 404 deletions

File tree

Some content is hidden

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

Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ examples:
6262
};
6363
6464
mmc@5b010000 {
65-
compatible = "fsl,imx8qxp-usdhc";
65+
compatible = "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc";
6666
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>;
6767
reg = <0x5b010000 0x10000>;
6868
clocks = <&conn_lpcg IMX_CONN_LPCG_SDHC0_IPG_CLK>,

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,26 @@ description: |
2121
2222
properties:
2323
compatible:
24-
enum:
25-
- fsl,imx25-esdhc
26-
- fsl,imx35-esdhc
27-
- fsl,imx51-esdhc
28-
- fsl,imx53-esdhc
29-
- fsl,imx6q-usdhc
30-
- fsl,imx6sl-usdhc
31-
- fsl,imx6sx-usdhc
32-
- fsl,imx6ull-usdhc
33-
- fsl,imx7d-usdhc
34-
- fsl,imx7ulp-usdhc
35-
- fsl,imx8mq-usdhc
36-
- fsl,imx8mm-usdhc
37-
- fsl,imx8mn-usdhc
38-
- fsl,imx8mp-usdhc
39-
- fsl,imx8qm-usdhc
40-
- fsl,imx8qxp-usdhc
24+
oneOf:
25+
- enum:
26+
- fsl,imx25-esdhc
27+
- fsl,imx35-esdhc
28+
- fsl,imx51-esdhc
29+
- fsl,imx53-esdhc
30+
- fsl,imx6q-usdhc
31+
- fsl,imx6sl-usdhc
32+
- fsl,imx6sx-usdhc
33+
- fsl,imx6ull-usdhc
34+
- fsl,imx7d-usdhc
35+
- fsl,imx7ulp-usdhc
36+
- items:
37+
- enum:
38+
- fsl,imx8mm-usdhc
39+
- fsl,imx8mn-usdhc
40+
- fsl,imx8mp-usdhc
41+
- fsl,imx8mq-usdhc
42+
- fsl,imx8qxp-usdhc
43+
- const: fsl,imx7d-usdhc
4144

4245
reg:
4346
maxItems: 1
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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,dw-sparx5-sdhci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Sparx5 Mobile Storage Host Controller Binding
8+
9+
allOf:
10+
- $ref: "mmc-controller.yaml"
11+
12+
maintainers:
13+
- Lars Povlsen <lars.povlsen@microchip.com>
14+
15+
# Everything else is described in the common file
16+
properties:
17+
compatible:
18+
const: microchip,dw-sparx5-sdhci
19+
20+
reg:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
description:
29+
Handle to "core" clock for the sdhci controller.
30+
31+
clock-names:
32+
items:
33+
- const: core
34+
35+
microchip,clock-delay:
36+
description: Delay clock to card to meet setup time requirements.
37+
Each step increase by 1.25ns.
38+
$ref: "/schemas/types.yaml#/definitions/uint32"
39+
minimum: 1
40+
maximum: 15
41+
42+
required:
43+
- compatible
44+
- reg
45+
- interrupts
46+
- clocks
47+
- clock-names
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/arm-gic.h>
52+
#include <dt-bindings/clock/microchip,sparx5.h>
53+
sdhci0: mmc@600800000 {
54+
compatible = "microchip,dw-sparx5-sdhci";
55+
reg = <0x00800000 0x1000>;
56+
pinctrl-0 = <&emmc_pins>;
57+
pinctrl-names = "default";
58+
clocks = <&clks CLK_ID_AUX1>;
59+
clock-names = "core";
60+
assigned-clocks = <&clks CLK_ID_AUX1>;
61+
assigned-clock-rates = <800000000>;
62+
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
63+
bus-width = <8>;
64+
microchip,clock-delay = <10>;
65+
};

Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ description: |
1414
that requires the respective functionality should implement them using
1515
these definitions.
1616
17+
It is possible to assign a fixed index mmcN to an MMC host controller
18+
(and the corresponding mmcblkN devices) by defining an alias in the
19+
/aliases device tree node.
20+
1721
properties:
1822
$nodename:
1923
pattern: "^mmc(@.*)?$"

Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ properties:
2020

2121
reset-gpios:
2222
minItems: 1
23+
# Put some limit to avoid false warnings
24+
maxItems: 32
2325
description:
2426
contains a list of GPIO specifiers. The reset GPIOs are asserted
2527
at initialization and prior we start the power up procedure of the card.

Documentation/devicetree/bindings/mmc/owl-mmc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ maintainers:
1414

1515
properties:
1616
compatible:
17-
const: actions,owl-mmc
17+
oneOf:
18+
- const: actions,owl-mmc
19+
- items:
20+
- const: actions,s700-mmc
21+
- const: actions,owl-mmc
1822

1923
reg:
2024
maxItems: 1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ properties:
5050
- renesas,sdhi-r8a774a1 # RZ/G2M
5151
- renesas,sdhi-r8a774b1 # RZ/G2N
5252
- renesas,sdhi-r8a774c0 # RZ/G2E
53+
- renesas,sdhi-r8a774e1 # RZ/G2H
5354
- renesas,sdhi-r8a7795 # R-Car H3
5455
- renesas,sdhi-r8a7796 # R-Car M3-W
5556
- renesas,sdhi-r8a77961 # R-Car M3-W+

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

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

0 commit comments

Comments
 (0)