Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[mv-sheeva.git] / drivers / video / omap2 / dss / dispc.h

diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h
index 6c9ee0a0efb3208bdd5a3f1b52bc07704eb21974..c06efc38983e6ee74d8562fcfb9debaef545c843 100644 (file)
--- a/drivers/video/omap2/dss/dispc.h
+++ b/drivers/video/omap2/dss/dispc.h
@@ -291,6 +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;
        default:
                BUG();
        }
@@ -304,6 +306,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:
+               return 0x0008;
        default:
                BUG();
        }
@@ -316,6 +320,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:
+               return 0x000C;
        default:
                BUG();
        }
@@ -330,6 +336,8 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane)
                return 0x0544;
        case OMAP_DSS_VIDEO2:
                return 0x04BC;
+       case OMAP_DSS_VIDEO3:
+               return 0x0310;
        default:
                BUG();
        }
@@ -344,6 +352,8 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane)
                return 0x0548;
        case OMAP_DSS_VIDEO2:
                return 0x04C0;
+       case OMAP_DSS_VIDEO3:
+               return 0x0314;
        default:
                BUG();
        }
@@ -356,6 +366,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();
        }
@@ -368,6 +380,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:
+               return 0x00A8;
        default:
                BUG();
        }
@@ -381,6 +395,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:
+               return 0x0070;
        default:
                BUG();
        }
@@ -395,6 +411,8 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane)
                return 0x0568;
        case OMAP_DSS_VIDEO2:
                return 0x04DC;
+       case OMAP_DSS_VIDEO3:
+               return 0x032C;
        default:
                BUG();
        }
@@ -408,6 +426,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:
+               return 0x008C;
        default:
                BUG();
        }
@@ -421,6 +441,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:
+               return 0x0088;
        default:
                BUG();
        }
@@ -434,6 +456,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:
+               return 0x00A4;
        default:
                BUG();
        }
@@ -447,6 +471,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:
+               return 0x0098;
        default:
                BUG();
        }
@@ -459,6 +485,7 @@ 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();
        default:
                BUG();
@@ -472,6 +499,7 @@ 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();
        default:
                BUG();
@@ -486,6 +514,8 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x0024;
+       case OMAP_DSS_VIDEO3:
+               return 0x0090;
        default:
                BUG();
        }
@@ -500,6 +530,8 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane)
                return 0x0580;
        case OMAP_DSS_VIDEO2:
                return 0x055C;
+       case OMAP_DSS_VIDEO3:
+               return 0x0424;
        default:
                BUG();
        }
@@ -513,6 +545,8 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x0028;
+       case OMAP_DSS_VIDEO3:
+               return 0x0094;
        default:
                BUG();
        }
@@ -527,6 +561,8 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x002C;
+       case OMAP_DSS_VIDEO3:
+               return 0x0000;
        default:
                BUG();
        }
@@ -541,6 +577,8 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane)
                return 0x0584;
        case OMAP_DSS_VIDEO2:
                return 0x0560;
+       case OMAP_DSS_VIDEO3:
+               return 0x0428;
        default:
                BUG();
        }
@@ -554,6 +592,8 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x0030;
+       case OMAP_DSS_VIDEO3:
+               return 0x0004;
        default:
                BUG();
        }
@@ -568,6 +608,8 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane)
                return 0x0588;
        case OMAP_DSS_VIDEO2:
                return 0x0564;
+       case OMAP_DSS_VIDEO3:
+               return 0x042C;
        default:
                BUG();
        }
@@ -582,6 +624,8 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x0034 + i * 0x8;
+       case OMAP_DSS_VIDEO3:
+               return 0x0010 + i * 0x8;
        default:
                BUG();
        }
@@ -597,6 +641,8 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i)
                return 0x058C + i * 0x8;
        case OMAP_DSS_VIDEO2:
                return 0x0568 + i * 0x8;
+       case OMAP_DSS_VIDEO3:
+               return 0x0430 + i * 0x8;
        default:
                BUG();
        }
@@ -611,6 +657,8 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i)
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
                return 0x0038 + i * 0x8;
+       case OMAP_DSS_VIDEO3:
+               return 0x0014 + i * 0x8;
        default:
                BUG();
        }
@@ -626,6 +674,8 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i)
                return 0x0590 + i * 8;
        case OMAP_DSS_VIDEO2:
                return 0x056C + i * 0x8;
+       case OMAP_DSS_VIDEO3:
+               return 0x0434 + i * 0x8;
        default:
                BUG();
        }
@@ -639,6 +689,7 @@ static inline u16 DISPC_CONV_COEF_OFFSET(enum omap_plane plane, u16 i)
                BUG();
        case OMAP_DSS_VIDEO1:
        case OMAP_DSS_VIDEO2:
+       case OMAP_DSS_VIDEO3:
                return 0x0074 + i * 0x4;
        default:
                BUG();
@@ -655,6 +706,8 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i)
                return 0x0124 + i * 0x4;
        case OMAP_DSS_VIDEO2:
                return 0x00B4 + i * 0x4;
+       case OMAP_DSS_VIDEO3:
+               return 0x0050 + i * 0x4;
        default:
                BUG();
        }
@@ -670,6 +723,8 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i)
                return 0x05CC + i * 0x4;
        case OMAP_DSS_VIDEO2:
                return 0x05A8 + i * 0x4;
+       case OMAP_DSS_VIDEO3:
+               return 0x0470 + i * 0x4;
        default:
                BUG();
        }
@@ -684,6 +739,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();
        }