1 files changed, 0 insertions, 205 deletions

diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h
index 222363c6e62..6c9ee0a0efb 100644
--- a/drivers/video/omap2/dss/dispc.h
+++ b/drivers/video/omap2/dss/dispc.h
@@ -36,9 +36,6 @@
 #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
 
 /* DISPC overlay registers */
 #define DISPC_OVL_BA0(n)                (DISPC_OVL_BASE(n) + \
@@ -100,17 +97,6 @@
 #define DISPC_OVL_PRELOAD(n)            (DISPC_OVL_BASE(n) + \
                                         DISPC_PRELOAD_OFFSET(n))
 
-/* DISPC up/downsampling FIR filter coefficient structure */
-struct dispc_coef {
-        s8 hc4_vc22;
-        s8 hc3_vc2;
-        u8 hc2_vc1;
-        s8 hc1_vc0;
-        s8 hc0_vc00;
-};
-
-const struct dispc_coef *dispc_ovl_get_scale_coef(int inc, int five_taps);
-
 /* DISPC manager/channel specific registers */
 static inline u16 DISPC_DEFAULT_COLOR(enum omap_channel channel)
 {
@@ -121,11 +107,8 @@ static inline u16 DISPC_DEFAULT_COLOR(enum omap_channel channel)
                 return 0x0050;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03AC;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0814;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -138,11 +121,8 @@ static inline u16 DISPC_TRANS_COLOR(enum omap_channel channel)
                 return 0x0058;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03B0;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0818;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -153,14 +133,10 @@ static inline u16 DISPC_TIMING_H(enum omap_channel channel)
                 return 0x0064;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0400;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0840;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -171,14 +147,10 @@ static inline u16 DISPC_TIMING_V(enum omap_channel channel)
                 return 0x0068;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0404;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0844;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -189,14 +161,10 @@ static inline u16 DISPC_POL_FREQ(enum omap_channel channel)
                 return 0x006C;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0408;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x083C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -207,14 +175,10 @@ static inline u16 DISPC_DIVISORo(enum omap_channel channel)
                 return 0x0070;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x040C;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0838;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -228,11 +192,8 @@ static inline u16 DISPC_SIZE_MGR(enum omap_channel channel)
                 return 0x0078;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03CC;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0834;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -243,14 +204,10 @@ static inline u16 DISPC_DATA_CYCLE1(enum omap_channel channel)
                 return 0x01D4;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C0;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0828;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -261,14 +218,10 @@ static inline u16 DISPC_DATA_CYCLE2(enum omap_channel channel)
                 return 0x01D8;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C4;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x082C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -279,14 +232,10 @@ static inline u16 DISPC_DATA_CYCLE3(enum omap_channel channel)
                 return 0x01DC;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C8;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0830;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -297,14 +246,10 @@ static inline u16 DISPC_CPR_COEF_R(enum omap_channel channel)
                 return 0x0220;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03BC;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0824;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -315,14 +260,10 @@ static inline u16 DISPC_CPR_COEF_G(enum omap_channel channel)
                 return 0x0224;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03B8;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x0820;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -333,14 +274,10 @@ static inline u16 DISPC_CPR_COEF_B(enum omap_channel channel)
                 return 0x0228;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
-                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03B4;
-        case OMAP_DSS_CHANNEL_LCD3:
-                return 0x081C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -354,13 +291,8 @@ static inline u16 DISPC_OVL_BASE(enum omap_plane plane)
                 return 0x00BC;
         case OMAP_DSS_VIDEO2:
                 return 0x014C;
-        case OMAP_DSS_VIDEO3:
-                return 0x0300;
-        case OMAP_DSS_WB:
-                return 0x0500;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -372,12 +304,8 @@ static inline u16 DISPC_BA0_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0000;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0008;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -388,12 +316,8 @@ static inline u16 DISPC_BA1_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0004;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x000C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -402,18 +326,12 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0544;
         case OMAP_DSS_VIDEO2:
                 return 0x04BC;
-        case OMAP_DSS_VIDEO3:
-                return 0x0310;
-        case OMAP_DSS_WB:
-                return 0x0118;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -422,18 +340,12 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0548;
         case OMAP_DSS_VIDEO2:
                 return 0x04C0;
-        case OMAP_DSS_VIDEO3:
-                return 0x0314;
-        case OMAP_DSS_WB:
-                return 0x011C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -444,11 +356,8 @@ static inline u16 DISPC_POS_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0008;
-        case OMAP_DSS_VIDEO3:
-                return 0x009C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -459,12 +368,8 @@ static inline u16 DISPC_SIZE_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x000C;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x00A8;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -476,12 +381,8 @@ static inline u16 DISPC_ATTR_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0010;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0070;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -490,18 +391,12 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0568;
         case OMAP_DSS_VIDEO2:
                 return 0x04DC;
-        case OMAP_DSS_VIDEO3:
-                return 0x032C;
-        case OMAP_DSS_WB:
-                return 0x0310;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -513,12 +408,8 @@ static inline u16 DISPC_FIFO_THRESH_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0014;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x008C;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -530,12 +421,8 @@ static inline u16 DISPC_FIFO_SIZE_STATUS_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0018;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0088;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -547,12 +434,8 @@ static inline u16 DISPC_ROW_INC_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x001C;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x00A4;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -564,12 +447,8 @@ static inline u16 DISPC_PIX_INC_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0020;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0098;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -580,12 +459,9 @@ static inline u16 DISPC_WINDOW_SKIP_OFFSET(enum omap_plane plane)
                 return 0x0034;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
-        case OMAP_DSS_VIDEO3:
                 BUG();
-                return 0;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -596,12 +472,9 @@ static inline u16 DISPC_TABLE_BA_OFFSET(enum omap_plane plane)
                 return 0x0038;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
-        case OMAP_DSS_VIDEO3:
                 BUG();
-                return 0;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -610,16 +483,11 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0024;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0090;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -628,18 +496,12 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0580;
         case OMAP_DSS_VIDEO2:
                 return 0x055C;
-        case OMAP_DSS_VIDEO3:
-                return 0x0424;
-        case OMAP_DSS_WB:
-                return 0x290;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -648,16 +510,11 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0028;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0094;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -667,16 +524,11 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x002C;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0000;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -685,18 +537,12 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0584;
         case OMAP_DSS_VIDEO2:
                 return 0x0560;
-        case OMAP_DSS_VIDEO3:
-                return 0x0428;
-        case OMAP_DSS_WB:
-                return 0x0294;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -705,16 +551,11 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0030;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0004;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -723,18 +564,12 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0588;
         case OMAP_DSS_VIDEO2:
                 return 0x0564;
-        case OMAP_DSS_VIDEO3:
-                return 0x042C;
-        case OMAP_DSS_WB:
-                return 0x0298;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -744,16 +579,11 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0034 + i * 0x8;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0010 + i * 0x8;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -763,18 +593,12 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x058C + i * 0x8;
         case OMAP_DSS_VIDEO2:
                 return 0x0568 + i * 0x8;
-        case OMAP_DSS_VIDEO3:
-                return 0x0430 + i * 0x8;
-        case OMAP_DSS_WB:
-                return 0x02A0 + i * 0x8;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -784,16 +608,11 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0038 + i * 0x8;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0014 + i * 0x8;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -803,18 +622,12 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0590 + i * 8;
         case OMAP_DSS_VIDEO2:
                 return 0x056C + i * 0x8;
-        case OMAP_DSS_VIDEO3:
-                return 0x0434 + i * 0x8;
-        case OMAP_DSS_WB:
-                return 0x02A4 + i * 0x8;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -824,15 +637,11 @@ static inline u16 DISPC_CONV_COEF_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
                 return 0x0074 + i * 0x4;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -842,17 +651,12 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0124 + i * 0x4;
         case OMAP_DSS_VIDEO2:
                 return 0x00B4 + i * 0x4;
-        case OMAP_DSS_VIDEO3:
-        case OMAP_DSS_WB:
-                return 0x0050 + i * 0x4;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -862,18 +666,12 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
-                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x05CC + i * 0x4;
         case OMAP_DSS_VIDEO2:
                 return 0x05A8 + i * 0x4;
-        case OMAP_DSS_VIDEO3:
-                return 0x0470 + i * 0x4;
-        case OMAP_DSS_WB:
-                return 0x02E0 + i * 0x4;
         default:
                 BUG();
-                return 0;
         }
 }
 
@@ -886,11 +684,8 @@ static inline u16 DISPC_PRELOAD_OFFSET(enum omap_plane plane)
                 return 0x0174;
         case OMAP_DSS_VIDEO2:
                 return 0x00E8;
-        case OMAP_DSS_VIDEO3:
-                return 0x00A0;
         default:
                 BUG();
-                return 0;
         }
 }
 #endif