Merge tag 'kgdb-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / mmc / sdhci-msm.txt

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt
index 502b3b851ebbeb326f12a2741cbd6ded52016319..da4edb146a983f432ca02f739e2483dd900098a1 100644 (file)
--- a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt
@@ -4,15 +4,28 @@ This file documents differences between the core properties in mmc.txt
 and the properties used by the sdhci-msm driver.
 
 Required properties:
-- compatible: Should contain:
+- compatible: Should contain a SoC-specific string and a IP version string:
+       version strings:
                "qcom,sdhci-msm-v4" for sdcc versions less than 5.0
-               "qcom,sdhci-msm-v5" for sdcc versions >= 5.0
+               "qcom,sdhci-msm-v5" for sdcc version 5.0
                For SDCC version 5.0.0, MCI registers are removed from SDCC
                interface and some registers are moved to HC. New compatible
                string is added to support this change - "qcom,sdhci-msm-v5".
+       full compatible strings with SoC and version:
+               "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"
+               "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"
+               "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"
+               "qcom,msm8992-sdhci", "qcom,sdhci-msm-v4"
+               "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4"
+               "qcom,sdm845-sdhci", "qcom,sdhci-msm-v5"
+               "qcom,qcs404-sdhci", "qcom,sdhci-msm-v5"
+       NOTE that some old device tree files may be floating around that only
+       have the string "qcom,sdhci-msm-v4" without the SoC compatible string
+       but doing that should be considered a deprecated practice.
+
 - reg: Base address and length of the register in the following order:
        - Host controller register map (required)
-       - SD Core register map (required)
+       - SD Core register map (required for msm-v4 and below)
 - interrupts: Should contain an interrupt-specifiers for the interrupts:
        - Host controller interrupt (required)
 - pinctrl-names: Should contain only one value - "default".
@@ -29,7 +42,7 @@ Required properties:
 Example:
 
        sdhc_1: sdhci@f9824900 {
-               compatible = "qcom,sdhci-msm-v4";
+               compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
                reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
                interrupts = <0 123 0>;
                bus-width = <8>;
@@ -46,7 +59,7 @@ Example:
        };
 
        sdhc_2: sdhci@f98a4900 {
-               compatible = "qcom,sdhci-msm-v4";
+               compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
                reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
                interrupts = <0 125 0>;
                bus-width = <4>;