Merge master.kernel.org:/home/rmk/linux-2.6-arm

4 files changed, 35 insertions, 34 deletions

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index dd8c6a9ffc76..b45a45ca7cc9 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -29,9 +29,6 @@
 #ifdef  CONFIG_ARCH_OMAP
 #include <asm/arch/gpio.h>
 #endif
-
-#else
-#define set_irq_type(irq,type)  do{}while(0)
 #endif
 
 
@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         ts->msg.complete = ads7846_rx;
         ts->msg.context = ts;
 
-        if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM,
-                                spi->dev.bus_id, ts)) {
+        if (request_irq(spi->irq, ads7846_irq,
+                        SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
+                        spi->dev.bus_id, ts)) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 input_unregister_device(&ts->input);
                 kfree(ts);
                 return -EBUSY;
         }
-        set_irq_type(spi->irq, IRQT_FALLING);
 
         dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);
 
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 587cc6a95114..fa3bbd6c751f 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port)
                              DRIVER_NAME, sport);
         if (retval) goto error_out2;
 
-        retval = request_irq(sport->rtsirq, imx_rtsint, 0,
+        retval = request_irq(sport->rtsirq, imx_rtsint,
+                             SA_TRIGGER_FALLING | SA_TRIGGER_RISING,
                              DRIVER_NAME, sport);
         if (retval) goto error_out3;
-        set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);
 
         /*
          * Finally, clear and enable interrupts
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index eb4883efb7c6..0a2dd6c5b95f 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1060,7 +1060,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
 
         port->mapbase   = res->start;
-        port->membase   = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART);
+        port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
         port->irq       = platform_get_irq(platdev, 0);
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index b2187175d03f..6761b68c35e9 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -116,9 +116,10 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
         int ret = 0;
 
         memset(&var->transp, 0, sizeof(var->transp));
-        memset(&var->red, 0, sizeof(var->red));
-        memset(&var->green, 0, sizeof(var->green));
-        memset(&var->blue, 0, sizeof(var->blue));
+
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -133,34 +134,20 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
                 var->blue.offset        = 0;
                 break;
         case 16:
-                var->red.length         = 5;
-                var->green.length       = 6;
-                var->blue.length        = 5;
-                if (fb->panel->cntl & CNTL_BGR) {
-                        var->red.offset         = 11;
-                        var->green.offset       = 5;
-                        var->blue.offset        = 0;
-                } else {
-                        var->red.offset         = 0;
-                        var->green.offset       = 5;
-                        var->blue.offset        = 11;
-                }
+                var->red.length = 5;
+                var->blue.length = 5;
+                /*
+                 * Green length can be 5 or 6 depending whether
+                 * we're operating in RGB555 or RGB565 mode.
+                 */
+                if (var->green.length != 5 && var->green.length != 6)
+                        var->green.length = 6;
                 break;
         case 32:
                 if (fb->panel->cntl & CNTL_LCDTFT) {
                         var->red.length         = 8;
                         var->green.length       = 8;
                         var->blue.length        = 8;
-
-                        if (fb->panel->cntl & CNTL_BGR) {
-                                var->red.offset         = 16;
-                                var->green.offset       = 8;
-                                var->blue.offset        = 0;
-                        } else {
-                                var->red.offset         = 0;
-                                var->green.offset       = 8;
-                                var->blue.offset        = 16;
-                        }
                         break;
                 }
         default:
@@ -168,6 +155,23 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
                 break;
         }
 
+        /*
+         * >= 16bpp displays have separate colour component bitfields
+         * encoded in the pixel data.  Calculate their position from
+         * the bitfield length defined above.
+         */
+        if (ret == 0 && var->bits_per_pixel >= 16) {
+                if (fb->panel->cntl & CNTL_BGR) {
+                        var->blue.offset = 0;
+                        var->green.offset = var->blue.offset + var->blue.length;
+                        var->red.offset = var->green.offset + var->green.length;
+                } else {
+                        var->red.offset = 0;
+                        var->green.offset = var->red.offset + var->red.length;
+                        var->blue.offset = var->green.offset + var->green.length;
+                }
+        }
+
         return ret;
 }