Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

[deliverable/linux.git] / drivers / staging / fbtft / fb_ili9163.c

diff --git a/drivers/staging/fbtft/fb_ili9163.c b/drivers/staging/fbtft/fb_ili9163.c
index cbcfbb531612bba9b6644b8dfce0eda212e4c59e..6b8f8b17e9a3acac520bbc56150ae562a8ff212e 100644 (file)
--- a/drivers/staging/fbtft/fb_ili9163.c
+++ b/drivers/staging/fbtft/fb_ili9163.c
@@ -39,11 +39,11 @@
 #endif
 
 /* ILI9163C commands */
-#define CMD_FRMCTR1    0xB1 /* Frame Rate Control
-                               (In normal mode/Full colors) */
+#define CMD_FRMCTR1    0xB1 /* Frame Rate Control */
+                            /* (In normal mode/Full colors) */
 #define CMD_FRMCTR2    0xB2 /* Frame Rate Control (In Idle mode/8-colors) */
-#define CMD_FRMCTR3    0xB3 /* Frame Rate Control
-                               (In Partial mode/full colors) */
+#define CMD_FRMCTR3    0xB3 /* Frame Rate Control */
+                            /* (In Partial mode/full colors) */
 #define CMD_DINVCTR    0xB4 /* Display Inversion Control */
 #define CMD_RGBBLK     0xB5 /* RGB Interface Blanking Porch setting */
 #define CMD_DFUNCTR    0xB6 /* Display Function set 5 */
@@ -63,17 +63,18 @@
 #define CMD_GAMRSEL    0xF2 /* GAM_R_SEL */
 
 /*
-This display:
-http://www.ebay.com/itm/Replace-Nokia-5110-LCD-1-44-Red-Serial-128X128-SPI-Color-TFT-LCD-Display-Module-/271422122271
-This particular display has a design error! The controller has 3 pins to
-configure to constrain the memory and resolution to a fixed dimension (in
-that case 128x128) but they leaved those pins configured for 128x160 so
-there was several pixel memory addressing problems.
-I solved by setup several parameters that dinamically fix the resolution as
-needit so below the parameters for this display. If you have a strain or a
-correct display (can happen with chinese) you can copy those parameters and
-create setup for different displays.
-*/
+ * This display:
+ * http://www.ebay.com/itm/Replace-Nokia-5110-LCD-1-44-Red-Serial-128X128-SPI-
+ * Color-TFT-LCD-Display-Module-/271422122271
+ * This particular display has a design error! The controller has 3 pins to
+ * configure to constrain the memory and resolution to a fixed dimension (in
+ * that case 128x128) but they leaved those pins configured for 128x160 so
+ * there was several pixel memory addressing problems.
+ * I solved by setup several parameters that dinamically fix the resolution as
+ * needit so below the parameters for this display. If you have a strain or a
+ * correct display (can happen with chinese) you can copy those parameters and
+ * create setup for different displays.
+ */
 
 #ifdef RED
 #define __OFFSET               32 /*see note 2 - this is the red version */
