Patched in Tegra support.

1 files changed, 32 insertions, 25 deletions

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 580f80cc586..0f4e8c942f9 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -54,14 +54,13 @@
 #include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
-#include <linux/console.h>
 
 #include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
 #include <mach/bitfield.h>
-#include <linux/platform_data/video-pxafb.h>
+#include <mach/pxafb.h>
 
 /*
  * Complain if VAR is out of range.
@@ -731,12 +730,9 @@ static int overlayfb_open(struct fb_info *info, int user)
         if (user == 0)
                 return -ENODEV;
 
-        if (ofb->usage++ == 0) {
+        if (ofb->usage++ == 0)
                 /* unblank the base framebuffer */
-                console_lock();
                 fb_blank(&ofb->fbi->fb, FB_BLANK_UNBLANK);
-                console_unlock();
-        }
 
         return 0;
 }
@@ -869,8 +865,8 @@ static struct fb_ops overlay_fb_ops = {
         .fb_set_par             = overlayfb_set_par,
 };
 
-static void init_pxafb_overlay(struct pxafb_info *fbi, struct pxafb_layer *ofb,
-                               int id)
+static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
+                                         struct pxafb_layer *ofb, int id)
 {
         sprintf(ofb->fb.fix.id, "overlay%d", id + 1);
 
@@ -903,8 +899,8 @@ static inline int pxafb_overlay_supported(void)
         return 0;
 }
 
-static int pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
-                                          struct pxafb_layer *ofb)
+static int __devinit pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
+        struct pxafb_layer *ofb)
 {
         /* We assume that user will use at most video_mem_size for overlay fb,
          * anyway, it's useless to use 16bpp main plane and 24bpp overlay
@@ -927,7 +923,7 @@ static int pxafb_overlay_map_video_memory(struct pxafb_info *pxafb,
         return 0;
 }
 
-static void pxafb_overlay_init(struct pxafb_info *fbi)
+static void __devinit pxafb_overlay_init(struct pxafb_info *fbi)
 {
         int i, ret;
 
@@ -959,7 +955,7 @@ static void pxafb_overlay_init(struct pxafb_info *fbi)
         pr_info("PXA Overlay driver loaded successfully!\n");
 }
 
-static void pxafb_overlay_exit(struct pxafb_info *fbi)
+static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
 {
         int i;
 
@@ -1313,6 +1309,16 @@ static int pxafb_smart_init(struct pxafb_info *fbi)
         return 0;
 }
 #else
+int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int n_cmds)
+{
+        return 0;
+}
+
+int pxafb_smart_flush(struct fb_info *info)
+{
+        return 0;
+}
+
 static inline int pxafb_smart_init(struct pxafb_info *fbi) { return 0; }
 #endif /* CONFIG_FB_PXA_SMARTPANEL */
 
@@ -1435,7 +1441,7 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
         pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
 
         /* enable LCD controller clock */
-        clk_prepare_enable(fbi->clk);
+        clk_enable(fbi->clk);
 
         if (fbi->lccr0 & LCCR0_LCDT)
                 return;
@@ -1475,7 +1481,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
         wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000);
 
         /* disable LCD controller clock */
-        clk_disable_unprepare(fbi->clk);
+        clk_disable(fbi->clk);
 }
 
 /*
@@ -1706,7 +1712,7 @@ static const struct dev_pm_ops pxafb_pm_ops = {
 };
 #endif
 
-static int pxafb_init_video_memory(struct pxafb_info *fbi)
+static int __devinit pxafb_init_video_memory(struct pxafb_info *fbi)
 {
         int size = PAGE_ALIGN(fbi->video_mem_size);
 
@@ -1789,7 +1795,7 @@ decode_mode:
                 fbi->video_mem_size = video_mem_size;
 }
 
-static struct pxafb_info *pxafb_init_fbinfo(struct device *dev)
+static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
 {
         struct pxafb_info *fbi;
         void *addr;
@@ -1853,7 +1859,7 @@ static struct pxafb_info *pxafb_init_fbinfo(struct device *dev)
 }
 
 #ifdef CONFIG_FB_PXA_PARAMETERS
-static int parse_opt_mode(struct device *dev, const char *this_opt)
+static int __devinit parse_opt_mode(struct device *dev, const char *this_opt)
 {
         struct pxafb_mach_info *inf = dev->platform_data;
 
@@ -1912,7 +1918,7 @@ done:
         return 0;
 }
 
-static int parse_opt(struct device *dev, char *this_opt)
+static int __devinit parse_opt(struct device *dev, char *this_opt)
 {
         struct pxafb_mach_info *inf = dev->platform_data;
         struct pxafb_mode_info *mode = &inf->modes[0];
@@ -2012,7 +2018,7 @@ static int parse_opt(struct device *dev, char *this_opt)
         return 0;
 }
 
-static int pxafb_parse_options(struct device *dev, char *options)
+static int __devinit pxafb_parse_options(struct device *dev, char *options)
 {
         char *this_opt;
         int ret;
@@ -2031,7 +2037,7 @@ static int pxafb_parse_options(struct device *dev, char *options)
         return 0;
 }
 
-static char g_options[256] = "";
+static char g_options[256] __devinitdata = "";
 
 #ifndef MODULE
 static int __init pxafb_setup_options(void)
@@ -2061,7 +2067,8 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
 #ifdef DEBUG_VAR
 /* Check for various illegal bit-combinations. Currently only
  * a warning is given. */
-static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf)
+static void __devinit pxafb_check_options(struct device *dev,
+                                          struct pxafb_mach_info *inf)
 {
         if (inf->lcd_conn)
                 return;
@@ -2093,7 +2100,7 @@ static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf)
 #define pxafb_check_options(...)        do {} while (0)
 #endif
 
-static int pxafb_probe(struct platform_device *dev)
+static int __devinit pxafb_probe(struct platform_device *dev)
 {
         struct pxafb_info *fbi;
         struct pxafb_mach_info *inf;
@@ -2184,7 +2191,7 @@ static int pxafb_probe(struct platform_device *dev)
                 goto failed_free_mem;
         }
 
-        ret = request_irq(irq, pxafb_handle_irq, 0, "LCD", fbi);
+        ret = request_irq(irq, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi);
         if (ret) {
                 dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                 ret = -EBUSY;
@@ -2262,7 +2269,7 @@ failed:
         return ret;
 }
 
-static int pxafb_remove(struct platform_device *dev)
+static int __devexit pxafb_remove(struct platform_device *dev)
 {
         struct pxafb_info *fbi = platform_get_drvdata(dev);
         struct resource *r;
@@ -2303,7 +2310,7 @@ static int pxafb_remove(struct platform_device *dev)
 
 static struct platform_driver pxafb_driver = {
         .probe          = pxafb_probe,
-        .remove         = pxafb_remove,
+        .remove         = __devexit_p(pxafb_remove),
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "pxa2xx-fb",