Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 297f40a..b6ee0d7 100644 (file)
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -29,6 +29,7 @@
 #include <linux/mmc/host.h>
 
 #include <linux/io.h>
+#include <linux/sdhci-pltfm.h>
 
 #include "sdhci.h"
 
@@ -49,19 +50,18 @@ static struct sdhci_ops sdhci_pltfm_ops = {
 
 static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 {
+       struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
        struct sdhci_host *host;
        struct resource *iomem;
        int ret;
 
-       BUG_ON(pdev == NULL);
-
        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!iomem) {
                ret = -ENOMEM;
                goto err;
        }
 
-       if (resource_size(iomem) != 0x100)
+       if (resource_size(iomem) < 0x100)
                dev_err(&pdev->dev, "Invalid iomem size. You may "
                        "experience problems.\n");
 
@@ -76,7 +76,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
        }
 
        host->hw_name = "platform";
-       host->ops = &sdhci_pltfm_ops;
+       if (pdata && pdata->ops)
+               host->ops = pdata->ops;
+       else
+               host->ops = &sdhci_pltfm_ops;
+       if (pdata)
+               host->quirks = pdata->quirks;
        host->irq = platform_get_irq(pdev, 0);
 
        if (!request_mem_region(iomem->start, resource_size(iomem),
@@ -93,6 +98,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
                goto err_remap;
        }
 
+       if (pdata && pdata->init) {
+               ret = pdata->init(host);
+               if (ret)
+                       goto err_plat_init;
+       }
+
        ret = sdhci_add_host(host);
        if (ret)
                goto err_add_host;
@@ -102,6 +113,9 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
        return 0;
 
 err_add_host:
+       if (pdata && pdata->exit)
+               pdata->exit(host);
+err_plat_init:
        iounmap(host->ioaddr);
 err_remap:
        release_mem_region(iomem->start, resource_size(iomem));
@@ -114,6 +128,7 @@ err:
 
 static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
 {
+       struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        int dead;
@@ -125,6 +140,8 @@ static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
                dead = 1;
 
        sdhci_remove_host(host, dead);
+       if (pdata && pdata->exit)
+               pdata->exit(host);
        iounmap(host->ioaddr);
        release_mem_region(iomem->start, resource_size(iomem));
        sdhci_free_host(host);
@@ -165,4 +182,3 @@ MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
 MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:sdhci");
-