Patched in Tegra support.

1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 9a5d7791c5f..03019bf5a5e 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
@@ -192,7 +191,7 @@ static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
         return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
 }
 
-static int ath79_spi_probe(struct platform_device *pdev)
+static __devinit int ath79_spi_probe(struct platform_device *pdev)
 {
         struct spi_master *master;
         struct ath79_spi *sp;
@@ -216,6 +215,9 @@ static int ath79_spi_probe(struct platform_device *pdev)
         if (pdata) {
                 master->bus_num = pdata->bus_num;
                 master->num_chipselect = pdata->num_chipselect;
+        } else {
+                master->bus_num = -1;
+                master->num_chipselect = 1;
         }
 
         sp->bitbang.master = spi_master_get(master);
@@ -251,7 +253,7 @@ err_put_master:
         return ret;
 }
 
-static int ath79_spi_remove(struct platform_device *pdev)
+static __devexit int ath79_spi_remove(struct platform_device *pdev)
 {
         struct ath79_spi *sp = platform_get_drvdata(pdev);
 
@@ -265,13 +267,24 @@ static int ath79_spi_remove(struct platform_device *pdev)
 
 static struct platform_driver ath79_spi_driver = {
         .probe          = ath79_spi_probe,
-        .remove         = ath79_spi_remove,
+        .remove         = __devexit_p(ath79_spi_remove),
         .driver         = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
         },
 };
-module_platform_driver(ath79_spi_driver);
+
+static __init int ath79_spi_init(void)
+{
+        return platform_driver_register(&ath79_spi_driver);
+}
+module_init(ath79_spi_init);
+
+static __exit void ath79_spi_exit(void)
+{
+        platform_driver_unregister(&ath79_spi_driver);
+}
+module_exit(ath79_spi_exit);
 
 MODULE_DESCRIPTION("SPI controller driver for Atheros AR71XX/AR724X/AR913X");
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");