Merge branch 'for-linus' of git://neil.brown.name/md

[pandora-kernel.git] / drivers / mmc / host / sdhci-tegra.c

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 18b0bd3..e2e18d3 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -13,15 +13,21 @@
  */
 
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/gpio.h>
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
+#include <linux/module.h>
 
-#include <mach/gpio.h>
+#include <asm/gpio.h>
+
+#include <mach/gpio-tegra.h>
 #include <mach/sdhci.h>
 
 #include "sdhci-pltfm.h"
@@ -73,10 +79,8 @@ static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
 
 static unsigned int tegra_sdhci_get_ro(struct sdhci_host *sdhci)
 {
-       struct platform_device *pdev = to_platform_device(mmc_dev(sdhci->mmc));
-       struct tegra_sdhci_platform_data *plat;
-
-       plat = pdev->dev.platform_data;
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(sdhci);
+       struct tegra_sdhci_platform_data *plat = pltfm_host->priv;
 
        if (!gpio_is_valid(plat->wp_gpio))
                return -1;
@@ -94,12 +98,10 @@ static irqreturn_t carddetect_irq(int irq, void *data)
 
 static int tegra_sdhci_8bit(struct sdhci_host *host, int bus_width)
 {
-       struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
-       struct tegra_sdhci_platform_data *plat;
+       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+       struct tegra_sdhci_platform_data *plat = pltfm_host->priv;
        u32 ctrl;
 
-       plat = pdev->dev.platform_data;
-
        ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
        if (plat->is_8bit && bus_width == MMC_BUS_WIDTH_8) {
                ctrl &= ~SDHCI_CTRL_4BITBUS;
@@ -131,6 +133,36 @@ static struct sdhci_pltfm_data sdhci_tegra_pdata = {
        .ops  = &tegra_sdhci_ops,
 };
 
+static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = {
+       { .compatible = "nvidia,tegra20-sdhci", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
+
+static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
+                                               struct platform_device *pdev)
+{
+       struct tegra_sdhci_platform_data *plat;
+       struct device_node *np = pdev->dev.of_node;
+
+       if (!np)
+               return NULL;
+
+       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       if (!plat) {
+               dev_err(&pdev->dev, "Can't allocate platform data\n");
+               return NULL;
+       }
+
+       plat->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
+       plat->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
+       plat->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
+       if (of_find_property(np, "support-8bit", NULL))
+               plat->is_8bit = 1;
+
+       return plat;
+}
+
 static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
 {
        struct sdhci_pltfm_host *pltfm_host;
@@ -147,12 +179,17 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
 
        plat = pdev->dev.platform_data;
 
+       if (plat == NULL)
+               plat = sdhci_tegra_dt_parse_pdata(pdev);
+
        if (plat == NULL) {
                dev_err(mmc_dev(host->mmc), "missing platform data\n");
                rc = -ENXIO;
                goto err_no_plat;
        }
 
+       pltfm_host->priv = plat;
+
        if (gpio_is_valid(plat->power_gpio)) {
                rc = gpio_request(plat->power_gpio, "sdhci_power");
                if (rc) {
@@ -247,13 +284,11 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
 {
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-       struct tegra_sdhci_platform_data *plat;
+       struct tegra_sdhci_platform_data *plat = pltfm_host->priv;
        int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
 
        sdhci_remove_host(host, dead);
 
-       plat = pdev->dev.platform_data;
-
        if (gpio_is_valid(plat->wp_gpio)) {
                tegra_gpio_disable(plat->wp_gpio);
                gpio_free(plat->wp_gpio);
@@ -282,13 +317,11 @@ static struct platform_driver sdhci_tegra_driver = {
        .driver         = {
                .name   = "sdhci-tegra",
                .owner  = THIS_MODULE,
+               .of_match_table = sdhci_tegra_dt_match,
+               .pm     = SDHCI_PLTFM_PMOPS,
        },
        .probe          = sdhci_tegra_probe,
        .remove         = __devexit_p(sdhci_tegra_remove),
-#ifdef CONFIG_PM
-       .suspend        = sdhci_pltfm_suspend,
-       .resume         = sdhci_pltfm_resume,
-#endif
 };
 
 static int __init sdhci_tegra_init(void)