mmc: sdhci-spear: add device tree bindings

This adds simple DT bindings for SDHCI SPEAr controller. It uses cd-gpios
from common mmc bindings.

This also fixes spear300-evb.dts with correct name for card detect binding.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-spear.txt b/Documentation/devicetree/bindings/mmc/sdhci-spear.txt
new file mode 100644 (file)
index 0000000..84d6e29
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/sdhci-spear.txt
@@ -0,0 +1,21 @@
+* SPEAr SDHCI Controller
+
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci-spear driver.
+
+Required properties:
+- compatible: "st,spear300-sdhci"
+
+Optional properties:
+- cd-gpios: card detect gpio, with zero flags.
+
+If your board don't support these gpios then don't pass the entry.
+
+Example:
+
+       sdhci@fc000000 {
+               compatible = "st,spear300-sdhci";
+               reg = <0xfc000000 0x1000>;
+
+               cd-gpios = <&gpio0 6 0>
+       };

diff --git a/arch/arm/boot/dts/spear300-evb.dts b/arch/arm/boot/dts/spear300-evb.dts
index d71b8d581e3d39f77ea8d783303b9eb8a2388030..1e7c7a8e2123f63b3f671d4f5fcb8bd2fe1f8dd1 100644 (file)
--- a/arch/arm/boot/dts/spear300-evb.dts
+++ b/arch/arm/boot/dts/spear300-evb.dts
@@ -80,8 +80,7 @@
                };
 
                sdhci@70000000 {
-                       int-gpio = <&gpio1 0 0>;
-                       power-gpio = <&gpio1 2 1>;
+                       cd-gpios = <&gpio1 0 0>;
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/spear320-evb.dts b/arch/arm/boot/dts/spear320-evb.dts
index e4e912f9502466da3ab44a26eda9f8c83e383d8e..082328bd64abd1e09591b1555b7b130c35dd06a6 100644 (file)
--- a/arch/arm/boot/dts/spear320-evb.dts
+++ b/arch/arm/boot/dts/spear320-evb.dts
@@ -103,8 +103,6 @@
                };
 
                sdhci@70000000 {
-                       power-gpio = <&gpio0 2 1>;
-                       power_always_enb;
                        status = "okay";
                };
 

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 423da8194cd84e5597c169316311a5ff9629b845..ecad282741d69a0cb28a6196f68fc36a7b7a9c4f 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -20,6 +20,8 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
@@ -68,8 +70,42 @@ static irqreturn_t sdhci_gpio_irq(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static struct sdhci_plat_data * __devinit
+sdhci_probe_config_dt(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       struct sdhci_plat_data *pdata = NULL;
+       int cd_gpio;
+
+       cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
+       if (!gpio_is_valid(cd_gpio))
+               cd_gpio = -1;
+
+       /* If pdata is required */
+       if (cd_gpio != -1) {
+               pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+               if (!pdata) {
+                       dev_err(&pdev->dev, "DT: kzalloc failed\n");
+                       return ERR_PTR(-ENOMEM);
+               }
+       }
+
+       pdata->card_int_gpio = cd_gpio;
+
+       return pdata;
+}
+#else
+static struct sdhci_plat_data * __devinit
+sdhci_probe_config_dt(struct platform_device *pdev)
+{
+       return ERR_PTR(-ENOSYS);
+}
+#endif
+
 static int __devinit sdhci_probe(struct platform_device *pdev)
 {
+       struct device_node *np = pdev->dev.of_node;
        struct sdhci_host *host;
        struct resource *iomem;
        struct spear_sdhci *sdhci;
@@ -110,8 +146,16 @@ static int __devinit sdhci_probe(struct platform_device *pdev)
                goto put_clk;
        }
 
-       /* overwrite platform_data */
-       sdhci->data = dev_get_platdata(&pdev->dev);
+       if (np) {
+               sdhci->data = sdhci_probe_config_dt(pdev);
+               if (IS_ERR(sdhci->data)) {
+                       dev_err(&pdev->dev, "DT: Failed to get pdata\n");
+                       return -ENODEV;
+               }
+       } else {
+               sdhci->data = dev_get_platdata(&pdev->dev);
+       }
+
        pdev->dev.platform_data = sdhci;
 
        if (pdev->dev.parent)
@@ -276,11 +320,20 @@ static int sdhci_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(sdhci_pm_ops, sdhci_suspend, sdhci_resume);
 
+#ifdef CONFIG_OF
+static const struct of_device_id sdhci_spear_id_table[] = {
+       { .compatible = "st,spear300-sdhci" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, sdhci_spear_id_table);
+#endif
+
 static struct platform_driver sdhci_driver = {
        .driver = {
                .name   = "sdhci",
                .owner  = THIS_MODULE,
                .pm     = &sdhci_pm_ops,
+               .of_match_table = of_match_ptr(sdhci_spear_id_table),
        },
        .probe          = sdhci_probe,
        .remove         = __devexit_p(sdhci_remove),