1 files changed, 20 insertions, 72 deletions

diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h
index daa9952d2174..11c16a1fb9e3 100644
--- a/include/linux/fsl-diu-fb.h
+++ b/include/linux/fsl-diu-fb.h
@@ -20,18 +20,8 @@
 #ifndef __FSL_DIU_FB_H__
 #define __FSL_DIU_FB_H__
 
-/* Arbitrary threshold to determine the allocation method
- * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
- */
-#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
-
 #include <linux/types.h>
 
-struct mfb_alpha {
-        int enable;
-        int alpha;
-};
-
 struct mfb_chroma_key {
         int enable;
         __u8  red_max;
@@ -43,25 +33,29 @@ struct mfb_chroma_key {
 };
 
 struct aoi_display_offset {
-        int x_aoi_d;
-        int y_aoi_d;
+        __s32 x_aoi_d;
+        __s32 y_aoi_d;
 };
 
 #define MFB_SET_CHROMA_KEY      _IOW('M', 1, struct mfb_chroma_key)
 #define MFB_SET_BRIGHTNESS      _IOW('M', 3, __u8)
+#define MFB_SET_ALPHA           _IOW('M', 0, __u8)
+#define MFB_GET_ALPHA           _IOR('M', 0, __u8)
+#define MFB_SET_AOID            _IOW('M', 4, struct aoi_display_offset)
+#define MFB_GET_AOID            _IOR('M', 4, struct aoi_display_offset)
+#define MFB_SET_PIXFMT          _IOW('M', 8, __u32)
+#define MFB_GET_PIXFMT          _IOR('M', 8, __u32)
 
-#define MFB_SET_ALPHA           0x80014d00
-#define MFB_GET_ALPHA           0x40014d00
-#define MFB_SET_AOID            0x80084d04
-#define MFB_GET_AOID            0x40084d04
-#define MFB_SET_PIXFMT          0x80014d08
-#define MFB_GET_PIXFMT          0x40014d08
-
-#define FBIOGET_GWINFO          0x46E0
-#define FBIOPUT_GWINFO          0x46E1
+/*
+ * The original definitions of MFB_SET_PIXFMT and MFB_GET_PIXFMT used the
+ * wrong value for 'size' field of the ioctl.  The current macros above use the
+ * right size, but we still need to provide backwards compatibility, at least
+ * for a while.
+*/
+#define MFB_SET_PIXFMT_OLD      0x80014d08
+#define MFB_GET_PIXFMT_OLD      0x40014d08
 
 #ifdef __KERNEL__
-#include <linux/spinlock.h>
 
 /*
  * These are the fields of area descriptor(in DDR memory) for every plane
@@ -159,58 +153,12 @@ struct diu {
         __be32 plut;
 } __attribute__ ((packed));
 
-struct diu_hw {
-        struct diu *diu_reg;
-        spinlock_t reg_lock;
-
-        __u32 mode;             /* DIU operation mode */
-};
-
-struct diu_addr {
-        __u8 __iomem *vaddr;    /* Virtual address */
-        dma_addr_t paddr;       /* Physical address */
-        __u32      offset;
-};
-
-struct diu_pool {
-        struct diu_addr ad;
-        struct diu_addr gamma;
-        struct diu_addr pallete;
-        struct diu_addr cursor;
-};
-
-#define FSL_DIU_BASE_OFFSET     0x2C000 /* Offset of DIU */
-#define INT_LCDC                64      /* DIU interrupt number */
-
-#define FSL_AOI_NUM     6       /* 5 AOIs and one dummy AOI */
-                                /* 1 for plane 0, 2 for plane 1&2 each */
-
-/* Minimum X and Y resolutions */
-#define MIN_XRES        64
-#define MIN_YRES        64
-
-/* HW cursor parameters */
-#define MAX_CURS                32
-
-/* Modes of operation of DIU */
+/*
+ * Modes of operation of DIU.  The DIU supports five different modes, but
+ * the driver only supports modes 0 and 1.
+ */
 #define MFB_MODE0       0       /* DIU off */
 #define MFB_MODE1       1       /* All three planes output to display */
-#define MFB_MODE2       2       /* Plane 1 to display, planes 2+3 written back*/
-#define MFB_MODE3       3       /* All three planes written back to memory */
-#define MFB_MODE4       4       /* Color bar generation */
-
-/* INT_STATUS/INT_MASK field descriptions */
-#define INT_VSYNC       0x01    /* Vsync interrupt  */
-#define INT_VSYNC_WB    0x02    /* Vsync interrupt for write back operation */
-#define INT_UNDRUN      0x04    /* Under run exception interrupt */
-#define INT_PARERR      0x08    /* Display parameters error interrupt */
-#define INT_LS_BF_VS    0x10    /* Lines before vsync. interrupt */
-
-/* Panels'operation modes */
-#define MFB_TYPE_OUTPUT 0       /* Panel output to display */
-#define MFB_TYPE_OFF    1       /* Panel off */
-#define MFB_TYPE_WB     2       /* Panel written back to memory */
-#define MFB_TYPE_TEST   3       /* Panel generate color bar */
 
 #endif /* __KERNEL__ */
 #endif /* __FSL_DIU_FB_H__ */