From df1ef54a1fc61cb4b4e4e445a29021ceec8a1bbe Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 15 Jun 2011 13:18:06 -0600
Subject: [PATCH] --- yaml --- r: 256747 b: refs/heads/master c:
 e892bac102805f905e463a2cc7d0f870358cc1d5 h: refs/heads/master i:   256745:
 e1365484ee9928bc2ecc5a661c917b7530fd2f49   256743:
 e4210300ef6ebe2be8c46d857cb38f07b9c0dd6c v: v3

---
 [refs]                                               |  2 +-
 .../devicetree/bindings/spi/spi_nvidia.txt           |  5 +++++
 trunk/drivers/spi/spi-tegra.c                        | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt

diff --git a/[refs] b/[refs]
index 1a8b580731b2..9756c799ce03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e2943c04c74e537c762c09bcea89e923510a9ac
+refs/heads/master: e892bac102805f905e463a2cc7d0f870358cc1d5
diff --git a/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt b/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt
new file mode 100644
index 000000000000..bde450b50fcd
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt
@@ -0,0 +1,5 @@
+NVIDIA Tegra 2 SPI device
+
+Required properties:
+- compatible : should be "nvidia,tegra250-spi".
+- gpios : should specify GPIOs used for chipselect.
diff --git a/trunk/drivers/spi/spi-tegra.c b/trunk/drivers/spi/spi-tegra.c
index 8e30727b5221..a43ceeb1063a 100644
--- a/trunk/drivers/spi/spi-tegra.c
+++ b/trunk/drivers/spi/spi-tegra.c
@@ -546,6 +546,7 @@ static int __init spi_tegra_probe(struct platform_device *pdev)
 	tspi->rx_dma_req.req_sel = spi_tegra_req_sels[pdev->id];
 	tspi->rx_dma_req.dev = tspi;
 
+	master->dev.of_node = pdev->dev.of_node;
 	ret = spi_register_master(master);
 
 	if (ret < 0)
@@ -595,10 +596,21 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:spi_tegra");
 
+#ifdef CONFIG_OF
+static struct of_device_id spi_tegra_of_match_table[] __devinitdata = {
+	{ .compatible = "nvidia,tegra250-spi", },
+	{}
+};
+MODULE_DEVICE_TABLE(of, spi_tegra_of_match_table);
+#else /* CONFIG_OF */
+#define spi_tegra_of_match_table NULL
+#endif /* CONFIG_OF */
+
 static struct platform_driver spi_tegra_driver = {
 	.driver = {
 		.name =		"spi_tegra",
 		.owner =	THIS_MODULE,
+		.of_match_table = spi_tegra_of_match_table,
 	},
 	.remove =	__devexit_p(spi_tegra_remove),
 };