-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mmc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git…
…/ulfh/mmc Pull MMC updates from Ulf Hansson: "MMC core: - Enable erase/discard/trim support for all (e)MMC/SD hosts - Export information through sysfs about enhanced RPMB support (eMMC v5.1+) - Align the initialization commands for SDIO cards - Fix SDIO initialization to prevent memory leaks and NULL pointer errors - Do not export undefined MMC_NAME/MODALIAS for SDIO cards - Export device/vendor field from common CIS for SDIO cards - Move SDIO IDs from functional drivers to the common SDIO header - Introduce the ->request_atomic() host ops MMC host: - Improve support for HW busy signaling for several hosts - Converting some DT bindings to the json-schema - meson-mx-sdhc: Add driver and DT doc for the Amlogic Meson SDHC controller - meson-mx-sdio: Run a soft reset to recover from timeout/CRC error - mmci: Convert to use mmc_regulator_set_vqmmc() - mmci_stm32_sdmmc: Fix a couple of DMA bugs - mmci_stm32_sdmmc: Fix power on issue - renesas,mmcif,sdhci: Document r8a7742 DT bindings - renesas_sdhi: Add support for M3-W ES1.2 and 1.3 revisions - renesas_sdhi: Improvements to the TAP selection - renesas_sdhi/tmio: Further fixup runtime PM management at ->remove() - sdhci: Introduce ops to dump vendor specific registers - sdhci-cadence: Fix PHY write sequence - sdhci-esdhc-imx: Improve tunings - sdhci-esdhc-imx: Enable GPIO card detect as system wakeup - sdhci-esdhc-imx: Add HS400 support for i.MX6SLL - sdhci-esdhc-mcf: Add driver for the Coldfire/M5441X esdhc controller - m68k: mcf5441x: Add platform data to enable esdhc mmc controller - sdhci-msm: Improve HS400 tuning - sdhci-msm: Dump vendor specific registers at error - sdhci-msm: Add support for DLL/DDR properties provided from DT - sdhci-msm: Add support for the sm8250 variant - sdhci-msm: Add support for DVFS by converting to dev_pm_opp_set_rate() - sdhci-of-arasan: Add support for Intel Keem Bay variant - sdhci-of-arasan: Add support for Xilinx Versal SD variant - sdhci-of-dwcmshc: Add support for system suspend/resume - sdhci-of-dwcmshc: Fix UHS signaling support - sdhci-of-esdhc: Fix tuning for eMMC HS400 mode - sdhci-pci-gli: Add Genesys Logic GL9763E support - sdhci-sprd: Add support for the ->request_atomic() ops - sdhci-tegra: Avoid reading autocal timeout values when not applicable MEMSTICK: - Minor trivial update" * tag 'mmc-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (127 commits) dt-bindings: mmc: Convert sdhci-pxa to json-schema mmc: sdhci-msm: Clear tuning done flag while hs400 tuning mmc: core: Export device/vendor ids from Common CIS for SDIO cards mmc: core: Do not export MMC_NAME= and MODALIAS=mmc:block for SDIO cards mmc: sdhci-of-at91: fix CALCR register being rewritten mmc: sdhci-esdhc-imx: disable the CMD CRC check for standard tuning mmc: sdhci-esdhc-imx: fix the mask for tuning start point mmc: host: sdhci-esdhc-imx: add wakeup feature for GPIO CD pin mmc: mmci_sdmmc: fix DMA API warning max segment size mmc: mmci_sdmmc: fix DMA API warning overlapping mappings mmc: sdhci-of-arasan: Add support for Intel Keem Bay dt-bindings: mmc: arasan: Add compatible strings for Intel Keem Bay mmc: sdhci-cadence: fix PHY write mmc: sdio: Sort all SDIO IDs in common include file mmc: sdio: Fix Cypress SDIO IDs macros in common include file mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file mmc: sdio: Move SDIO IDs from ath10k driver to common include file mmc: sdio: Move SDIO IDs from ath6kl driver to common include file mmc: sdio: Move SDIO IDs from smssdio driver to common include file mmc: sdio: Move SDIO IDs from btmtksdio driver to common include file ...
- Loading branch information
Showing
98 changed files
with
3,881 additions
and
796 deletions.
There are no files selected for viewing
68 changes: 68 additions & 0 deletions
68
Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdhc.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/mmc/amlogic,meson-mx-sdhc.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Amlogic Meson SDHC controller Device Tree Bindings | ||
|
||
allOf: | ||
- $ref: "mmc-controller.yaml" | ||
|
||
maintainers: | ||
- Martin Blumenstingl <martin.blumenstingl@googlemail.com> | ||
|
||
description: | | ||
The SDHC MMC host controller on Amlogic SoCs provides an eMMC and MMC | ||
card interface with 1/4/8-bit bus width. | ||
It supports eMMC spec 4.4x/4.5x including HS200 (up to 100MHz clock). | ||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- amlogic,meson8-sdhc | ||
- amlogic,meson8b-sdhc | ||
- amlogic,meson8m2-sdhc | ||
- const: amlogic,meson-mx-sdhc | ||
|
||
reg: | ||
minItems: 1 | ||
|
||
interrupts: | ||
minItems: 1 | ||
|
||
clocks: | ||
minItems: 5 | ||
|
||
clock-names: | ||
items: | ||
- const: clkin0 | ||
- const: clkin1 | ||
- const: clkin2 | ||
- const: clkin3 | ||
- const: pclk | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/interrupt-controller/irq.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
sdhc: mmc@8e00 { | ||
compatible = "amlogic,meson8-sdhc", "amlogic,meson-mx-sdhc"; | ||
reg = <0x8e00 0x42>; | ||
interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>; | ||
clocks = <&xtal>, | ||
<&fclk_div4>, | ||
<&fclk_div3>, | ||
<&fclk_div5>, | ||
<&sdhc_pclk>; | ||
clock-names = "clkin0", "clkin1", "clkin2", "clkin3", "pclk"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
# SPDX-License-Identifier: GPL-2.0-only | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/mmc/sdhci-pxa.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Marvell PXA SDHCI v2/v3 bindings | ||
|
||
maintainers: | ||
- Ulf Hansson <ulf.hansson@linaro.org> | ||
|
||
allOf: | ||
- $ref: mmc-controller.yaml# | ||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: marvell,armada-380-sdhci | ||
then: | ||
properties: | ||
regs: | ||
minItems: 3 | ||
reg-names: | ||
minItems: 3 | ||
required: | ||
- reg-names | ||
else: | ||
properties: | ||
regs: | ||
maxItems: 1 | ||
reg-names: | ||
maxItems: 1 | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- mrvl,pxav2-mmc | ||
- mrvl,pxav3-mmc | ||
- marvell,armada-380-sdhci | ||
|
||
reg: | ||
minItems: 1 | ||
maxItems: 3 | ||
|
||
reg-names: | ||
items: | ||
- const: sdhci | ||
- const: mbus | ||
- const: conf-sdio3 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
clocks: | ||
minItems: 1 | ||
maxItems: 2 | ||
|
||
clock-names: | ||
minItems: 1 | ||
maxItems: 2 | ||
items: | ||
- const: io | ||
- const: core | ||
|
||
mrvl,clk-delay-cycles: | ||
description: Specify a number of cycles to delay for tuning. | ||
$ref: /schemas/types.yaml#/definitions/uint32 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/berlin2.h> | ||
mmc@d4280800 { | ||
compatible = "mrvl,pxav3-mmc"; | ||
reg = <0xd4280800 0x800>; | ||
bus-width = <8>; | ||
interrupts = <27>; | ||
clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>; | ||
clock-names = "io", "core"; | ||
non-removable; | ||
mrvl,clk-delay-cycles = <31>; | ||
}; | ||
- | | ||
mmc@d8000 { | ||
compatible = "marvell,armada-380-sdhci"; | ||
reg-names = "sdhci", "mbus", "conf-sdio3"; | ||
reg = <0xd8000 0x1000>, | ||
<0xdc000 0x100>, | ||
<0x18454 0x4>; | ||
interrupts = <0 25 0x4>; | ||
clocks = <&gateclk 17>; | ||
clock-names = "io"; | ||
mrvl,clk-delay-cycles = <0x1F>; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.