@@ -121,7 +122,7 @@ static int init_display(struct fbtft_par *par)
 }
 
 static void set_addr_win(struct fbtft_par *par, int xs, int ys,
-                               int xe, int ye)
+                        int xe, int ye)
 {
        switch (par->info->var.rotate) {
        case 0:
@@ -153,25 +154,25 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys,
 }
 
 /*
-7) MY:  1(bottom to top),      0(top to bottom)    Row Address Order
-6) MX:  1(R to L),             0(L to R)           Column Address Order
-5) MV:  1(Exchanged),          0(normal)           Row/Column exchange
-4) ML:  1(bottom to top),      0(top to bottom)    Vertical Refresh Order
-3) RGB: 1(BGR),                        0(RGB)              Color Space
-2) MH:  1(R to L),             0(L to R)           Horizontal Refresh Order
-1)
-0)
-
-       MY, MX, MV, ML,RGB, MH, D1, D0
-       0 | 0 | 0 | 0 | 1 | 0 | 0 | 0   //normal
-       1 | 0 | 0 | 0 | 1 | 0 | 0 | 0   //Y-Mirror
-       0 | 1 | 0 | 0 | 1 | 0 | 0 | 0   //X-Mirror
-       1 | 1 | 0 | 0 | 1 | 0 | 0 | 0   //X-Y-Mirror
-       0 | 0 | 1 | 0 | 1 | 0 | 0 | 0   //X-Y Exchange
-       1 | 0 | 1 | 0 | 1 | 0 | 0 | 0   //X-Y Exchange, Y-Mirror
-       0 | 1 | 1 | 0 | 1 | 0 | 0 | 0   //XY exchange
-       1 | 1 | 1 | 0 | 1 | 0 | 0 | 0
-*/
+ * 7) MY:  1(bottom to top),   0(top to bottom)    Row Address Order
+ * 6) MX:  1(R to L),          0(L to R)           Column Address Order
+ * 5) MV:  1(Exchanged),       0(normal)           Row/Column exchange
+ * 4) ML:  1(bottom to top),   0(top to bottom)    Vertical Refresh Order
+ * 3) RGB: 1(BGR),             0(RGB)              Color Space
+ * 2) MH:  1(R to L),          0(L to R)           Horizontal Refresh Order
+ * 1)
+ * 0)
+ *
+ *     MY, MX, MV, ML,RGB, MH, D1, D0
+ *     0 | 0 | 0 | 0 | 1 | 0 | 0 | 0   //normal
+ *     1 | 0 | 0 | 0 | 1 | 0 | 0 | 0   //Y-Mirror
+ *     0 | 1 | 0 | 0 | 1 | 0 | 0 | 0   //X-Mirror
+ *     1 | 1 | 0 | 0 | 1 | 0 | 0 | 0   //X-Y-Mirror
+ *     0 | 0 | 1 | 0 | 1 | 0 | 0 | 0   //X-Y Exchange
+ *     1 | 0 | 1 | 0 | 1 | 0 | 0 | 0   //X-Y Exchange, Y-Mirror
+ *     0 | 1 | 1 | 0 | 1 | 0 | 0 | 0   //XY exchange
+ *     1 | 1 | 1 | 0 | 1 | 0 | 0 | 0
+ */
 static int set_var(struct fbtft_par *par)
 {
        u8 mactrl_data = 0; /* Avoid compiler warning */
@@ -214,28 +215,28 @@ static int gamma_adj(struct fbtft_par *par, unsigned long *curves)
                        CURVE(i, j) &= mask[i * par->gamma.num_values + j];
 
        write_reg(par, CMD_PGAMMAC,
-                               CURVE(0, 0),
-                               CURVE(0, 1),
-                               CURVE(0, 2),
-                               CURVE(0, 3),
-                               CURVE(0, 4),
-                               CURVE(0, 5),
-                               CURVE(0, 6),
-                               (CURVE(0, 7) << 4) | CURVE(0, 8),
-                               CURVE(0, 9),
-                               CURVE(0, 10),
-                               CURVE(0, 11),
-                               CURVE(0, 12),
-                               CURVE(0, 13),
-                               CURVE(0, 14),
-                               CURVE(0, 15)
-                               );
+                 CURVE(0, 0),
+                 CURVE(0, 1),
+                 CURVE(0, 2),
+                 CURVE(0, 3),
+                 CURVE(0, 4),
+                 CURVE(0, 5),
+                 CURVE(0, 6),
+                 (CURVE(0, 7) << 4) | CURVE(0, 8),
+                 CURVE(0, 9),
+                 CURVE(0, 10),
+                 CURVE(0, 11),
+                 CURVE(0, 12),
+                 CURVE(0, 13),
+                 CURVE(0, 14),
+                 CURVE(0, 15));
 
        /* Write Data to GRAM mode */
        write_reg(par, MIPI_DCS_WRITE_MEMORY_START);
 
        return 0;
 }
+
 #undef CURVE
 #endif