diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/mcde.h | 10 | ||||
| -rw-r--r-- | include/video/mcde_display-sony_acx424akp_dsi.h | 41 | ||||
| -rw-r--r-- | include/video/mcde_display.h | 1 |
3 files changed, 49 insertions, 3 deletions
diff --git a/include/video/mcde.h b/include/video/mcde.h index 213f33e43fe..75992bf7d57 100644 --- a/include/video/mcde.h +++ b/include/video/mcde.h @@ -236,7 +236,7 @@ enum mcde_display_rotation { #define MCDE_FIFO_AB_SIZE 640 #define MCDE_FIFO_C0C1_SIZE 160 -#define MCDE_PIXFETCH_LARGE_WTRMRKLVL 128 +#define MCDE_PIXFETCH_LARGE_WTRMRKLVL 256 #define MCDE_PIXFETCH_MEDIUM_WTRMRKLVL 64 #define MCDE_PIXFETCH_SMALL_WTRMRKLVL 16 @@ -251,6 +251,7 @@ enum mcde_display_rotation { #define MCDE_AUTO_SYNC_WATCHDOG 5 /* Hardware versions */ +#define MCDE_CHIP_VERSION_4_0_4 4 /* U5500 V2 */ #define MCDE_CHIP_VERSION_1_0_4 3 /* U5500 V1 */ #define MCDE_CHIP_VERSION_3_0_8 2 /* U8500 V2 */ #define MCDE_CHIP_VERSION_3_0_5 1 /* U8500 V1 */ @@ -412,8 +413,11 @@ void mcde_ovly_put(struct mcde_ovly_state *ovly); #define MCDE_MAX_DSI_DIRECT_CMD_WRITE 15 int mcde_dsi_generic_write(struct mcde_chnl_state *chnl, u8* para, int len); -int mcde_dsi_dcs_write(struct mcde_chnl_state *chnl, u8 cmd, u8* data, int len); -int mcde_dsi_dcs_read(struct mcde_chnl_state *chnl, u8 cmd, u8* data, int *len); +int mcde_dsi_dcs_write(struct mcde_chnl_state *chnl, + u8 cmd, u8 *data, int len); +int mcde_dsi_dcs_read(struct mcde_chnl_state *chnl, + u8 cmd, u32 *data, int *len); +int mcde_dsi_set_max_pkt_size(struct mcde_chnl_state *chnl, int size); /* MCDE */ diff --git a/include/video/mcde_display-sony_acx424akp_dsi.h b/include/video/mcde_display-sony_acx424akp_dsi.h new file mode 100644 index 00000000000..de862a3f28b --- /dev/null +++ b/include/video/mcde_display-sony_acx424akp_dsi.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * ST-Ericsson MCDE Sony acx424akp DCS display driver + * + * Author: Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> + * for ST-Ericsson. + * + * License terms: GNU General Public License (GPL), version 2. + */ +#ifndef __MCDE_DISPLAY_SONY_ACX424AKP__H__ +#define __MCDE_DISPLAY_SONY_ACX424AKP__H__ + +#include <linux/regulator/consumer.h> + +#include "mcde_display.h" + +enum display_panel_type { + DISPLAY_NONE = 0, + DISPLAY_SONY_ACX424AKP = 0x1b81, +}; + +struct mcde_display_sony_acx424akp_platform_data { + /* Platform info */ + int reset_gpio; + bool reset_high; + const char *regulator_id; + int reset_delay; /* ms */ + int reset_low_delay; /* ms */ + int sleep_out_delay; /* ms */ + enum display_panel_type disp_panel; /* display panel types */ + + /* Driver data */ + bool sony_acx424akp_platform_enable; + struct regulator *regulator; + int max_supply_voltage; + int min_supply_voltage; +}; + +#endif /* __MCDE_DISPLAY_SONY_ACX424AKP__H__ */ + diff --git a/include/video/mcde_display.h b/include/video/mcde_display.h index a5e449f6b5b..6519660f489 100644 --- a/include/video/mcde_display.h +++ b/include/video/mcde_display.h @@ -60,6 +60,7 @@ struct mcde_display_device { struct mcde_video_mode video_mode; int update_flags; bool stay_alive; + int check_transparency; /* Driver API */ void (*get_native_resolution)(struct mcde_display_device *dev, |