Merge remote-tracking branch 'staging/staging-next'

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

diff --git a/drivers/staging/fbtft/fb_tls8204.c b/drivers/staging/fbtft/fb_tls8204.c
index 2183f98c831514c9eef828c3ef8bbceabb47fd7a..ea2ddacb9468ee2f12d17a03b51690e9dd248628 100644 (file)
--- a/drivers/staging/fbtft/fb_tls8204.c
+++ b/drivers/staging/fbtft/fb_tls8204.c
@@ -35,7 +35,7 @@
 /* gamma is used to control contrast in this driver */
 #define DEFAULT_GAMMA  "40"
 
-static unsigned bs = 4;
+static unsigned int bs = 4;
 module_param(bs, uint, 0);
 MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)");
 
@@ -44,21 +44,21 @@ static int init_display(struct fbtft_par *par)
        par->fbtftops.reset(par);
 
        /* Enter extended command mode */
-       write_reg(par, 0x21); /* 5:1  1
-                                2:0  PD - Powerdown control: chip is active
-                                1:0  V  - Entry mode: horizontal addressing
-                                0:1  H  - Extended instruction set control:
-                                               extended
-                             */
+       write_reg(par, 0x21);   /* 5:1  1
+                                * 2:0  PD - Powerdown control: chip is active
+                                * 1:0  V  - Entry mode: horizontal addressing
+                                * 0:1  H  - Extended instruction set control:
+                                *           extended
+                                */
 
        /* H=1 Bias system */
-       write_reg(par, 0x10 | (bs & 0x7)); /*
-                                4:1  1
-                                3:0  0
-                                2:x  BS2 - Bias System
-                                1:x  BS1
-                                0:x  BS0
-                             */
+       write_reg(par, 0x10 | (bs & 0x7));
+                               /* 4:1  1
+                                * 3:0  0
+                                * 2:x  BS2 - Bias System
+                                * 1:x  BS1
+                                * 0:x  BS0
+                                */
 
        /* Set the address of the first display line. */
        write_reg(par, 0x04 | (64 >> 6));
@@ -68,12 +68,12 @@ static int init_display(struct fbtft_par *par)
        write_reg(par, 0x20);
 
        /* H=0 Display control */
-       write_reg(par, 0x08 | 4); /*
-                                3:1  1
-                                2:1  D  - DE: 10=normal mode
-                                1:0  0
-                                0:0  E
-                             */
+       write_reg(par, 0x08 | 4);
+                               /* 3:1  1
+                                * 2:1  D - DE: 10=normal mode
+                                * 1:0  0
+                                * 0:0  E
+                                */
 
        return 0;
 }
@@ -81,15 +81,15 @@ 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)
 {
        /* H=0 Set X address of RAM */
-       write_reg(par, 0x80); /* 7:1  1
-                                6-0: X[6:0] - 0x00
-                             */
+       write_reg(par, 0x80);   /* 7:1  1
+                                * 6-0: X[6:0] - 0x00
+                                */
 
        /* H=0 Set Y address of RAM */
-       write_reg(par, 0x40); /* 7:0  0
-                                6:1  1
-                                2-0: Y[2:0] - 0x0
-                             */
+       write_reg(par, 0x40);   /* 7:0  0
+                                * 6:1  1
+                                * 2-0: Y[2:0] - 0x0
+                                */
 }
 
 static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
@@ -100,8 +100,9 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 
        for (y = 0; y < HEIGHT / 8; y++) {
                u8 *buf = par->txbuf.buf;
-               /* The display is 102x68 but the LCD is 84x48.  Set
-                  the write pointer at the start of each row. */
+               /* The display is 102x68 but the LCD is 84x48.
+                * Set the write pointer at the start of each row.
+                */
                gpio_set_value(par->gpio.dc, 0);
                write_reg(par, 0x80 | 0);
                write_reg(par, 0x40 | y);