Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits)
  [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)
  [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)
  [ARM] pxa: add base support for PXA930 (aka Tavor-P)
  [ARM] Update mach-types
  [ARM] pxa: make littleton to use the new smc91x platform data
  [ARM] pxa: make zylonite to use the new smc91x platform data
  [ARM] pxa: make mainstone to use the new smc91x platform data
  [ARM] pxa: make lubbock to use new smc91x platform data
  [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
  [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable
  [NET] smc91x: add SMC91X_NOWAIT flag to platform data
  [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*
  [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
  [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper
  Support for LCD on e740 e750 e400 and e800 e-series PDAs
  E-series UDC support
  PXA UDC - allow use of inverted GPIO for pullup
  Add e350 support
  Fix broken e-series build
  E-series GPIO / IRQ definitions.
  ...

1 files changed, 61 insertions, 3 deletions

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index d0746261c957..bb2514369507 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -227,6 +227,22 @@ static int pxafb_bpp_to_lccr3(struct fb_var_screeninfo *var)
         case 4:  ret = LCCR3_4BPP; break;
         case 8:  ret = LCCR3_8BPP; break;
         case 16: ret = LCCR3_16BPP; break;
+        case 24:
+                switch (var->red.length + var->green.length +
+                                var->blue.length + var->transp.length) {
+                case 18: ret = LCCR3_18BPP_P | LCCR3_PDFOR_3; break;
+                case 19: ret = LCCR3_19BPP_P; break;
+                }
+                break;
+        case 32:
+                switch (var->red.length + var->green.length +
+                                var->blue.length + var->transp.length) {
+                case 18: ret = LCCR3_18BPP | LCCR3_PDFOR_3; break;
+                case 19: ret = LCCR3_19BPP; break;
+                case 24: ret = LCCR3_24BPP | LCCR3_PDFOR_3; break;
+                case 25: ret = LCCR3_25BPP; break;
+                }
+                break;
         }
         return ret;
 }
@@ -345,6 +361,41 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 var->green.offset = 5;  var->green.length = 6;
                 var->blue.offset  = 0;  var->blue.length  = 5;
                 var->transp.offset = var->transp.length = 0;
+        } else if (var->bits_per_pixel > 16) {
+                struct pxafb_mode_info *mode;
+
+                mode = pxafb_getmode(inf, var);
+                if (!mode)
+                        return -EINVAL;
+
+                switch (mode->depth) {
+                case 18: /* RGB666 */
+                        var->transp.offset = var->transp.length     = 0;
+                        var->red.offset    = 12; var->red.length    = 6;
+                        var->green.offset  = 6;  var->green.length  = 6;
+                        var->blue.offset   = 0;  var->blue.length   = 6;
+                        break;
+                case 19: /* RGBT666 */
+                        var->transp.offset = 18; var->transp.length = 1;
+                        var->red.offset    = 12; var->red.length    = 6;
+                        var->green.offset  = 6;  var->green.length  = 6;
+                        var->blue.offset   = 0;  var->blue.length   = 6;
+                        break;
+                case 24: /* RGB888 */
+                        var->transp.offset = var->transp.length     = 0;
+                        var->red.offset    = 16; var->red.length    = 8;
+                        var->green.offset  = 8;  var->green.length  = 8;
+                        var->blue.offset   = 0;  var->blue.length   = 8;
+                        break;
+                case 25: /* RGBT888 */
+                        var->transp.offset = 24; var->transp.length = 1;
+                        var->red.offset    = 16; var->red.length    = 8;
+                        var->green.offset  = 8;  var->green.length  = 8;
+                        var->blue.offset   = 0;  var->blue.length   = 8;
+                        break;
+                default:
+                        return -EINVAL;
+                }
         } else {
                 var->red.offset = var->green.offset = 0;
                 var->blue.offset = var->transp.offset = 0;
@@ -376,7 +427,7 @@ static int pxafb_set_par(struct fb_info *info)
         struct pxafb_info *fbi = (struct pxafb_info *)info;
         struct fb_var_screeninfo *var = &info->var;
 
-        if (var->bits_per_pixel == 16)
+        if (var->bits_per_pixel >= 16)
                 fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR;
         else if (!fbi->cmap_static)
                 fbi->fb.fix.visual = FB_VISUAL_PSEUDOCOLOR;
@@ -391,7 +442,7 @@ static int pxafb_set_par(struct fb_info *info)
 
         fbi->fb.fix.line_length = var->xres_virtual *
                                   var->bits_per_pixel / 8;
-        if (var->bits_per_pixel == 16)
+        if (var->bits_per_pixel >= 16)
                 fbi->palette_size = 0;
         else
                 fbi->palette_size = var->bits_per_pixel == 1 ?
@@ -404,7 +455,7 @@ static int pxafb_set_par(struct fb_info *info)
          */
         pxafb_set_truecolor(fbi->fb.fix.visual == FB_VISUAL_TRUECOLOR);
 
-        if (fbi->fb.var.bits_per_pixel == 16)
+        if (fbi->fb.var.bits_per_pixel >= 16)
                 fb_dealloc_cmap(&fbi->fb.cmap);
         else
                 fb_alloc_cmap(&fbi->fb.cmap, 1<<fbi->fb.var.bits_per_pixel, 0);
@@ -831,6 +882,8 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var,
                 case 4:
                 case 8:
                 case 16:
+                case 24:
+                case 32:
                         break;
                 default:
                         printk(KERN_ERR "%s: invalid bit depth %d\n",
@@ -968,6 +1021,11 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi)
 
         for (gpio = 58; ldd_bits; gpio++, ldd_bits--)
                 pxa_gpio_mode(gpio | GPIO_ALT_FN_2_OUT);
+        /* 18 bit interface */
+        if (fbi->fb.var.bits_per_pixel > 16) {
+                pxa_gpio_mode(86 | GPIO_ALT_FN_2_OUT);
+                pxa_gpio_mode(87 | GPIO_ALT_FN_2_OUT);
+        }
         pxa_gpio_mode(GPIO74_LCD_FCLK_MD);
         pxa_gpio_mode(GPIO75_LCD_LCLK_MD);
         pxa_gpio_mode(GPIO76_LCD_PCLK_MD);