mmc: sdhci-cadence: add Socionext UniPhier specific compatible string

Add a Socionext SoC specific compatible (suggested by Rob Herring).

No SoC specific data are associated with the compatible strings for
now, but other SoC vendors may use this IP and want to differentiate
IP variants in the future.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt b/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt
index 750374fc9d945d39f4426e22eed96532e3ba3e9f..c0f37cb41a9b47516f29cafa573d7886d103a2a7 100644 (file)
--- a/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt
@@ -1,7 +1,9 @@
 * Cadence SD/SDIO/eMMC Host Controller
 
 Required properties:
-- compatible: should be "cdns,sd4hc".
+- compatible: should be one of the following:
+    "cdns,sd4hc"               - default of the IP
+    "socionext,uniphier-sd4hc" - for Socionext UniPhier SoCs
 - reg: offset and length of the register set for the device.
 - interrupts: a single interrupt specifier.
 - clocks: phandle to the input clock.
@@ -19,7 +21,7 @@ if supported.  See mmc.txt for details.
 
 Example:
        emmc: sdhci@5a000000 {
-               compatible = "cdns,sd4hc";
+               compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
                reg = <0x5a000000 0x400>;
                interrupts = <0 78 4>;
                clocks = <&clk 4>;

diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index 1501cfdac4734246aa6746ed5ee8d2678122d964..4b0ecb981842248b1cc4ea8edaf35dc4bac753e1 100644 (file)
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -262,6 +262,7 @@ disable_clk:
 }
 
 static const struct of_device_id sdhci_cdns_match[] = {
+       { .compatible = "socionext,uniphier-sd4hc" },
        { .compatible = "cdns,sd4hc" },
        { /* sentinel */ }
 };