diff options
Diffstat (limited to 'drivers/video/omap2/dss/dispc.h')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.h | 37 | 
1 files changed, 37 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h index 92d8a9be86f..222363c6e62 100644 --- a/drivers/video/omap2/dss/dispc.h +++ b/drivers/video/omap2/dss/dispc.h @@ -36,6 +36,7 @@  #define DISPC_CONTROL2			0x0238  #define DISPC_CONFIG2			0x0620  #define DISPC_DIVISOR			0x0804 +#define DISPC_GLOBAL_BUFFER		0x0800  #define DISPC_CONTROL3                  0x0848  #define DISPC_CONFIG3                   0x084C @@ -355,6 +356,8 @@ static inline u16 DISPC_OVL_BASE(enum omap_plane plane)  		return 0x014C;  	case OMAP_DSS_VIDEO3:  		return 0x0300; +	case OMAP_DSS_WB: +		return 0x0500;  	default:  		BUG();  		return 0; @@ -370,6 +373,7 @@ static inline u16 DISPC_BA0_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0000;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0008;  	default:  		BUG(); @@ -385,6 +389,7 @@ static inline u16 DISPC_BA1_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0004;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x000C;  	default:  		BUG(); @@ -404,6 +409,8 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane)  		return 0x04BC;  	case OMAP_DSS_VIDEO3:  		return 0x0310; +	case OMAP_DSS_WB: +		return 0x0118;  	default:  		BUG();  		return 0; @@ -422,6 +429,8 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane)  		return 0x04C0;  	case OMAP_DSS_VIDEO3:  		return 0x0314; +	case OMAP_DSS_WB: +		return 0x011C;  	default:  		BUG();  		return 0; @@ -451,6 +460,7 @@ static inline u16 DISPC_SIZE_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x000C;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x00A8;  	default:  		BUG(); @@ -467,6 +477,7 @@ static inline u16 DISPC_ATTR_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0010;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0070;  	default:  		BUG(); @@ -486,6 +497,8 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane)  		return 0x04DC;  	case OMAP_DSS_VIDEO3:  		return 0x032C; +	case OMAP_DSS_WB: +		return 0x0310;  	default:  		BUG();  		return 0; @@ -501,6 +514,7 @@ static inline u16 DISPC_FIFO_THRESH_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0014;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x008C;  	default:  		BUG(); @@ -517,6 +531,7 @@ static inline u16 DISPC_FIFO_SIZE_STATUS_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0018;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0088;  	default:  		BUG(); @@ -533,6 +548,7 @@ static inline u16 DISPC_ROW_INC_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x001C;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x00A4;  	default:  		BUG(); @@ -549,6 +565,7 @@ static inline u16 DISPC_PIX_INC_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0020;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0098;  	default:  		BUG(); @@ -598,6 +615,7 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0024;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0090;  	default:  		BUG(); @@ -617,6 +635,8 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane)  		return 0x055C;  	case OMAP_DSS_VIDEO3:  		return 0x0424; +	case OMAP_DSS_WB: +		return 0x290;  	default:  		BUG();  		return 0; @@ -633,6 +653,7 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0028;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0094;  	default:  		BUG(); @@ -651,6 +672,7 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x002C;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0000;  	default:  		BUG(); @@ -670,6 +692,8 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane)  		return 0x0560;  	case OMAP_DSS_VIDEO3:  		return 0x0428; +	case OMAP_DSS_WB: +		return 0x0294;  	default:  		BUG();  		return 0; @@ -686,6 +710,7 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane)  	case OMAP_DSS_VIDEO2:  		return 0x0030;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0004;  	default:  		BUG(); @@ -705,6 +730,8 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane)  		return 0x0564;  	case OMAP_DSS_VIDEO3:  		return 0x042C; +	case OMAP_DSS_WB: +		return 0x0298;  	default:  		BUG();  		return 0; @@ -722,6 +749,7 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i)  	case OMAP_DSS_VIDEO2:  		return 0x0034 + i * 0x8;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0010 + i * 0x8;  	default:  		BUG(); @@ -742,6 +770,8 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i)  		return 0x0568 + i * 0x8;  	case OMAP_DSS_VIDEO3:  		return 0x0430 + i * 0x8; +	case OMAP_DSS_WB: +		return 0x02A0 + i * 0x8;  	default:  		BUG();  		return 0; @@ -759,6 +789,7 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i)  	case OMAP_DSS_VIDEO2:  		return 0x0038 + i * 0x8;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0014 + i * 0x8;  	default:  		BUG(); @@ -779,6 +810,8 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i)  		return 0x056C + i * 0x8;  	case OMAP_DSS_VIDEO3:  		return 0x0434 + i * 0x8; +	case OMAP_DSS_WB: +		return 0x02A4 + i * 0x8;  	default:  		BUG();  		return 0; @@ -795,6 +828,7 @@ static inline u16 DISPC_CONV_COEF_OFFSET(enum omap_plane plane, u16 i)  	case OMAP_DSS_VIDEO1:  	case OMAP_DSS_VIDEO2:  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0074 + i * 0x4;  	default:  		BUG(); @@ -814,6 +848,7 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i)  	case OMAP_DSS_VIDEO2:  		return 0x00B4 + i * 0x4;  	case OMAP_DSS_VIDEO3: +	case OMAP_DSS_WB:  		return 0x0050 + i * 0x4;  	default:  		BUG(); @@ -834,6 +869,8 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i)  		return 0x05A8 + i * 0x4;  	case OMAP_DSS_VIDEO3:  		return 0x0470 + i * 0x4; +	case OMAP_DSS_WB: +		return 0x02E0 + i * 0x4;  	default:  		BUG();  		return 0;  |