summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-02-05 14:35:11 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 13:05:00 -0700
commitcb505e2eb68fe9e22afa220bf172f6aa090b7dca (patch)
treed1b25dcc977afffedbca41ee63b331c6f49f1f00 /include
parenta40a945f829a2b95d5460491d81061166817e3cb (diff)
downloadlinux-3.10-cb505e2eb68fe9e22afa220bf172f6aa090b7dca.tar.gz
linux-3.10-cb505e2eb68fe9e22afa220bf172f6aa090b7dca.tar.bz2
linux-3.10-cb505e2eb68fe9e22afa220bf172f6aa090b7dca.zip
atmel_lcdfb: fix 16-bpp modes on older SOCs
commit a79eac7165ed62114e6ca197195aa5060a54f137 upstream. Fix regression introduced by commit 787f9fd23283 ("atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes") which broke 16-bpp modes for older SOCs which use IBGR:555 (msb is intensity) rather than BGR:565. Use SOC-type to determine the pixel layout. Tested on at91sam9263 and at91sam9g45. Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/video/atmel_lcdc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
index 28447f1594f..5f0e234026c 100644
--- a/include/video/atmel_lcdc.h
+++ b/include/video/atmel_lcdc.h
@@ -62,6 +62,7 @@ struct atmel_lcdfb_info {
void (*atmel_lcdfb_power_control)(int on);
struct fb_monspecs *default_monspecs;
u32 pseudo_palette[16];
+ bool have_intensity_bit;
};
#define ATMEL_LCDC_DMABADDR1 0x00