diff options
30 files changed, 248 insertions, 210 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 5a275bab2dfe..71e1a3fad0ea 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
17 | #include <linux/omapfb.h> | ||
17 | 18 | ||
18 | #include <linux/spi/spi.h> | 19 | #include <linux/spi/spi.h> |
19 | #include <linux/spi/ads7846.h> | 20 | #include <linux/spi/ads7846.h> |
@@ -32,7 +33,6 @@ | |||
32 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
33 | #include <plat/common.h> | 34 | #include <plat/common.h> |
34 | #include <plat/dsp_common.h> | 35 | #include <plat/dsp_common.h> |
35 | #include <plat/omapfb.h> | ||
36 | #include <plat/hwa742.h> | 36 | #include <plat/hwa742.h> |
37 | #include <plat/lcd_mipid.h> | 37 | #include <plat/lcd_mipid.h> |
38 | #include <plat/mmc.h> | 38 | #include <plat/mmc.h> |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 59d28b2fd8c5..9f22c201ef9d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -22,13 +22,13 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | #include <linux/omapfb.h> | ||
25 | 26 | ||
26 | #include <asm/tlb.h> | 27 | #include <asm/tlb.h> |
27 | 28 | ||
28 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
29 | 30 | ||
30 | #include <plat/mux.h> | 31 | #include <plat/mux.h> |
31 | #include <plat/omapfb.h> | ||
32 | #include <plat/sram.h> | 32 | #include <plat/sram.h> |
33 | #include <plat/sdrc.h> | 33 | #include <plat/sdrc.h> |
34 | #include <plat/gpmc.h> | 34 | #include <plat/gpmc.h> |
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 78a4ce538dbd..18cf1d4b7931 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c | |||
@@ -28,13 +28,13 @@ | |||
28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
29 | #include <linux/bootmem.h> | 29 | #include <linux/bootmem.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/omapfb.h> | ||
31 | 32 | ||
32 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
33 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
34 | 35 | ||
35 | #include <plat/board.h> | 36 | #include <plat/board.h> |
36 | #include <plat/sram.h> | 37 | #include <plat/sram.h> |
37 | #include <plat/omapfb.h> | ||
38 | 38 | ||
39 | #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) | 39 | #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) |
40 | 40 | ||
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index f5d75f22cef9..2ffb34af4c59 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c | |||
@@ -27,9 +27,9 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | 28 | ||
29 | #include <plat/dma.h> | 29 | #include <plat/dma.h> |
30 | #include <plat/omapfb.h> | ||
31 | #include <plat/blizzard.h> | 30 | #include <plat/blizzard.h> |
32 | 31 | ||
32 | #include "omapfb.h" | ||
33 | #include "dispc.h" | 33 | #include "dispc.h" |
34 | 34 | ||
35 | #define MODULE_NAME "blizzard" | 35 | #define MODULE_NAME "blizzard" |
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 7c833db4f9b7..b8f75a7936a2 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | 27 | ||
28 | #include <plat/sram.h> | 28 | #include <plat/sram.h> |
29 | #include <plat/omapfb.h> | ||
30 | #include <plat/board.h> | 29 | #include <plat/board.h> |
31 | 30 | ||
31 | #include "omapfb.h" | ||
32 | #include "dispc.h" | 32 | #include "dispc.h" |
33 | 33 | ||
34 | #define MODULE_NAME "dispc" | 34 | #define MODULE_NAME "dispc" |
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index 17a975e4c9c9..0016f77cd13f 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.c | |||
@@ -25,10 +25,11 @@ | |||
25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/interrupt.h> | ||
28 | 29 | ||
29 | #include <plat/dma.h> | 30 | #include <plat/dma.h> |
30 | #include <plat/omapfb.h> | ||
31 | #include <plat/hwa742.h> | 31 | #include <plat/hwa742.h> |
32 | #include "omapfb.h" | ||
32 | 33 | ||
33 | #define HWA742_REV_CODE_REG 0x0 | 34 | #define HWA742_REV_CODE_REG 0x0 |
34 | #define HWA742_CONFIG_REG 0x2 | 35 | #define HWA742_CONFIG_REG 0x2 |
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c index fea7feee0b77..760645d9dbb6 100644 --- a/drivers/video/omap/lcd_2430sdp.c +++ b/drivers/video/omap/lcd_2430sdp.c | |||
@@ -28,9 +28,10 @@ | |||
28 | #include <linux/i2c/twl4030.h> | 28 | #include <linux/i2c/twl4030.h> |
29 | 29 | ||
30 | #include <plat/mux.h> | 30 | #include <plat/mux.h> |
31 | #include <plat/omapfb.h> | ||
32 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
33 | 32 | ||
33 | #include "omapfb.h" | ||
34 | |||
34 | #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 | 35 | #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO 91 |
35 | #define SDP2430_LCD_PANEL_ENABLE_GPIO 154 | 36 | #define SDP2430_LCD_PANEL_ENABLE_GPIO 154 |
36 | #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 24 | 37 | #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO 24 |
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c index 3d5277252ca3..9340ca3c1c81 100644 --- a/drivers/video/omap/lcd_ams_delta.c +++ b/drivers/video/omap/lcd_ams_delta.c | |||
@@ -27,7 +27,8 @@ | |||
27 | 27 | ||
28 | #include <plat/board-ams-delta.h> | 28 | #include <plat/board-ams-delta.h> |
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <plat/omapfb.h> | 30 | |
31 | #include "omapfb.h" | ||
31 | 32 | ||
32 | #define AMS_DELTA_DEFAULT_CONTRAST 112 | 33 | #define AMS_DELTA_DEFAULT_CONTRAST 112 |
33 | 34 | ||
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c index 4c5cefc5153b..2be94eb3bbf5 100644 --- a/drivers/video/omap/lcd_apollon.c +++ b/drivers/video/omap/lcd_apollon.c | |||
@@ -26,7 +26,8 @@ | |||
26 | 26 | ||
27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
28 | #include <plat/mux.h> | 28 | #include <plat/mux.h> |
29 | #include <plat/omapfb.h> | 29 | |
30 | #include "omapfb.h" | ||
30 | 31 | ||
31 | /* #define USE_35INCH_LCD 1 */ | 32 | /* #define USE_35INCH_LCD 1 */ |
32 | 33 | ||
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c index 240b4fb10741..8df688748b5a 100644 --- a/drivers/video/omap/lcd_h3.c +++ b/drivers/video/omap/lcd_h3.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/i2c/tps65010.h> | 24 | #include <linux/i2c/tps65010.h> |
25 | 25 | ||
26 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <plat/omapfb.h> | 27 | #include "omapfb.h" |
28 | 28 | ||
29 | #define MODULE_NAME "omapfb-lcd_h3" | 29 | #define MODULE_NAME "omapfb-lcd_h3" |
30 | 30 | ||
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c index 720625da1f4e..03a06a982750 100644 --- a/drivers/video/omap/lcd_h4.c +++ b/drivers/video/omap/lcd_h4.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | 24 | ||
25 | #include <plat/omapfb.h> | 25 | #include "omapfb.h" |
26 | 26 | ||
27 | static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 27 | static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
28 | { | 28 | { |
diff --git a/drivers/video/omap/lcd_htcherald.c b/drivers/video/omap/lcd_htcherald.c index 2e0c81ea7483..a9007c5d1fad 100644 --- a/drivers/video/omap/lcd_htcherald.c +++ b/drivers/video/omap/lcd_htcherald.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | 31 | ||
32 | #include <plat/omapfb.h> | 32 | #include "omapfb.h" |
33 | 33 | ||
34 | static int htcherald_panel_init(struct lcd_panel *panel, | 34 | static int htcherald_panel_init(struct lcd_panel *panel, |
35 | struct omapfb_device *fbdev) | 35 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c index aafe9b497e2d..3271f1643b26 100644 --- a/drivers/video/omap/lcd_inn1510.c +++ b/drivers/video/omap/lcd_inn1510.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | 25 | ||
26 | #include <plat/fpga.h> | 26 | #include <plat/fpga.h> |
27 | #include <plat/omapfb.h> | 27 | #include "omapfb.h" |
28 | 28 | ||
29 | static int innovator1510_panel_init(struct lcd_panel *panel, | 29 | static int innovator1510_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c index 0de338264a8a..9fff86f67bde 100644 --- a/drivers/video/omap/lcd_inn1610.c +++ b/drivers/video/omap/lcd_inn1610.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | 24 | ||
25 | #include <mach/gpio.h> | 25 | #include <mach/gpio.h> |
26 | #include <plat/omapfb.h> | 26 | #include "omapfb.h" |
27 | 27 | ||
28 | #define MODULE_NAME "omapfb-lcd_h3" | 28 | #define MODULE_NAME "omapfb-lcd_h3" |
29 | 29 | ||
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c index 6a260dfdadc5..5bb7f6f14601 100644 --- a/drivers/video/omap/lcd_ldp.c +++ b/drivers/video/omap/lcd_ldp.c | |||
@@ -28,9 +28,10 @@ | |||
28 | 28 | ||
29 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
30 | #include <plat/mux.h> | 30 | #include <plat/mux.h> |
31 | #include <plat/omapfb.h> | ||
32 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
33 | 32 | ||
33 | #include "omapfb.h" | ||
34 | |||
34 | #define LCD_PANEL_BACKLIGHT_GPIO (15 + OMAP_MAX_GPIO_LINES) | 35 | #define LCD_PANEL_BACKLIGHT_GPIO (15 + OMAP_MAX_GPIO_LINES) |
35 | #define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES) | 36 | #define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES) |
36 | 37 | ||
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index 2162eb09e0fe..46ca90d1d177 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c | |||
@@ -23,9 +23,10 @@ | |||
23 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
24 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
25 | 25 | ||
26 | #include <plat/omapfb.h> | ||
27 | #include <plat/lcd_mipid.h> | 26 | #include <plat/lcd_mipid.h> |
28 | 27 | ||
28 | #include "omapfb.h" | ||
29 | |||
29 | #define MIPID_MODULE_NAME "lcd_mipid" | 30 | #define MIPID_MODULE_NAME "lcd_mipid" |
30 | 31 | ||
31 | #define MIPID_CMD_READ_DISP_ID 0x04 | 32 | #define MIPID_CMD_READ_DISP_ID 0x04 |
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c index e1a38abca3e7..006c2fe7360e 100644 --- a/drivers/video/omap/lcd_omap2evm.c +++ b/drivers/video/omap/lcd_omap2evm.c | |||
@@ -27,9 +27,10 @@ | |||
27 | #include <linux/i2c/twl4030.h> | 27 | #include <linux/i2c/twl4030.h> |
28 | 28 | ||
29 | #include <plat/mux.h> | 29 | #include <plat/mux.h> |
30 | #include <plat/omapfb.h> | ||
31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
32 | 31 | ||
32 | #include "omapfb.h" | ||
33 | |||
33 | #define LCD_PANEL_ENABLE_GPIO 154 | 34 | #define LCD_PANEL_ENABLE_GPIO 154 |
34 | #define LCD_PANEL_LR 128 | 35 | #define LCD_PANEL_LR 128 |
35 | #define LCD_PANEL_UD 129 | 36 | #define LCD_PANEL_UD 129 |
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c index ccec084ed647..fc503d8f3c24 100644 --- a/drivers/video/omap/lcd_omap3beagle.c +++ b/drivers/video/omap/lcd_omap3beagle.c | |||
@@ -26,9 +26,11 @@ | |||
26 | #include <linux/i2c/twl4030.h> | 26 | #include <linux/i2c/twl4030.h> |
27 | 27 | ||
28 | #include <plat/mux.h> | 28 | #include <plat/mux.h> |
29 | #include <plat/omapfb.h> | 29 | #include <plat/mux.h> |
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
31 | 31 | ||
32 | #include "omapfb.h" | ||
33 | |||
32 | #define LCD_PANEL_ENABLE_GPIO 170 | 34 | #define LCD_PANEL_ENABLE_GPIO 170 |
33 | 35 | ||
34 | static int omap3beagle_panel_init(struct lcd_panel *panel, | 36 | static int omap3beagle_panel_init(struct lcd_panel *panel, |
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c index 556eb31db24c..ae2edc4081a8 100644 --- a/drivers/video/omap/lcd_omap3evm.c +++ b/drivers/video/omap/lcd_omap3evm.c | |||
@@ -26,9 +26,10 @@ | |||
26 | #include <linux/i2c/twl4030.h> | 26 | #include <linux/i2c/twl4030.h> |
27 | 27 | ||
28 | #include <plat/mux.h> | 28 | #include <plat/mux.h> |
29 | #include <plat/omapfb.h> | ||
30 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
31 | 30 | ||
31 | #include "omapfb.h" | ||
32 | |||
32 | #define LCD_PANEL_ENABLE_GPIO 153 | 33 | #define LCD_PANEL_ENABLE_GPIO 153 |
33 | #define LCD_PANEL_LR 2 | 34 | #define LCD_PANEL_LR 2 |
34 | #define LCD_PANEL_UD 3 | 35 | #define LCD_PANEL_UD 3 |
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index bb21d7dca39e..b87e8b83f29c 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <plat/mux.h> | 27 | #include <plat/mux.h> |
28 | #include <plat/omapfb.h> | 28 | #include "omapfb.h" |
29 | 29 | ||
30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
31 | { | 31 | { |
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c index b0f86e514cde..56ee192e9ee2 100644 --- a/drivers/video/omap/lcd_overo.c +++ b/drivers/video/omap/lcd_overo.c | |||
@@ -25,9 +25,10 @@ | |||
25 | 25 | ||
26 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
27 | #include <plat/mux.h> | 27 | #include <plat/mux.h> |
28 | #include <plat/omapfb.h> | ||
29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
30 | 29 | ||
30 | #include "omapfb.h" | ||
31 | |||
31 | #define LCD_ENABLE 144 | 32 | #define LCD_ENABLE 144 |
32 | 33 | ||
33 | static int overo_panel_init(struct lcd_panel *panel, | 34 | static int overo_panel_init(struct lcd_panel *panel, |
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c index d30289603ce8..4cb301750d02 100644 --- a/drivers/video/omap/lcd_palmte.c +++ b/drivers/video/omap/lcd_palmte.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | 25 | ||
26 | #include <plat/fpga.h> | 26 | #include <plat/fpga.h> |
27 | #include <plat/omapfb.h> | 27 | #include "omapfb.h" |
28 | 28 | ||
29 | static int palmte_panel_init(struct lcd_panel *panel, | 29 | static int palmte_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c index 557424fb6df1..ff0e6d7ab3a2 100644 --- a/drivers/video/omap/lcd_palmtt.c +++ b/drivers/video/omap/lcd_palmtt.c | |||
@@ -30,7 +30,7 @@ GPIO13 - screen blanking | |||
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | 31 | ||
32 | #include <mach/gpio.h> | 32 | #include <mach/gpio.h> |
33 | #include <plat/omapfb.h> | 33 | #include "omapfb.h" |
34 | 34 | ||
35 | static int palmtt_panel_init(struct lcd_panel *panel, | 35 | static int palmtt_panel_init(struct lcd_panel *panel, |
36 | struct omapfb_device *fbdev) | 36 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c index 5f4b5b2c1f41..2334e56536bc 100644 --- a/drivers/video/omap/lcd_palmz71.c +++ b/drivers/video/omap/lcd_palmz71.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | 26 | ||
27 | #include <plat/omapfb.h> | 27 | #include "omapfb.h" |
28 | 28 | ||
29 | static int palmz71_panel_init(struct lcd_panel *panel, | 29 | static int palmz71_panel_init(struct lcd_panel *panel, |
30 | struct omapfb_device *fbdev) | 30 | struct omapfb_device *fbdev) |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 5f32cafbf74c..b831e1df629e 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -30,10 +30,11 @@ | |||
30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
31 | 31 | ||
32 | #include <plat/dma.h> | 32 | #include <plat/dma.h> |
33 | #include <plat/omapfb.h> | ||
34 | 33 | ||
35 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
36 | 35 | ||
36 | #include "omapfb.h" | ||
37 | |||
37 | #include "lcdc.h" | 38 | #include "lcdc.h" |
38 | 39 | ||
39 | #define MODULE_NAME "lcdc" | 40 | #define MODULE_NAME "lcdc" |
diff --git a/arch/arm/plat-omap/include/plat/omapfb.h b/drivers/video/omap/omapfb.h index bfef7ab95f17..46e4714014e8 100644 --- a/arch/arm/plat-omap/include/plat/omapfb.h +++ b/drivers/video/omap/omapfb.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * File: arch/arm/plat-omap/include/mach/omapfb.h | 2 | * File: drivers/video/omap/omapfb.h |
3 | * | 3 | * |
4 | * Framebuffer driver for TI OMAP boards | 4 | * Framebuffer driver for TI OMAP boards |
5 | * | 5 | * |
@@ -24,151 +24,12 @@ | |||
24 | #ifndef __OMAPFB_H | 24 | #ifndef __OMAPFB_H |
25 | #define __OMAPFB_H | 25 | #define __OMAPFB_H |
26 | 26 | ||
27 | #include <asm/ioctl.h> | ||
28 | #include <asm/types.h> | ||
29 | |||
30 | /* IOCTL commands. */ | ||
31 | |||
32 | #define OMAP_IOW(num, dtype) _IOW('O', num, dtype) | ||
33 | #define OMAP_IOR(num, dtype) _IOR('O', num, dtype) | ||
34 | #define OMAP_IOWR(num, dtype) _IOWR('O', num, dtype) | ||
35 | #define OMAP_IO(num) _IO('O', num) | ||
36 | |||
37 | #define OMAPFB_MIRROR OMAP_IOW(31, int) | ||
38 | #define OMAPFB_SYNC_GFX OMAP_IO(37) | ||
39 | #define OMAPFB_VSYNC OMAP_IO(38) | ||
40 | #define OMAPFB_SET_UPDATE_MODE OMAP_IOW(40, int) | ||
41 | #define OMAPFB_GET_CAPS OMAP_IOR(42, struct omapfb_caps) | ||
42 | #define OMAPFB_GET_UPDATE_MODE OMAP_IOW(43, int) | ||
43 | #define OMAPFB_LCD_TEST OMAP_IOW(45, int) | ||
44 | #define OMAPFB_CTRL_TEST OMAP_IOW(46, int) | ||
45 | #define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old) | ||
46 | #define OMAPFB_SET_COLOR_KEY OMAP_IOW(50, struct omapfb_color_key) | ||
47 | #define OMAPFB_GET_COLOR_KEY OMAP_IOW(51, struct omapfb_color_key) | ||
48 | #define OMAPFB_SETUP_PLANE OMAP_IOW(52, struct omapfb_plane_info) | ||
49 | #define OMAPFB_QUERY_PLANE OMAP_IOW(53, struct omapfb_plane_info) | ||
50 | #define OMAPFB_UPDATE_WINDOW OMAP_IOW(54, struct omapfb_update_window) | ||
51 | #define OMAPFB_SETUP_MEM OMAP_IOW(55, struct omapfb_mem_info) | ||
52 | #define OMAPFB_QUERY_MEM OMAP_IOW(56, struct omapfb_mem_info) | ||
53 | |||
54 | #define OMAPFB_CAPS_GENERIC_MASK 0x00000fff | ||
55 | #define OMAPFB_CAPS_LCDC_MASK 0x00fff000 | ||
56 | #define OMAPFB_CAPS_PANEL_MASK 0xff000000 | ||
57 | |||
58 | #define OMAPFB_CAPS_MANUAL_UPDATE 0x00001000 | ||
59 | #define OMAPFB_CAPS_TEARSYNC 0x00002000 | ||
60 | #define OMAPFB_CAPS_PLANE_RELOCATE_MEM 0x00004000 | ||
61 | #define OMAPFB_CAPS_PLANE_SCALE 0x00008000 | ||
62 | #define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000 | ||
63 | #define OMAPFB_CAPS_WINDOW_SCALE 0x00020000 | ||
64 | #define OMAPFB_CAPS_WINDOW_OVERLAY 0x00040000 | ||
65 | #define OMAPFB_CAPS_WINDOW_ROTATE 0x00080000 | ||
66 | #define OMAPFB_CAPS_SET_BACKLIGHT 0x01000000 | ||
67 | |||
68 | /* Values from DSP must map to lower 16-bits */ | ||
69 | #define OMAPFB_FORMAT_MASK 0x00ff | ||
70 | #define OMAPFB_FORMAT_FLAG_DOUBLE 0x0100 | ||
71 | #define OMAPFB_FORMAT_FLAG_TEARSYNC 0x0200 | ||
72 | #define OMAPFB_FORMAT_FLAG_FORCE_VSYNC 0x0400 | ||
73 | #define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY 0x0800 | ||
74 | #define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY 0x1000 | ||
75 | |||
76 | #define OMAPFB_EVENT_READY 1 | ||
77 | #define OMAPFB_EVENT_DISABLED 2 | ||
78 | |||
79 | #define OMAPFB_MEMTYPE_SDRAM 0 | ||
80 | #define OMAPFB_MEMTYPE_SRAM 1 | ||
81 | #define OMAPFB_MEMTYPE_MAX 1 | ||
82 | |||
83 | enum omapfb_color_format { | ||
84 | OMAPFB_COLOR_RGB565 = 0, | ||
85 | OMAPFB_COLOR_YUV422, | ||
86 | OMAPFB_COLOR_YUV420, | ||
87 | OMAPFB_COLOR_CLUT_8BPP, | ||
88 | OMAPFB_COLOR_CLUT_4BPP, | ||
89 | OMAPFB_COLOR_CLUT_2BPP, | ||
90 | OMAPFB_COLOR_CLUT_1BPP, | ||
91 | OMAPFB_COLOR_RGB444, | ||
92 | OMAPFB_COLOR_YUY422, | ||
93 | }; | ||
94 | |||
95 | struct omapfb_update_window { | ||
96 | __u32 x, y; | ||
97 | __u32 width, height; | ||
98 | __u32 format; | ||
99 | __u32 out_x, out_y; | ||
100 | __u32 out_width, out_height; | ||
101 | __u32 reserved[8]; | ||
102 | }; | ||
103 | |||
104 | struct omapfb_update_window_old { | ||
105 | __u32 x, y; | ||
106 | __u32 width, height; | ||
107 | __u32 format; | ||
108 | }; | ||
109 | |||
110 | enum omapfb_plane { | ||
111 | OMAPFB_PLANE_GFX = 0, | ||
112 | OMAPFB_PLANE_VID1, | ||
113 | OMAPFB_PLANE_VID2, | ||
114 | }; | ||
115 | |||
116 | enum omapfb_channel_out { | ||
117 | OMAPFB_CHANNEL_OUT_LCD = 0, | ||
118 | OMAPFB_CHANNEL_OUT_DIGIT, | ||
119 | }; | ||
120 | |||
121 | struct omapfb_plane_info { | ||
122 | __u32 pos_x; | ||
123 | __u32 pos_y; | ||
124 | __u8 enabled; | ||
125 | __u8 channel_out; | ||
126 | __u8 mirror; | ||
127 | __u8 reserved1; | ||
128 | __u32 out_width; | ||
129 | __u32 out_height; | ||
130 | __u32 reserved2[12]; | ||
131 | }; | ||
132 | |||
133 | struct omapfb_mem_info { | ||
134 | __u32 size; | ||
135 | __u8 type; | ||
136 | __u8 reserved[3]; | ||
137 | }; | ||
138 | |||
139 | struct omapfb_caps { | ||
140 | __u32 ctrl; | ||
141 | __u32 plane_color; | ||
142 | __u32 wnd_color; | ||
143 | }; | ||
144 | |||
145 | enum omapfb_color_key_type { | ||
146 | OMAPFB_COLOR_KEY_DISABLED = 0, | ||
147 | OMAPFB_COLOR_KEY_GFX_DST, | ||
148 | OMAPFB_COLOR_KEY_VID_SRC, | ||
149 | }; | ||
150 | |||
151 | struct omapfb_color_key { | ||
152 | __u8 channel_out; | ||
153 | __u32 background; | ||
154 | __u32 trans_key; | ||
155 | __u8 key_type; | ||
156 | }; | ||
157 | |||
158 | enum omapfb_update_mode { | ||
159 | OMAPFB_UPDATE_DISABLED = 0, | ||
160 | OMAPFB_AUTO_UPDATE, | ||
161 | OMAPFB_MANUAL_UPDATE | ||
162 | }; | ||
163 | |||
164 | #ifdef __KERNEL__ | ||
165 | |||
166 | #include <linux/completion.h> | ||
167 | #include <linux/interrupt.h> | ||
168 | #include <linux/fb.h> | 27 | #include <linux/fb.h> |
169 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
29 | #include <linux/omapfb.h> | ||
170 | 30 | ||
171 | #include <plat/board.h> | 31 | #define OMAPFB_EVENT_READY 1 |
32 | #define OMAPFB_EVENT_DISABLED 2 | ||
172 | 33 | ||
173 | #define OMAP_LCDC_INV_VSYNC 0x0001 | 34 | #define OMAP_LCDC_INV_VSYNC 0x0001 |
174 | #define OMAP_LCDC_INV_HSYNC 0x0002 | 35 | #define OMAP_LCDC_INV_HSYNC 0x0002 |
@@ -184,12 +45,6 @@ enum omapfb_update_mode { | |||
184 | #define OMAPFB_PLANE_XRES_MIN 8 | 45 | #define OMAPFB_PLANE_XRES_MIN 8 |
185 | #define OMAPFB_PLANE_YRES_MIN 8 | 46 | #define OMAPFB_PLANE_YRES_MIN 8 |
186 | 47 | ||
187 | #ifdef CONFIG_ARCH_OMAP1 | ||
188 | #define OMAPFB_PLANE_NUM 1 | ||
189 | #else | ||
190 | #define OMAPFB_PLANE_NUM 3 | ||
191 | #endif | ||
192 | |||
193 | struct omapfb_device; | 48 | struct omapfb_device; |
194 | 49 | ||
195 | struct lcd_panel { | 50 | struct lcd_panel { |
@@ -256,7 +111,7 @@ struct lcd_ctrl_extif { | |||
256 | void (*read_data) (void *buf, unsigned int len); | 111 | void (*read_data) (void *buf, unsigned int len); |
257 | void (*write_data) (const void *buf, unsigned int len); | 112 | void (*write_data) (const void *buf, unsigned int len); |
258 | void (*transfer_area) (int width, int height, | 113 | void (*transfer_area) (int width, int height, |
259 | void (callback)(void * data), void *data); | 114 | void (callback)(void *data), void *data); |
260 | int (*setup_tearsync) (unsigned pin_cnt, | 115 | int (*setup_tearsync) (unsigned pin_cnt, |
261 | unsigned hs_pulse_time, unsigned vs_pulse_time, | 116 | unsigned hs_pulse_time, unsigned vs_pulse_time, |
262 | int hs_pol_inv, int vs_pol_inv, int div); | 117 | int hs_pol_inv, int vs_pol_inv, int div); |
@@ -275,20 +130,6 @@ typedef int (*omapfb_notifier_callback_t)(struct notifier_block *, | |||
275 | unsigned long event, | 130 | unsigned long event, |
276 | void *fbi); | 131 | void *fbi); |
277 | 132 | ||
278 | struct omapfb_mem_region { | ||
279 | u32 paddr; | ||
280 | void __iomem *vaddr; | ||
281 | unsigned long size; | ||
282 | u8 type; /* OMAPFB_PLANE_MEM_* */ | ||
283 | unsigned alloc:1; /* allocated by the driver */ | ||
284 | unsigned map:1; /* kernel mapped by the driver */ | ||
285 | }; | ||
286 | |||
287 | struct omapfb_mem_desc { | ||
288 | int region_cnt; | ||
289 | struct omapfb_mem_region region[OMAPFB_PLANE_NUM]; | ||
290 | }; | ||
291 | |||
292 | struct lcd_ctrl { | 133 | struct lcd_ctrl { |
293 | const char *name; | 134 | const char *name; |
294 | void *data; | 135 | void *data; |
@@ -331,9 +172,9 @@ struct lcd_ctrl { | |||
331 | }; | 172 | }; |
332 | 173 | ||
333 | enum omapfb_state { | 174 | enum omapfb_state { |
334 | OMAPFB_DISABLED = 0, | 175 | OMAPFB_DISABLED = 0, |
335 | OMAPFB_SUSPENDED= 99, | 176 | OMAPFB_SUSPENDED = 99, |
336 | OMAPFB_ACTIVE = 100 | 177 | OMAPFB_ACTIVE = 100 |
337 | }; | 178 | }; |
338 | 179 | ||
339 | struct omapfb_plane_struct { | 180 | struct omapfb_plane_struct { |
@@ -345,8 +186,8 @@ struct omapfb_plane_struct { | |||
345 | 186 | ||
346 | struct omapfb_device { | 187 | struct omapfb_device { |
347 | int state; | 188 | int state; |
348 | int ext_lcdc; /* Using external | 189 | int ext_lcdc; /* Using external |
349 | LCD controller */ | 190 | LCD controller */ |
350 | struct mutex rqueue_mutex; | 191 | struct mutex rqueue_mutex; |
351 | 192 | ||
352 | int palette_size; | 193 | int palette_size; |
@@ -364,19 +205,12 @@ struct omapfb_device { | |||
364 | struct fb_info *fb_info[OMAPFB_PLANE_NUM]; | 205 | struct fb_info *fb_info[OMAPFB_PLANE_NUM]; |
365 | }; | 206 | }; |
366 | 207 | ||
367 | struct omapfb_platform_data { | ||
368 | struct omap_lcd_config lcd; | ||
369 | struct omapfb_mem_desc mem_desc; | ||
370 | void *ctrl_platform_data; | ||
371 | }; | ||
372 | |||
373 | #ifdef CONFIG_ARCH_OMAP1 | 208 | #ifdef CONFIG_ARCH_OMAP1 |
374 | extern struct lcd_ctrl omap1_lcd_ctrl; | 209 | extern struct lcd_ctrl omap1_lcd_ctrl; |
375 | #else | 210 | #else |
376 | extern struct lcd_ctrl omap2_disp_ctrl; | 211 | extern struct lcd_ctrl omap2_disp_ctrl; |
377 | #endif | 212 | #endif |
378 | 213 | ||
379 | extern void omapfb_reserve_sdram(void); | ||
380 | extern void omapfb_register_panel(struct lcd_panel *panel); | 214 | extern void omapfb_register_panel(struct lcd_panel *panel); |
381 | extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); | 215 | extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); |
382 | extern void omapfb_notify_clients(struct omapfb_device *fbdev, | 216 | extern void omapfb_notify_clients(struct omapfb_device *fbdev, |
@@ -390,9 +224,4 @@ extern int omapfb_update_window_async(struct fb_info *fbi, | |||
390 | void (*callback)(void *), | 224 | void (*callback)(void *), |
391 | void *callback_data); | 225 | void *callback_data); |
392 | 226 | ||
393 | /* in arch/arm/plat-omap/fb.c */ | ||
394 | extern void omapfb_set_ctrl_platform_data(void *pdata); | ||
395 | |||
396 | #endif /* __KERNEL__ */ | ||
397 | |||
398 | #endif /* __OMAPFB_H */ | 227 | #endif /* __OMAPFB_H */ |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f900a43db8d7..c7f59a5ccdbc 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -29,8 +29,8 @@ | |||
29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
30 | 30 | ||
31 | #include <plat/dma.h> | 31 | #include <plat/dma.h> |
32 | #include <plat/omapfb.h> | ||
33 | 32 | ||
33 | #include "omapfb.h" | ||
34 | #include "lcdc.h" | 34 | #include "lcdc.h" |
35 | #include "dispc.h" | 35 | #include "dispc.h" |
36 | 36 | ||
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index c90fa39486b4..fed7b1bda19c 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | 29 | ||
30 | #include <plat/omapfb.h> | 30 | #include "omapfb.h" |
31 | |||
32 | #include "dispc.h" | 31 | #include "dispc.h" |
33 | 32 | ||
34 | /* To work around an RFBI transfer rate limitation */ | 33 | /* To work around an RFBI transfer rate limitation */ |
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index 79dc84f09713..8fb7c708f563 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
@@ -23,10 +23,11 @@ | |||
23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/interrupt.h> | ||
26 | 27 | ||
27 | #include <plat/dma.h> | 28 | #include <plat/dma.h> |
28 | #include <plat/omapfb.h> | ||
29 | 29 | ||
30 | #include "omapfb.h" | ||
30 | #include "lcdc.h" | 31 | #include "lcdc.h" |
31 | 32 | ||
32 | #define MODULE_NAME "omapfb-sossi" | 33 | #define MODULE_NAME "omapfb-sossi" |
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h new file mode 100644 index 000000000000..a8efa92c6c35 --- /dev/null +++ b/include/linux/omapfb.h | |||
@@ -0,0 +1,197 @@ | |||
1 | /* | ||
2 | * File: include/linux/omapfb.h | ||
3 | * | ||
4 | * Framebuffer driver for TI OMAP boards | ||
5 | * | ||
6 | * Copyright (C) 2004 Nokia Corporation | ||
7 | * Author: Imre Deak <imre.deak@nokia.com> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License as published by the | ||
11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
12 | * option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, but | ||
15 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
17 | * General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License along | ||
20 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
21 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
22 | */ | ||
23 | |||
24 | #ifndef __LINUX_OMAPFB_H__ | ||
25 | #define __LINUX_OMAPFB_H__ | ||
26 | |||
27 | #include <linux/ioctl.h> | ||
28 | #include <linux/types.h> | ||
29 | |||
30 | /* IOCTL commands. */ | ||
31 | |||
32 | #define OMAP_IOW(num, dtype) _IOW('O', num, dtype) | ||
33 | #define OMAP_IOR(num, dtype) _IOR('O', num, dtype) | ||
34 | #define OMAP_IOWR(num, dtype) _IOWR('O', num, dtype) | ||
35 | #define OMAP_IO(num) _IO('O', num) | ||
36 | |||
37 | #define OMAPFB_MIRROR OMAP_IOW(31, int) | ||
38 | #define OMAPFB_SYNC_GFX OMAP_IO(37) | ||
39 | #define OMAPFB_VSYNC OMAP_IO(38) | ||
40 | #define OMAPFB_SET_UPDATE_MODE OMAP_IOW(40, int) | ||
41 | #define OMAPFB_GET_CAPS OMAP_IOR(42, struct omapfb_caps) | ||
42 | #define OMAPFB_GET_UPDATE_MODE OMAP_IOW(43, int) | ||
43 | #define OMAPFB_LCD_TEST OMAP_IOW(45, int) | ||
44 | #define OMAPFB_CTRL_TEST OMAP_IOW(46, int) | ||
45 | #define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old) | ||
46 | #define OMAPFB_SET_COLOR_KEY OMAP_IOW(50, struct omapfb_color_key) | ||
47 | #define OMAPFB_GET_COLOR_KEY OMAP_IOW(51, struct omapfb_color_key) | ||
48 | #define OMAPFB_SETUP_PLANE OMAP_IOW(52, struct omapfb_plane_info) | ||
49 | #define OMAPFB_QUERY_PLANE OMAP_IOW(53, struct omapfb_plane_info) | ||
50 | #define OMAPFB_UPDATE_WINDOW OMAP_IOW(54, struct omapfb_update_window) | ||
51 | #define OMAPFB_SETUP_MEM OMAP_IOW(55, struct omapfb_mem_info) | ||
52 | #define OMAPFB_QUERY_MEM OMAP_IOW(56, struct omapfb_mem_info) | ||
53 | |||
54 | #define OMAPFB_CAPS_GENERIC_MASK 0x00000fff | ||
55 | #define OMAPFB_CAPS_LCDC_MASK 0x00fff000 | ||
56 | #define OMAPFB_CAPS_PANEL_MASK 0xff000000 | ||
57 | |||
58 | #define OMAPFB_CAPS_MANUAL_UPDATE 0x00001000 | ||
59 | #define OMAPFB_CAPS_TEARSYNC 0x00002000 | ||
60 | #define OMAPFB_CAPS_PLANE_RELOCATE_MEM 0x00004000 | ||
61 | #define OMAPFB_CAPS_PLANE_SCALE 0x00008000 | ||
62 | #define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000 | ||
63 | #define OMAPFB_CAPS_WINDOW_SCALE 0x00020000 | ||
64 | #define OMAPFB_CAPS_WINDOW_OVERLAY 0x00040000 | ||
65 | #define OMAPFB_CAPS_WINDOW_ROTATE 0x00080000 | ||
66 | #define OMAPFB_CAPS_SET_BACKLIGHT 0x01000000 | ||
67 | |||
68 | /* Values from DSP must map to lower 16-bits */ | ||
69 | #define OMAPFB_FORMAT_MASK 0x00ff | ||
70 | #define OMAPFB_FORMAT_FLAG_DOUBLE 0x0100 | ||
71 | #define OMAPFB_FORMAT_FLAG_TEARSYNC 0x0200 | ||
72 | #define OMAPFB_FORMAT_FLAG_FORCE_VSYNC 0x0400 | ||
73 | #define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY 0x0800 | ||
74 | #define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY 0x1000 | ||
75 | |||
76 | #define OMAPFB_MEMTYPE_SDRAM 0 | ||
77 | #define OMAPFB_MEMTYPE_SRAM 1 | ||
78 | #define OMAPFB_MEMTYPE_MAX 1 | ||
79 | |||
80 | enum omapfb_color_format { | ||
81 | OMAPFB_COLOR_RGB565 = 0, | ||
82 | OMAPFB_COLOR_YUV422, | ||
83 | OMAPFB_COLOR_YUV420, | ||
84 | OMAPFB_COLOR_CLUT_8BPP, | ||
85 | OMAPFB_COLOR_CLUT_4BPP, | ||
86 | OMAPFB_COLOR_CLUT_2BPP, | ||
87 | OMAPFB_COLOR_CLUT_1BPP, | ||
88 | OMAPFB_COLOR_RGB444, | ||
89 | OMAPFB_COLOR_YUY422, | ||
90 | }; | ||
91 | |||
92 | struct omapfb_update_window { | ||
93 | __u32 x, y; | ||
94 | __u32 width, height; | ||
95 | __u32 format; | ||
96 | __u32 out_x, out_y; | ||
97 | __u32 out_width, out_height; | ||
98 | __u32 reserved[8]; | ||
99 | }; | ||
100 | |||
101 | struct omapfb_update_window_old { | ||
102 | __u32 x, y; | ||
103 | __u32 width, height; | ||
104 | __u32 format; | ||
105 | }; | ||
106 | |||
107 | enum omapfb_plane { | ||
108 | OMAPFB_PLANE_GFX = 0, | ||
109 | OMAPFB_PLANE_VID1, | ||
110 | OMAPFB_PLANE_VID2, | ||
111 | }; | ||
112 | |||
113 | enum omapfb_channel_out { | ||
114 | OMAPFB_CHANNEL_OUT_LCD = 0, | ||
115 | OMAPFB_CHANNEL_OUT_DIGIT, | ||
116 | }; | ||
117 | |||
118 | struct omapfb_plane_info { | ||
119 | __u32 pos_x; | ||
120 | __u32 pos_y; | ||
121 | __u8 enabled; | ||
122 | __u8 channel_out; | ||
123 | __u8 mirror; | ||
124 | __u8 reserved1; | ||
125 | __u32 out_width; | ||
126 | __u32 out_height; | ||
127 | __u32 reserved2[12]; | ||
128 | }; | ||
129 | |||
130 | struct omapfb_mem_info { | ||
131 | __u32 size; | ||
132 | __u8 type; | ||
133 | __u8 reserved[3]; | ||
134 | }; | ||
135 | |||
136 | struct omapfb_caps { | ||
137 | __u32 ctrl; | ||
138 | __u32 plane_color; | ||
139 | __u32 wnd_color; | ||
140 | }; | ||
141 | |||
142 | enum omapfb_color_key_type { | ||
143 | OMAPFB_COLOR_KEY_DISABLED = 0, | ||
144 | OMAPFB_COLOR_KEY_GFX_DST, | ||
145 | OMAPFB_COLOR_KEY_VID_SRC, | ||
146 | }; | ||
147 | |||
148 | struct omapfb_color_key { | ||
149 | __u8 channel_out; | ||
150 | __u32 background; | ||
151 | __u32 trans_key; | ||
152 | __u8 key_type; | ||
153 | }; | ||
154 | |||
155 | enum omapfb_update_mode { | ||
156 | OMAPFB_UPDATE_DISABLED = 0, | ||
157 | OMAPFB_AUTO_UPDATE, | ||
158 | OMAPFB_MANUAL_UPDATE | ||
159 | }; | ||
160 | |||
161 | #ifdef __KERNEL__ | ||
162 | |||
163 | #include <plat/board.h> | ||
164 | |||
165 | #ifdef CONFIG_ARCH_OMAP1 | ||
166 | #define OMAPFB_PLANE_NUM 1 | ||
167 | #else | ||
168 | #define OMAPFB_PLANE_NUM 3 | ||
169 | #endif | ||
170 | |||
171 | struct omapfb_mem_region { | ||
172 | u32 paddr; | ||
173 | void __iomem *vaddr; | ||
174 | unsigned long size; | ||
175 | u8 type; /* OMAPFB_PLANE_MEM_* */ | ||
176 | unsigned alloc:1; /* allocated by the driver */ | ||
177 | unsigned map:1; /* kernel mapped by the driver */ | ||
178 | }; | ||
179 | |||
180 | struct omapfb_mem_desc { | ||
181 | int region_cnt; | ||
182 | struct omapfb_mem_region region[OMAPFB_PLANE_NUM]; | ||
183 | }; | ||
184 | |||
185 | struct omapfb_platform_data { | ||
186 | struct omap_lcd_config lcd; | ||
187 | struct omapfb_mem_desc mem_desc; | ||
188 | void *ctrl_platform_data; | ||
189 | }; | ||
190 | |||
191 | /* in arch/arm/plat-omap/fb.c */ | ||
192 | extern void omapfb_set_ctrl_platform_data(void *pdata); | ||
193 | extern void omapfb_reserve_sdram(void); | ||
194 | |||
195 | #endif | ||
196 | |||
197 | #endif /* __OMAPFB_H */ | ||