diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:39:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:39:14 -0500 |
commit | d33a6291c1c577ff2272edab7416a0f7308e1cef (patch) | |
tree | 9efd2f6f2fbb0586af72531110acdf9e769285ab /arch/arm/plat-omap | |
parent | 66dc918d42eaaa9afe42a47d07526765162017a9 (diff) | |
parent | f00117a78341e330eecebdfe74cce345ed068802 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (29 commits)
video: move SH_MIPI_DSI/SH_LCD_MIPI_DSI to the top of menu
fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb
video: imx: Update the manufacturer's name
nuc900fb: don't treat NULL clk as an error
s3c2410fb: don't treat NULL clk as an error
video: tidy up modedb formatting.
video: matroxfb: Correct video option in comments and kernel config help.
fbdev: sh_mobile_hdmi: simplify pointer handling
fbdev: sh_mobile_hdmi: framebuffer notifiers have to be registered
fbdev: sh_mobile_hdmi: add command line option to use the preferred EDID mode
OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new overlay manager.
OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4
OMAP: DSS2: LCD2 Channel Changes for DISPC
OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument
OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers
OMAP: DSS2: Represent DISPC register defines with channel as parameter
OMAP: DSS2: Add dss_features for omap4 and overlay manager related features
OMAP: DSS2: Clean up DISPC color mode validation checks
OMAP: DSS2: Add back authors of panel-generic.c based drivers
OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers
...
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/include/plat/display.h | 9 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/panel-generic-dpi.h | 37 |
2 files changed, 46 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h index c915a661f1f5..537f4e449f50 100644 --- a/arch/arm/plat-omap/include/plat/display.h +++ b/arch/arm/plat-omap/include/plat/display.h | |||
@@ -42,6 +42,10 @@ | |||
42 | #define DISPC_IRQ_SYNC_LOST (1 << 14) | 42 | #define DISPC_IRQ_SYNC_LOST (1 << 14) |
43 | #define DISPC_IRQ_SYNC_LOST_DIGIT (1 << 15) | 43 | #define DISPC_IRQ_SYNC_LOST_DIGIT (1 << 15) |
44 | #define DISPC_IRQ_WAKEUP (1 << 16) | 44 | #define DISPC_IRQ_WAKEUP (1 << 16) |
45 | #define DISPC_IRQ_SYNC_LOST2 (1 << 17) | ||
46 | #define DISPC_IRQ_VSYNC2 (1 << 18) | ||
47 | #define DISPC_IRQ_ACBIAS_COUNT_STAT2 (1 << 21) | ||
48 | #define DISPC_IRQ_FRAMEDONE2 (1 << 22) | ||
45 | 49 | ||
46 | struct omap_dss_device; | 50 | struct omap_dss_device; |
47 | struct omap_overlay_manager; | 51 | struct omap_overlay_manager; |
@@ -64,6 +68,7 @@ enum omap_plane { | |||
64 | enum omap_channel { | 68 | enum omap_channel { |
65 | OMAP_DSS_CHANNEL_LCD = 0, | 69 | OMAP_DSS_CHANNEL_LCD = 0, |
66 | OMAP_DSS_CHANNEL_DIGIT = 1, | 70 | OMAP_DSS_CHANNEL_DIGIT = 1, |
71 | OMAP_DSS_CHANNEL_LCD2 = 2, | ||
67 | }; | 72 | }; |
68 | 73 | ||
69 | enum omap_color_mode { | 74 | enum omap_color_mode { |
@@ -142,6 +147,7 @@ enum omap_dss_display_state { | |||
142 | enum omap_dss_overlay_managers { | 147 | enum omap_dss_overlay_managers { |
143 | OMAP_DSS_OVL_MGR_LCD, | 148 | OMAP_DSS_OVL_MGR_LCD, |
144 | OMAP_DSS_OVL_MGR_TV, | 149 | OMAP_DSS_OVL_MGR_TV, |
150 | OMAP_DSS_OVL_MGR_LCD2, | ||
145 | }; | 151 | }; |
146 | 152 | ||
147 | enum omap_dss_rotation_type { | 153 | enum omap_dss_rotation_type { |
@@ -268,6 +274,7 @@ struct omap_overlay_info { | |||
268 | u16 out_width; /* if 0, out_width == width */ | 274 | u16 out_width; /* if 0, out_width == width */ |
269 | u16 out_height; /* if 0, out_height == height */ | 275 | u16 out_height; /* if 0, out_height == height */ |
270 | u8 global_alpha; | 276 | u8 global_alpha; |
277 | u8 pre_mult_alpha; | ||
271 | }; | 278 | }; |
272 | 279 | ||
273 | struct omap_overlay { | 280 | struct omap_overlay { |
@@ -351,6 +358,8 @@ struct omap_dss_device { | |||
351 | 358 | ||
352 | enum omap_display_type type; | 359 | enum omap_display_type type; |
353 | 360 | ||
361 | enum omap_channel channel; | ||
362 | |||
354 | union { | 363 | union { |
355 | struct { | 364 | struct { |
356 | u8 data_lines; | 365 | u8 data_lines; |
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h new file mode 100644 index 000000000000..790619734bcd --- /dev/null +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * Header for generic DPI panel driver | ||
3 | * | ||
4 | * Copyright (C) 2010 Canonical Ltd. | ||
5 | * Author: Bryan Wu <bryan.wu@canonical.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License version 2 as published by | ||
9 | * the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
14 | * more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License along with | ||
17 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | |||
20 | #ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H | ||
21 | #define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H | ||
22 | |||
23 | #include "display.h" | ||
24 | |||
25 | /** | ||
26 | * struct panel_generic_dpi_data - panel driver configuration data | ||
27 | * @name: panel name | ||
28 | * @platform_enable: platform specific panel enable function | ||
29 | * @platform_disable: platform specific panel disable function | ||
30 | */ | ||
31 | struct panel_generic_dpi_data { | ||
32 | const char *name; | ||
33 | int (*platform_enable)(struct omap_dss_device *dssdev); | ||
34 | void (*platform_disable)(struct omap_dss_device *dssdev); | ||
35 | }; | ||
36 | |||
37 | #endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */ | ||