]> Pileus Git - ~andy/linux/commitdiff
gpio/tegra: Move Tegra gpio driver to drivers/gpio
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 15 Jun 2011 19:18:06 +0000 (13:18 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 15 Jun 2011 18:59:20 +0000 (12:59 -0600)
As part of the gpio driver consolidation, this patch moves the Tegra driver
into drivers/gpio

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Documentation/devicetree/bindings/spi/spi_nvidia.txt [new file with mode: 0644]
drivers/spi/spi-tegra.c

diff --git a/Documentation/devicetree/bindings/spi/spi_nvidia.txt b/Documentation/devicetree/bindings/spi/spi_nvidia.txt
new file mode 100644 (file)
index 0000000..bde450b
--- /dev/null
@@ -0,0 +1,5 @@
+NVIDIA Tegra 2 SPI device
+
+Required properties:
+- compatible : should be "nvidia,tegra250-spi".
+- gpios : should specify GPIOs used for chipselect.
index 8e30727b5221a0d1d4003f7817de56ab51ec5250..a43ceeb1063a7514389063797c94ee805a90cefb 100644 (file)
@@ -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),
 };