aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>2009-12-11 19:16:36 -0500
committerTony Lindgren <tony@atomide.com>2009-12-11 19:16:36 -0500
commit8d72c796c9d966b0efc26092dae7005c345b3efa (patch)
tree4f608e2c9e06efca0d0d31394752177fd774138c /drivers/video
parent9cb87a6b443fe6061d91b7eb220d15d01e0dc611 (diff)
omap1: LCD_DMA: Use some define rather than a hexadecimal
The patch corrects the issue introduced with one of my earlier patches: OMAP: DMA: Fix omapfb/lcdc on OMAP1510 broken when PM set[1] as pointed out by OMAP subsystem maintainer. Applies on top of my prevoius patch: OMAP: DMA: move LCD DMA related code from plat-omap to mach-omap1[2] Tested on Amstrad Delta Compile tested with omap_generic_2420_defconfig [1] http://patchwork.kernel.org/patch/57922/ [2] http://patchwork.kernel.org/patch/61952/ Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap/lcdc.c33
1 files changed, 1 insertions, 32 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index b831e1df629e..a33483910dc8 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -29,6 +29,7 @@
29#include <linux/vmalloc.h> 29#include <linux/vmalloc.h>
30#include <linux/clk.h> 30#include <linux/clk.h>
31 31
32#include <mach/lcdc.h>
32#include <plat/dma.h> 33#include <plat/dma.h>
33 34
34#include <asm/mach-types.h> 35#include <asm/mach-types.h>
@@ -39,38 +40,6 @@
39 40
40#define MODULE_NAME "lcdc" 41#define MODULE_NAME "lcdc"
41 42
42#define OMAP_LCDC_BASE 0xfffec000
43#define OMAP_LCDC_SIZE 256
44#define OMAP_LCDC_IRQ INT_LCD_CTRL
45
46#define OMAP_LCDC_CONTROL (OMAP_LCDC_BASE + 0x00)
47#define OMAP_LCDC_TIMING0 (OMAP_LCDC_BASE + 0x04)
48#define OMAP_LCDC_TIMING1 (OMAP_LCDC_BASE + 0x08)
49#define OMAP_LCDC_TIMING2 (OMAP_LCDC_BASE + 0x0c)
50#define OMAP_LCDC_STATUS (OMAP_LCDC_BASE + 0x10)
51#define OMAP_LCDC_SUBPANEL (OMAP_LCDC_BASE + 0x14)
52#define OMAP_LCDC_LINE_INT (OMAP_LCDC_BASE + 0x18)
53#define OMAP_LCDC_DISPLAY_STATUS (OMAP_LCDC_BASE + 0x1c)
54
55#define OMAP_LCDC_STAT_DONE (1 << 0)
56#define OMAP_LCDC_STAT_VSYNC (1 << 1)
57#define OMAP_LCDC_STAT_SYNC_LOST (1 << 2)
58#define OMAP_LCDC_STAT_ABC (1 << 3)
59#define OMAP_LCDC_STAT_LINE_INT (1 << 4)
60#define OMAP_LCDC_STAT_FUF (1 << 5)
61#define OMAP_LCDC_STAT_LOADED_PALETTE (1 << 6)
62
63#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
64#define OMAP_LCDC_CTRL_LCD_TFT (1 << 7)
65#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
66
67#define OMAP_LCDC_IRQ_VSYNC (1 << 2)
68#define OMAP_LCDC_IRQ_DONE (1 << 3)
69#define OMAP_LCDC_IRQ_LOADED_PALETTE (1 << 4)
70#define OMAP_LCDC_IRQ_LINE_NIRQ (1 << 5)
71#define OMAP_LCDC_IRQ_LINE (1 << 6)
72#define OMAP_LCDC_IRQ_MASK (((1 << 5) - 1) << 2)
73
74#define MAX_PALETTE_SIZE PAGE_SIZE 43#define MAX_PALETTE_SIZE PAGE_SIZE
75 44
76enum lcdc_load_mode { 45enum lcdc_load_mode {