Commit 8613b000 authored by Sumit Semwal's avatar Sumit Semwal Committed by Tomi Valkeinen

OMAP: DSS2: Represent DISPC register defines with channel as parameter

On OMAP4, we have a new DISPC channel for Overlay Manager LCD2. There is a set
of regsiters for LCD2 channel similar to the existing LCD channel, like
DISPC_CONTROL2, DISPC_DIVISOR2, DISPC_CONFIG2 and so on.

Introduce new enum members for LCD2 Channel and corresponding Overlay Manager
in display.h.

Represent the following DISPC register defines with channel as a parameter
to differentiate between LCD and LCD2 registers (and also DIGIT in some cases):

DISPC_DEFAULT_COLOR, DISPC_TRANS_COLOR, DISPC_TIMING_H, DISPC_TIMING_V,
DISPC_POL_FREQ, DISPC_DIVISOR, DISPC_SIZE_LCD, DISPC_DATA_CYCLEk,
DISPC_CPR_COEF_R, DISPC_CPR_COEF_G and DISPC_CPR_COEF_B

This parametrization helps in reducing the number of register defines for DISPC.
Replace the existing reads/writes to these registers in this new way.
Also, Introduce defines for registers DISPC_CONTROL2 and DISPC_CONFIG2 which
are used exclusively for LCD2 channel.
Signed-off-by: default avatarSumit Semwal <sumit.semwal@ti.com>
Signed-off-by: default avatarMukund Mittal <mmittal@ti.com>
Signed-off-by: default avatarSamreen <samreen@ti.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent d50cd037
...@@ -64,6 +64,7 @@ enum omap_plane { ...@@ -64,6 +64,7 @@ enum omap_plane {
enum omap_channel { enum omap_channel {
OMAP_DSS_CHANNEL_LCD = 0, OMAP_DSS_CHANNEL_LCD = 0,
OMAP_DSS_CHANNEL_DIGIT = 1, OMAP_DSS_CHANNEL_DIGIT = 1,
OMAP_DSS_CHANNEL_LCD2 = 2,
}; };
enum omap_color_mode { enum omap_color_mode {
...@@ -142,6 +143,7 @@ enum omap_dss_display_state { ...@@ -142,6 +143,7 @@ enum omap_dss_display_state {
enum omap_dss_overlay_managers { enum omap_dss_overlay_managers {
OMAP_DSS_OVL_MGR_LCD, OMAP_DSS_OVL_MGR_LCD,
OMAP_DSS_OVL_MGR_TV, OMAP_DSS_OVL_MGR_TV,
OMAP_DSS_OVL_MGR_LCD2,
}; };
enum omap_dss_rotation_type { enum omap_dss_rotation_type {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment