diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 15:18:06 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 14:59:20 -0400 |
commit | e892bac102805f905e463a2cc7d0f870358cc1d5 (patch) | |
tree | 3472c158dc4ec1a393f5b0eae4244f2e2af9925b /drivers/spi/spi-tegra.c | |
parent | 8e2943c04c74e537c762c09bcea89e923510a9ac (diff) |
gpio/tegra: Move Tegra gpio driver to drivers/gpio
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>
Diffstat (limited to 'drivers/spi/spi-tegra.c')
-rw-r--r-- | drivers/spi/spi-tegra.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index 8e30727b5221..a43ceeb1063a 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c | |||
@@ -546,6 +546,7 @@ static int __init spi_tegra_probe(struct platform_device *pdev) | |||
546 | tspi->rx_dma_req.req_sel = spi_tegra_req_sels[pdev->id]; | 546 | tspi->rx_dma_req.req_sel = spi_tegra_req_sels[pdev->id]; |
547 | tspi->rx_dma_req.dev = tspi; | 547 | tspi->rx_dma_req.dev = tspi; |
548 | 548 | ||
549 | master->dev.of_node = pdev->dev.of_node; | ||
549 | ret = spi_register_master(master); | 550 | ret = spi_register_master(master); |
550 | 551 | ||
551 | if (ret < 0) | 552 | if (ret < 0) |
@@ -595,10 +596,21 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev) | |||
595 | 596 | ||
596 | MODULE_ALIAS("platform:spi_tegra"); | 597 | MODULE_ALIAS("platform:spi_tegra"); |
597 | 598 | ||
599 | #ifdef CONFIG_OF | ||
600 | static struct of_device_id spi_tegra_of_match_table[] __devinitdata = { | ||
601 | { .compatible = "nvidia,tegra250-spi", }, | ||
602 | {} | ||
603 | }; | ||
604 | MODULE_DEVICE_TABLE(of, spi_tegra_of_match_table); | ||
605 | #else /* CONFIG_OF */ | ||
606 | #define spi_tegra_of_match_table NULL | ||
607 | #endif /* CONFIG_OF */ | ||
608 | |||
598 | static struct platform_driver spi_tegra_driver = { | 609 | static struct platform_driver spi_tegra_driver = { |
599 | .driver = { | 610 | .driver = { |
600 | .name = "spi_tegra", | 611 | .name = "spi_tegra", |
601 | .owner = THIS_MODULE, | 612 | .owner = THIS_MODULE, |
613 | .of_match_table = spi_tegra_of_match_table, | ||
602 | }, | 614 | }, |
603 | .remove = __devexit_p(spi_tegra_remove), | 615 | .remove = __devexit_p(spi_tegra_remove), |
604 | }; | 616 | }; |