Patched in Tegra support.

1 files changed, 17 insertions, 22 deletions

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index ab34497bcfe..82dee9a6c0d 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -19,11 +19,10 @@
 #include <linux/interrupt.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
-#include <linux/platform_data/atmel.h>
-#include <linux/of.h>
 
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
 #include <mach/cpu.h>
 
 /* SPI register offsets */
@@ -769,10 +768,6 @@ static int atmel_spi_setup(struct spi_device *spi)
 
         /* chipselect must have been muxed as GPIO (e.g. in board setup) */
         npcs_pin = (unsigned int)spi->controller_data;
-
-        if (gpio_is_valid(spi->cs_gpio))
-                npcs_pin = spi->cs_gpio;
-
         asd = spi->controller_state;
         if (!asd) {
                 asd = kzalloc(sizeof(struct atmel_spi_device), GFP_KERNEL);
@@ -912,7 +907,7 @@ static void atmel_spi_cleanup(struct spi_device *spi)
 
 /*-------------------------------------------------------------------------*/
 
-static int atmel_spi_probe(struct platform_device *pdev)
+static int __init atmel_spi_probe(struct platform_device *pdev)
 {
         struct resource         *regs;
         int                     irq;
@@ -942,9 +937,8 @@ static int atmel_spi_probe(struct platform_device *pdev)
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
 
-        master->dev.of_node = pdev->dev.of_node;
         master->bus_num = pdev->id;
-        master->num_chipselect = master->dev.of_node ? 0 : 4;
+        master->num_chipselect = 4;
         master->setup = atmel_spi_setup;
         master->transfer = atmel_spi_transfer;
         master->cleanup = atmel_spi_cleanup;
@@ -1009,7 +1003,7 @@ out_free:
         return ret;
 }
 
-static int atmel_spi_remove(struct platform_device *pdev)
+static int __exit atmel_spi_remove(struct platform_device *pdev)
 {
         struct spi_master       *master = platform_get_drvdata(pdev);
         struct atmel_spi        *as = spi_master_get_devdata(master);
@@ -1070,27 +1064,28 @@ static int atmel_spi_resume(struct platform_device *pdev)
 #define atmel_spi_resume        NULL
 #endif
 
-#if defined(CONFIG_OF)
-static const struct of_device_id atmel_spi_dt_ids[] = {
-        { .compatible = "atmel,at91rm9200-spi" },
-        { /* sentinel */ }
-};
-
-MODULE_DEVICE_TABLE(of, atmel_spi_dt_ids);
-#endif
 
 static struct platform_driver atmel_spi_driver = {
         .driver         = {
                 .name   = "atmel_spi",
                 .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(atmel_spi_dt_ids),
         },
         .suspend        = atmel_spi_suspend,
         .resume         = atmel_spi_resume,
-        .probe          = atmel_spi_probe,
         .remove         = __exit_p(atmel_spi_remove),
 };
-module_platform_driver(atmel_spi_driver);
+
+static int __init atmel_spi_init(void)
+{
+        return platform_driver_probe(&atmel_spi_driver, atmel_spi_probe);
+}
+module_init(atmel_spi_init);
+
+static void __exit atmel_spi_exit(void)
+{
+        platform_driver_unregister(&atmel_spi_driver);
+}
+module_exit(atmel_spi_exit);
 
 MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver");
 MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");