diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 14:40:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 14:40:13 -0500 |
| commit | 9c3936cb694ffd559c80dc3eb75b61f769a39259 (patch) | |
| tree | cc034c09e359e43b4ff01efabc7ce47602d80acf /drivers/video | |
| parent | 5de76b18d1a7193c49c1a4ee72261421a17de57c (diff) | |
| parent | 5ccf197859d6f6bcf56e85657019503b2d95767a (diff) | |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (75 commits)
omap3: Fix OMAP35XX_REV macros
omap: serial: fix non-empty uart fifo read abort
omap3: Zoom2/3: Update hsmmc board config params
omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards
omap3: id code detection 3525 vs 3515
omap3: rx51: Use wl1251 in SPI mode 3
omap3: zoom2/3: make MMC slot work again
omap1: htcherald: Update defconfig to include mux support
omap1: LCD_DMA: Use some define rather than a hexadecimal
omap: header: remove unused data-type
omap: arch/arm/plat-omap/devices.c - sort alphabetically
omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND
OMAP3: serial - allow platforms specify which UARTs to initialize
omap3: cm-t35: add mux initialization
OMAP4: Sync up omap4430 defconfig
OMAP4: Remove the secondary wait loop
OMAP4: AuxCoreBoot registers only accessible in secure mode
OMAP4: Fix SRAM base and size
OMAP4: Fix cpu detection
omap3: pandora: board file updates for .33
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap/lcdc.c | 33 |
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 | ||
| 76 | enum lcdc_load_mode { | 45 | enum lcdc_load_mode { |