Patched in Tegra support.

1 files changed, 17 insertions, 19 deletions

diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 7a299e951f7..c8be8af0cc6 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
-#include <linux/module.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <video/w100fb.h>
@@ -54,7 +53,7 @@ static void w100_update_enable(void);
 static void w100_update_disable(void);
 static void calc_hsync(struct w100fb_par *par);
 static void w100_init_graphic_engine(struct w100fb_par *par);
-struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq) __devinit;
 
 /* Pseudo palette size */
 #define MAX_PALETTES      16
@@ -630,7 +629,7 @@ static int w100fb_resume(struct platform_device *dev)
 #endif
 
 
-int w100fb_probe(struct platform_device *pdev)
+int __devinit w100fb_probe(struct platform_device *pdev)
 {
         int err = -EIO;
         struct w100fb_mach_info *inf;
@@ -783,7 +782,7 @@ out:
 }
 
 
-static int w100fb_remove(struct platform_device *pdev)
+static int __devexit w100fb_remove(struct platform_device *pdev)
 {
         struct fb_info *info = platform_get_drvdata(pdev);
         struct w100fb_par *par=info->par;
@@ -1021,7 +1020,7 @@ static struct pll_entries {
         { 0 },
 };
 
-struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
+struct w100_pll_info __devinit *w100_get_xtal_table(unsigned int freq)
 {
         struct pll_entries *pll_entry = w100_pll_tables;
 
@@ -1567,18 +1566,6 @@ static void w100_suspend(u32 mode)
                 val = readl(remapped_regs + mmPLL_CNTL);
                 val |= 0x00000004;  /* bit2=1 */
                 writel(val, remapped_regs + mmPLL_CNTL);
-
-                writel(0x00000000, remapped_regs + mmLCDD_CNTL1);
-                writel(0x00000000, remapped_regs + mmLCDD_CNTL2);
-                writel(0x00000000, remapped_regs + mmGENLCD_CNTL1);
-                writel(0x00000000, remapped_regs + mmGENLCD_CNTL2);
-                writel(0x00000000, remapped_regs + mmGENLCD_CNTL3);
-
-                val = readl(remapped_regs + mmMEM_EXT_CNTL);
-                val |= 0xF0000000;
-                val &= ~(0x00000001);
-                writel(val, remapped_regs + mmMEM_EXT_CNTL);
-
                 writel(0x0000001d, remapped_regs + mmPWRMGT_CNTL);
         }
 }
@@ -1624,7 +1611,7 @@ static void w100_vsync(void)
 
 static struct platform_driver w100fb_driver = {
         .probe          = w100fb_probe,
-        .remove         = w100fb_remove,
+        .remove         = __devexit_p(w100fb_remove),
         .suspend        = w100fb_suspend,
         .resume         = w100fb_resume,
         .driver         = {
@@ -1632,7 +1619,18 @@ static struct platform_driver w100fb_driver = {
         },
 };
 
-module_platform_driver(w100fb_driver);
+int __init w100fb_init(void)
+{
+        return platform_driver_register(&w100fb_driver);
+}
+
+void __exit w100fb_cleanup(void)
+{
+        platform_driver_unregister(&w100fb_driver);
+}
+
+module_init(w100fb_init);
+module_exit(w100fb_cleanup);
 
 MODULE_DESCRIPTION("ATI Imageon w100 framebuffer driver");
 MODULE_LICENSE("GPL");