aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-11-11 08:45:57 -0500
committerEric Miao <eric.miao@marvell.com>2008-11-11 08:45:57 -0500
commit1ec26db1f8cae0aca64708e0fe1f687eab7c82e5 (patch)
tree438ad8222fbf763f8e51ba4227206e1de137e2a9
parent3ad4f597058301c97f362e500a32f63f5c950a45 (diff)
pxafb: introduce LCD_TYPE_MASK and use it.
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
-rw-r--r--arch/arm/mach-pxa/include/mach/pxafb.h1
-rw-r--r--drivers/video/pxafb.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index 8e591118371e..cbda4d35c421 100644
--- a/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -33,6 +33,7 @@
33#define LCD_CONN_TYPE(_x) ((_x) & 0x0f) 33#define LCD_CONN_TYPE(_x) ((_x) & 0x0f)
34#define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) 34#define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f)
35 35
36#define LCD_TYPE_MASK 0xf
36#define LCD_TYPE_UNKNOWN 0 37#define LCD_TYPE_UNKNOWN 0
37#define LCD_TYPE_MONO_STN 1 38#define LCD_TYPE_MONO_STN 1
38#define LCD_TYPE_MONO_DSTN 2 39#define LCD_TYPE_MONO_DSTN 2
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 97204497d9f7..64990592dc58 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1372,7 +1372,7 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi,
1372 fbi->cmap_inverse = inf->cmap_inverse; 1372 fbi->cmap_inverse = inf->cmap_inverse;
1373 fbi->cmap_static = inf->cmap_static; 1373 fbi->cmap_static = inf->cmap_static;
1374 1374
1375 switch (lcd_conn & 0xf) { 1375 switch (lcd_conn & LCD_TYPE_MASK) {
1376 case LCD_TYPE_MONO_STN: 1376 case LCD_TYPE_MONO_STN:
1377 fbi->lccr0 = LCCR0_CMS; 1377 fbi->lccr0 = LCCR0_CMS;
1378 break; 1378 break;