Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: fbtft: Modify block comments based on kernel coding style

Add the required trailing * on subsequent lines as well as move the */
on a separate line. Checkpatch found this issue.

Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Eva Rachel Retuya and committed by
Greg Kroah-Hartman
3a334ea5 63986883

+83 -82
+35 -34
drivers/staging/fbtft/fb_ili9163.c
··· 39 39 #endif 40 40 41 41 /* ILI9163C commands */ 42 - #define CMD_FRMCTR1 0xB1 /* Frame Rate Control 43 - (In normal mode/Full colors) */ 42 + #define CMD_FRMCTR1 0xB1 /* Frame Rate Control */ 43 + /* (In normal mode/Full colors) */ 44 44 #define CMD_FRMCTR2 0xB2 /* Frame Rate Control (In Idle mode/8-colors) */ 45 - #define CMD_FRMCTR3 0xB3 /* Frame Rate Control 46 - (In Partial mode/full colors) */ 45 + #define CMD_FRMCTR3 0xB3 /* Frame Rate Control */ 46 + /* (In Partial mode/full colors) */ 47 47 #define CMD_DINVCTR 0xB4 /* Display Inversion Control */ 48 48 #define CMD_RGBBLK 0xB5 /* RGB Interface Blanking Porch setting */ 49 49 #define CMD_DFUNCTR 0xB6 /* Display Function set 5 */ ··· 63 63 #define CMD_GAMRSEL 0xF2 /* GAM_R_SEL */ 64 64 65 65 /* 66 - This display: 67 - http://www.ebay.com/itm/Replace-Nokia-5110-LCD-1-44-Red-Serial-128X128-SPI-Color-TFT-LCD-Display-Module-/271422122271 68 - This particular display has a design error! The controller has 3 pins to 69 - configure to constrain the memory and resolution to a fixed dimension (in 70 - that case 128x128) but they leaved those pins configured for 128x160 so 71 - there was several pixel memory addressing problems. 72 - I solved by setup several parameters that dinamically fix the resolution as 73 - needit so below the parameters for this display. If you have a strain or a 74 - correct display (can happen with chinese) you can copy those parameters and 75 - create setup for different displays. 76 - */ 66 + * This display: 67 + * http://www.ebay.com/itm/Replace-Nokia-5110-LCD-1-44-Red-Serial-128X128-SPI- 68 + * Color-TFT-LCD-Display-Module-/271422122271 69 + * This particular display has a design error! The controller has 3 pins to 70 + * configure to constrain the memory and resolution to a fixed dimension (in 71 + * that case 128x128) but they leaved those pins configured for 128x160 so 72 + * there was several pixel memory addressing problems. 73 + * I solved by setup several parameters that dinamically fix the resolution as 74 + * needit so below the parameters for this display. If you have a strain or a 75 + * correct display (can happen with chinese) you can copy those parameters and 76 + * create setup for different displays. 77 + */ 77 78 78 79 #ifdef RED 79 80 #define __OFFSET 32 /*see note 2 - this is the red version */ ··· 154 153 } 155 154 156 155 /* 157 - 7) MY: 1(bottom to top), 0(top to bottom) Row Address Order 158 - 6) MX: 1(R to L), 0(L to R) Column Address Order 159 - 5) MV: 1(Exchanged), 0(normal) Row/Column exchange 160 - 4) ML: 1(bottom to top), 0(top to bottom) Vertical Refresh Order 161 - 3) RGB: 1(BGR), 0(RGB) Color Space 162 - 2) MH: 1(R to L), 0(L to R) Horizontal Refresh Order 163 - 1) 164 - 0) 165 - 166 - MY, MX, MV, ML,RGB, MH, D1, D0 167 - 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 //normal 168 - 1 | 0 | 0 | 0 | 1 | 0 | 0 | 0 //Y-Mirror 169 - 0 | 1 | 0 | 0 | 1 | 0 | 0 | 0 //X-Mirror 170 - 1 | 1 | 0 | 0 | 1 | 0 | 0 | 0 //X-Y-Mirror 171 - 0 | 0 | 1 | 0 | 1 | 0 | 0 | 0 //X-Y Exchange 172 - 1 | 0 | 1 | 0 | 1 | 0 | 0 | 0 //X-Y Exchange, Y-Mirror 173 - 0 | 1 | 1 | 0 | 1 | 0 | 0 | 0 //XY exchange 174 - 1 | 1 | 1 | 0 | 1 | 0 | 0 | 0 175 - */ 156 + * 7) MY: 1(bottom to top), 0(top to bottom) Row Address Order 157 + * 6) MX: 1(R to L), 0(L to R) Column Address Order 158 + * 5) MV: 1(Exchanged), 0(normal) Row/Column exchange 159 + * 4) ML: 1(bottom to top), 0(top to bottom) Vertical Refresh Order 160 + * 3) RGB: 1(BGR), 0(RGB) Color Space 161 + * 2) MH: 1(R to L), 0(L to R) Horizontal Refresh Order 162 + * 1) 163 + * 0) 164 + * 165 + * MY, MX, MV, ML,RGB, MH, D1, D0 166 + * 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 //normal 167 + * 1 | 0 | 0 | 0 | 1 | 0 | 0 | 0 //Y-Mirror 168 + * 0 | 1 | 0 | 0 | 1 | 0 | 0 | 0 //X-Mirror 169 + * 1 | 1 | 0 | 0 | 1 | 0 | 0 | 0 //X-Y-Mirror 170 + * 0 | 0 | 1 | 0 | 1 | 0 | 0 | 0 //X-Y Exchange 171 + * 1 | 0 | 1 | 0 | 1 | 0 | 0 | 0 //X-Y Exchange, Y-Mirror 172 + * 0 | 1 | 1 | 0 | 1 | 0 | 0 | 0 //XY exchange 173 + * 1 | 1 | 1 | 0 | 1 | 0 | 0 | 0 174 + */ 176 175 static int set_var(struct fbtft_par *par) 177 176 { 178 177 u8 mactrl_data = 0; /* Avoid compiler warning */
+4 -4
drivers/staging/fbtft/fb_ili9320.c
··· 216 216 } 217 217 218 218 /* 219 - Gamma string format: 220 - VRP0 VRP1 RP0 RP1 KP0 KP1 KP2 KP3 KP4 KP5 221 - VRN0 VRN1 RN0 RN1 KN0 KN1 KN2 KN3 KN4 KN5 222 - */ 219 + * Gamma string format: 220 + * VRP0 VRP1 RP0 RP1 KP0 KP1 KP2 KP3 KP4 KP5 221 + * VRN0 VRN1 RN0 RN1 KN0 KN1 KN2 KN3 KN4 KN5 222 + */ 223 223 #define CURVE(num, idx) curves[num * par->gamma.num_values + idx] 224 224 static int set_gamma(struct fbtft_par *par, unsigned long *curves) 225 225 {
+40 -40
drivers/staging/fbtft/fb_ili9325.c
··· 56 56 MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage"); 57 57 58 58 /* 59 - Verify that this configuration is within the Voltage limits 60 - 61 - Display module configuration: Vcc = IOVcc = Vci = 3.3V 62 - 63 - Voltages 64 - ---------- 65 - Vci = 3.3 66 - Vci1 = Vci * 0.80 = 2.64 67 - DDVDH = Vci1 * 2 = 5.28 68 - VCL = -Vci1 = -2.64 69 - VREG1OUT = Vci * 1.85 = 4.88 70 - VCOMH = VREG1OUT * 0.735 = 3.59 71 - VCOM amplitude = VREG1OUT * 0.98 = 4.79 72 - VGH = Vci * 4 = 13.2 73 - VGL = -Vci * 4 = -13.2 74 - 75 - Limits 76 - -------- 77 - Power supplies 78 - 1.65 < IOVcc < 3.30 => 1.65 < 3.3 < 3.30 79 - 2.40 < Vcc < 3.30 => 2.40 < 3.3 < 3.30 80 - 2.50 < Vci < 3.30 => 2.50 < 3.3 < 3.30 81 - 82 - Source/VCOM power supply voltage 83 - 4.50 < DDVDH < 6.0 => 4.50 < 5.28 < 6.0 84 - -3.0 < VCL < -2.0 => -3.0 < -2.64 < -2.0 85 - VCI - VCL < 6.0 => 5.94 < 6.0 86 - 87 - Gate driver output voltage 88 - 10 < VGH < 20 => 10 < 13.2 < 20 89 - -15 < VGL < -5 => -15 < -13.2 < -5 90 - VGH - VGL < 32 => 26.4 < 32 91 - 92 - VCOM driver output voltage 93 - VCOMH - VCOML < 6.0 => 4.79 < 6.0 94 - */ 59 + * Verify that this configuration is within the Voltage limits 60 + * 61 + * Display module configuration: Vcc = IOVcc = Vci = 3.3V 62 + * 63 + * Voltages 64 + * ---------- 65 + * Vci = 3.3 66 + * Vci1 = Vci * 0.80 = 2.64 67 + * DDVDH = Vci1 * 2 = 5.28 68 + * VCL = -Vci1 = -2.64 69 + * VREG1OUT = Vci * 1.85 = 4.88 70 + * VCOMH = VREG1OUT * 0.735 = 3.59 71 + * VCOM amplitude = VREG1OUT * 0.98 = 4.79 72 + * VGH = Vci * 4 = 13.2 73 + * VGL = -Vci * 4 = -13.2 74 + * 75 + * Limits 76 + * -------- 77 + * Power supplies 78 + * 1.65 < IOVcc < 3.30 => 1.65 < 3.3 < 3.30 79 + * 2.40 < Vcc < 3.30 => 2.40 < 3.3 < 3.30 80 + * 2.50 < Vci < 3.30 => 2.50 < 3.3 < 3.30 81 + * 82 + * Source/VCOM power supply voltage 83 + * 4.50 < DDVDH < 6.0 => 4.50 < 5.28 < 6.0 84 + * -3.0 < VCL < -2.0 => -3.0 < -2.64 < -2.0 85 + * VCI - VCL < 6.0 => 5.94 < 6.0 86 + * 87 + * Gate driver output voltage 88 + * 10 < VGH < 20 => 10 < 13.2 < 20 89 + * -15 < VGL < -5 => -15 < -13.2 < -5 90 + * VGH - VGL < 32 => 26.4 < 32 91 + * 92 + * VCOM driver output voltage 93 + * VCOMH - VCOML < 6.0 => 4.79 < 6.0 94 + */ 95 95 96 96 static int init_display(struct fbtft_par *par) 97 97 { ··· 213 213 } 214 214 215 215 /* 216 - Gamma string format: 217 - VRP0 VRP1 RP0 RP1 KP0 KP1 KP2 KP3 KP4 KP5 218 - VRN0 VRN1 RN0 RN1 KN0 KN1 KN2 KN3 KN4 KN5 219 - */ 216 + * Gamma string format: 217 + * VRP0 VRP1 RP0 RP1 KP0 KP1 KP2 KP3 KP4 KP5 218 + * VRN0 VRN1 RN0 RN1 KN0 KN1 KN2 KN3 KN4 KN5 219 + */ 220 220 #define CURVE(num, idx) curves[num * par->gamma.num_values + idx] 221 221 static int set_gamma(struct fbtft_par *par, unsigned long *curves) 222 222 {
+4 -4
drivers/staging/fbtft/fb_ili9341.c
··· 116 116 } 117 117 118 118 /* 119 - Gamma string format: 120 - Positive: Par1 Par2 [...] Par15 121 - Negative: Par1 Par2 [...] Par15 122 - */ 119 + * Gamma string format: 120 + * Positive: Par1 Par2 [...] Par15 121 + * Negative: Par1 Par2 [...] Par15 122 + */ 123 123 #define CURVE(num, idx) curves[num * par->gamma.num_values + idx] 124 124 static int set_gamma(struct fbtft_par *par, unsigned long *curves) 125 125 {