forked from torvalds/linux
-
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.20' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/ulfh/mmc Pull MMC updates from Ulf Hansson: "MMC core: - Add support for the asynchronous SDIO wakeup interrupts - Skip redundant evaluation of eMMC HS400 caps when no-MMC-cap - Add support to store error stats from host drivers - Extend debugfs to show error stats from host drivers - Add single I/O read support in the recovery path for 4k sector cards MMC host: - dw_mmc-exynos: Convert corresponding DT bindings to the dtschema - dw_mmc-rockchip: Add support for the Rockchip RV1126 variant - mmc_spi: Convert corresponding DT bindings to the dtschema - mtk-sd: Extend support for interrupts/pinctrls for SDIO low-power mode - mtk-sd: Add support for SDIO wake irqs - mtk-sd: Add support for the Mediatek MT8188 variant - renesas_sdhi: Drop redundant manual tap correction for newer SoCs - renesas_sdhi: Add support for the R-Car S4-8 and generic Gen4 variants - sdhci/cqhci: Add support to capture stats from host errors - sdhci-brcmstb: Add ability to increase max clock rate for SDIO on 72116b0 - sdhci-msm: Add support for the MSM8998 and SM8450 variant - sdhci-of-at91: Fixup UHS-I mode by rewriting of MC1R - sdhci-of-dwcmshc: Add support for the Rockchip rk3588 variant - sdhci-of-dwcmshc: Enable reset support for the Rockchip variants - sdhci-pci-gli: Improve I/O read/write performance for GL9763E - sdhci-s3c: Convert corresponding DT bindings to the dtschema - tmio: Avoid glitches when resetting MEMSTICK core: - A couple of minor fixes and cleanups" * tag 'mmc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (61 commits) mmc: mediatek: add support for SDIO eint wakup IRQ mmc: core: Add support for SDIO wakeup interrupt dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties dt-bindings: mmc: rockchip-dw-mshc: Document Rockchip RV1126 mmc: renesas_sdhi: newer SoCs don't need manual tap correction mmc: cavium-thunderx: Add of_node_put() when breaking out of loop mmc: cavium-octeon: Add of_node_put() when breaking out of loop mmc: core: quirks: Add of_node_put() when breaking out of loop mmc: sdhci-brcmstb: use clk_get_rate(base_clk) in PM resume dt-bindings: mmc: sdhci-msm: Document the SM8450 compatible mmc: sdhci-msm: drop redundant of_device_id entries dt-bindings: mmc: sdhci-msm: add MSM8998 mmc: block: Add single read for 4k sector cards mmc: mxcmmc: Use mmc_card_sdio macro mmc: core: Use mmc_card_* macro and add a new for the sd_combo type dt-bindings: mmc: sdhci-msm: constrain reg-names per variants dt-bindings: mmc: sdhci-msm: fix reg-names entries dt-bindings: mmc: Add compatible for MediaTek MT8188 dt-bindings: mmc: sdhci-msm: document resets mmc: sdhci-of-at91: fix set_uhs_signaling rewriting of MC1R ...
- Loading branch information
Showing
49 changed files
with
1,152 additions
and
362 deletions.
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -10,9 +10,6 @@ maintainers: | |
| - Al Cooper <[email protected]> | ||
| - Florian Fainelli <[email protected]> | ||
|
|
||
| allOf: | ||
| - $ref: mmc-controller.yaml# | ||
|
|
||
| properties: | ||
| compatible: | ||
| oneOf: | ||
|
|
@@ -42,23 +39,46 @@ properties: | |
| maxItems: 1 | ||
|
|
||
| clocks: | ||
| maxItems: 1 | ||
| description: | ||
| handle to core clock for the sdhci controller. | ||
| minItems: 1 | ||
| items: | ||
| - description: handle to core clock for the sdhci controller | ||
| - description: handle to improved 150Mhz clock for sdhci controller (Optional clock) | ||
|
|
||
| clock-names: | ||
| minItems: 1 | ||
| items: | ||
| - const: sw_sdio | ||
| - const: sdio_freq # Optional clock | ||
|
|
||
| clock-frequency: | ||
| description: | ||
| Maximum operating frequency of sdio_freq sdhci controller clock | ||
| $ref: /schemas/types.yaml#/definitions/uint32 | ||
| minimum: 100000000 | ||
| maximum: 150000000 | ||
|
|
||
| sdhci,auto-cmd12: | ||
| type: boolean | ||
| description: Specifies that controller should use auto CMD12 | ||
|
|
||
| allOf: | ||
| - $ref: mmc-controller.yaml# | ||
| - if: | ||
| properties: | ||
| clock-names: | ||
| contains: | ||
| const: sdio_freq | ||
|
|
||
| then: | ||
| required: | ||
| - clock-frequency | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - interrupts | ||
| - clocks | ||
| - clock-names | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
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,77 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/mmc/mmc-spi-slot.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: MMC/SD/SDIO slot directly connected to a SPI bus | ||
|
|
||
| maintainers: | ||
| - Ulf Hansson <[email protected]> | ||
|
|
||
| allOf: | ||
| - $ref: "mmc-controller.yaml" | ||
| - $ref: /schemas/spi/spi-peripheral-props.yaml | ||
|
|
||
| description: | | ||
| The extra properties used by an mmc connected via SPI. | ||
| properties: | ||
| compatible: | ||
| const: mmc-spi-slot | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| spi-max-frequency: true | ||
|
|
||
| interrupts: | ||
| maxItems: 1 | ||
|
|
||
| voltage-ranges: | ||
| $ref: /schemas/types.yaml#/definitions/uint32-array | ||
| description: | | ||
| Two cells are required, first cell specifies minimum slot voltage (mV), | ||
| second cell specifies maximum slot voltage (mV). | ||
| items: | ||
| - description: | | ||
| value for minimum slot voltage in mV | ||
| default: 3200 | ||
| - description: | | ||
| value for maximum slot voltage in mV | ||
| default: 3400 | ||
| gpios: | ||
| description: | | ||
| For historical reasons, this does not follow the generic mmc-controller | ||
| binding. | ||
| minItems: 1 | ||
| items: | ||
| - description: Card-Detect GPIO | ||
| - description: Write-Protect GPIO | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - spi-max-frequency | ||
|
|
||
| unevaluatedProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| #include <dt-bindings/gpio/gpio.h> | ||
| spi { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| mmc@0 { | ||
| compatible = "mmc-spi-slot"; | ||
| reg = <0>; | ||
| gpios = <&gpio 14 GPIO_ACTIVE_LOW>, <&gpio 15 GPIO_ACTIVE_HIGH>; | ||
| voltage-ranges = <3300 3300>; | ||
| spi-max-frequency = <50000000>; | ||
| interrupts = <42>; | ||
| interrupt-parent = <&PIC>; | ||
| }; | ||
| }; | ||
| ... |
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
Oops, something went wrong.