From b708fad5e22ef42825fbd778644747054a83bb7a Mon Sep 17 00:00:00 2001
From: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Date: Tue, 31 Jul 2012 10:12:59 +0200
Subject: [PATCH] --- yaml --- r: 332794 b: refs/heads/master c:
 4ee7ed0de9929f6f194d7a0ae867371ea47866fe h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 .../devicetree/bindings/mmc/sdhci-dove.txt         | 14 ++++++++++++++
 trunk/drivers/mmc/host/sdhci-dove.c                |  8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt

diff --git a/[refs] b/[refs]
index 61c5967db20d..5a34fbc360eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 164378efe7612ae1506d1a3b21fd37abf9909a5c
+refs/heads/master: 4ee7ed0de9929f6f194d7a0ae867371ea47866fe
diff --git a/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt b/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt
new file mode 100644
index 000000000000..ae9aab9abcd7
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt
@@ -0,0 +1,14 @@
+* Marvell sdhci-dove controller
+
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers.
+
+- compatible: Should be "marvell,dove-sdhci".
+
+Example:
+
+sdio0: sdio@92000 {
+	compatible = "marvell,dove-sdhci";
+	reg = <0x92000 0x100>;
+	interrupts = <35>;
+};
diff --git a/trunk/drivers/mmc/host/sdhci-dove.c b/trunk/drivers/mmc/host/sdhci-dove.c
index a6e53a1ebb08..90140eb03e36 100644
--- a/trunk/drivers/mmc/host/sdhci-dove.c
+++ b/trunk/drivers/mmc/host/sdhci-dove.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/mmc/host.h>
+#include <linux/of.h>
 
 #include "sdhci-pltfm.h"
 
@@ -126,11 +127,18 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev)
 	return sdhci_pltfm_unregister(pdev);
 }
 
+static const struct of_device_id sdhci_dove_of_match_table[] __devinitdata = {
+	{ .compatible = "marvell,dove-sdhci", },
+	{}
+};
+MODULE_DEVICE_TABLE(of, sdhci_dove_of_match_table);
+
 static struct platform_driver sdhci_dove_driver = {
 	.driver		= {
 		.name	= "sdhci-dove",
 		.owner	= THIS_MODULE,
 		.pm	= SDHCI_PLTFM_PMOPS,
+		.of_match_table = of_match_ptr(sdhci_dove_of_match_table),
 	},
 	.probe		= sdhci_dove_probe,
 	.remove		= __devexit_p(sdhci_dove_remove),