Commit e0246ea3 authored by Eva Rachel Retuya's avatar Eva Rachel Retuya Committed by Greg Kroah-Hartman

staging: fbtft: Fix block comments according to 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: default avatarEva Rachel Retuya <eraretuya@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60112069
...@@ -46,55 +46,69 @@ static int init_display(struct fbtft_par *par) ...@@ -46,55 +46,69 @@ static int init_display(struct fbtft_par *par)
/* BTL221722-276L startup sequence, from datasheet */ /* BTL221722-276L startup sequence, from datasheet */
/* SETEXTCOM: Set extended command set (C1h) /*
This command is used to set extended command set access enable. * SETEXTCOM: Set extended command set (C1h)
Enable: After command (C1h), must write: ffh,83h,40h */ * This command is used to set extended command set access enable.
* Enable: After command (C1h), must write: ffh,83h,40h
*/
write_reg(par, 0xC1, 0xFF, 0x83, 0x40); write_reg(par, 0xC1, 0xFF, 0x83, 0x40);
/* Sleep out /*
This command turns off sleep mode. * Sleep out
In this mode the DC/DC converter is enabled, Internal oscillator * This command turns off sleep mode.
is started, and panel scanning is started. */ * In this mode the DC/DC converter is enabled, Internal oscillator
* is started, and panel scanning is started.
*/
write_reg(par, 0x11); write_reg(par, 0x11);
mdelay(150); mdelay(150);
/* Undoc'd register? */ /* Undoc'd register? */
write_reg(par, 0xCA, 0x70, 0x00, 0xD9); write_reg(par, 0xCA, 0x70, 0x00, 0xD9);
/* SETOSC: Set Internal Oscillator (B0h) /*
This command is used to set internal oscillator related settings */ * SETOSC: Set Internal Oscillator (B0h)
/* OSC_EN: Enable internal oscillator */ * This command is used to set internal oscillator related settings
/* Internal oscillator frequency: 125% x 2.52MHz */ * OSC_EN: Enable internal oscillator
* Internal oscillator frequency: 125% x 2.52MHz
*/
write_reg(par, 0xB0, 0x01, 0x11); write_reg(par, 0xB0, 0x01, 0x11);
/* Drive ability setting */ /* Drive ability setting */
write_reg(par, 0xC9, 0x90, 0x49, 0x10, 0x28, 0x28, 0x10, 0x00, 0x06); write_reg(par, 0xC9, 0x90, 0x49, 0x10, 0x28, 0x28, 0x10, 0x00, 0x06);
mdelay(20); mdelay(20);
/* SETPWCTR5: Set Power Control 5(B5h) /*
This command is used to set VCOM Low and VCOM High Voltage */ * SETPWCTR5: Set Power Control 5(B5h)
/* VCOMH 0110101 : 3.925 */ * This command is used to set VCOM Low and VCOM High Voltage
/* VCOML 0100000 : -1.700 */ * VCOMH 0110101 : 3.925
/* 45h=69 VCOMH: "VMH" + 5d VCOML: "VMH" + 5d */ * VCOML 0100000 : -1.700
* 45h=69 VCOMH: "VMH" + 5d VCOML: "VMH" + 5d
*/
write_reg(par, 0xB5, 0x35, 0x20, 0x45); write_reg(par, 0xB5, 0x35, 0x20, 0x45);
/* SETPWCTR4: Set Power Control 4(B4h) /*
VRH[4:0]: Specify the VREG1 voltage adjusting. * SETPWCTR4: Set Power Control 4(B4h)
VREG1 voltage is for gamma voltage setting. * VRH[4:0]: Specify the VREG1 voltage adjusting.
BT[2:0]: Switch the output factor of step-up circuit 2 * VREG1 voltage is for gamma voltage setting.
for VGH and VGL voltage generation. */ * BT[2:0]: Switch the output factor of step-up circuit 2
* for VGH and VGL voltage generation.
*/
write_reg(par, 0xB4, 0x33, 0x25, 0x4C); write_reg(par, 0xB4, 0x33, 0x25, 0x4C);
mdelay(10); mdelay(10);
/* Interface Pixel Format (3Ah) /*
This command is used to define the format of RGB picture data, * Interface Pixel Format (3Ah)
which is to be transfer via the system and RGB interface. */ * This command is used to define the format of RGB picture data,
/* RGB interface: 16 Bit/Pixel */ * which is to be transfer via the system and RGB interface.
* RGB interface: 16 Bit/Pixel
*/
write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT); write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
/* Display on (29h) /*
This command is used to recover from DISPLAY OFF mode. * Display on (29h)
Output from the Frame Memory is enabled. */ * This command is used to recover from DISPLAY OFF mode.
* Output from the Frame Memory is enabled.
*/
write_reg(par, MIPI_DCS_SET_DISPLAY_ON); write_reg(par, MIPI_DCS_SET_DISPLAY_ON);
mdelay(10); mdelay(10);
...@@ -137,12 +151,12 @@ static int set_var(struct fbtft_par *par) ...@@ -137,12 +151,12 @@ static int set_var(struct fbtft_par *par)
} }
/* /*
Gamma Curve selection, GC (only GC0 can be customized): * Gamma Curve selection, GC (only GC0 can be customized):
0 = 2.2, 1 = 1.8, 2 = 2.5, 3 = 1.0 * 0 = 2.2, 1 = 1.8, 2 = 2.5, 3 = 1.0
Gamma string format: * Gamma string format:
OP0 OP1 CP0 CP1 CP2 CP3 CP4 MP0 MP1 MP2 MP3 MP4 MP5 CGM0 CGM1 * OP0 OP1 CP0 CP1 CP2 CP3 CP4 MP0 MP1 MP2 MP3 MP4 MP5 CGM0 CGM1
ON0 ON1 CN0 CN1 CN2 CN3 CN4 MN0 MN1 MN2 MN3 MN4 MN5 XXXX GC * ON0 ON1 CN0 CN1 CN2 CN3 CN4 MN0 MN1 MN2 MN3 MN4 MN5 XXXX GC
*/ */
#define CURVE(num, idx) curves[num * par->gamma.num_values + idx] #define CURVE(num, idx) curves[num * par->gamma.num_values + idx]
static int set_gamma(struct fbtft_par *par, unsigned long *curves) static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{ {
......
...@@ -97,10 +97,10 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) ...@@ -97,10 +97,10 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
} }
/* /*
Gamma string format: * Gamma string format:
VRP0 VRP1 VRP2 VRP3 VRP4 VRP5 PRP0 PRP1 PKP0 PKP1 PKP2 PKP3 PKP4 CGM * VRP0 VRP1 VRP2 VRP3 VRP4 VRP5 PRP0 PRP1 PKP0 PKP1 PKP2 PKP3 PKP4 CGM
VRN0 VRN1 VRN2 VRN3 VRN4 VRN5 PRN0 PRN1 PKN0 PKN1 PKN2 PKN3 PKN4 CGM * VRN0 VRN1 VRN2 VRN3 VRN4 VRN5 PRN0 PRN1 PKN0 PKN1 PKN2 PKN3 PKN4 CGM
*/ */
#define CURVE(num, idx) curves[num * par->gamma.num_values + idx] #define CURVE(num, idx) curves[num * par->gamma.num_values + idx]
static int set_gamma(struct fbtft_par *par, unsigned long *curves) static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{ {
......
...@@ -88,12 +88,14 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) ...@@ -88,12 +88,14 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
#define mv BIT(5) #define mv BIT(5)
static int set_var(struct fbtft_par *par) static int set_var(struct fbtft_par *par)
{ {
/* madctl - memory data access control /*
rgb/bgr: * madctl - memory data access control
1. mode selection pin srgb * rgb/bgr:
rgb h/w pin for color filter setting: 0=rgb, 1=bgr * 1. mode selection pin srgb
2. madctl rgb bit * rgb h/w pin for color filter setting: 0=rgb, 1=bgr
rgb-bgr order color filter panel: 0=rgb, 1=bgr */ * 2. madctl rgb bit
* rgb-bgr order color filter panel: 0=rgb, 1=bgr
*/
switch (par->info->var.rotate) { switch (par->info->var.rotate) {
case 0: case 0:
write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, write_reg(par, MIPI_DCS_SET_ADDRESS_MODE,
...@@ -116,9 +118,7 @@ static int set_var(struct fbtft_par *par) ...@@ -116,9 +118,7 @@ static int set_var(struct fbtft_par *par)
return 0; return 0;
} }
/* /* gamma string format: */
gamma string format:
*/
static int set_gamma(struct fbtft_par *par, unsigned long *curves) static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{ {
write_reg(par, 0xE0, write_reg(par, 0xE0,
......
/*************************************************** /*
This is our library for the Adafruit ILI9341 Breakout and Shield * This is our library for the Adafruit ILI9341 Breakout and Shield
----> http://www.adafruit.com/products/1651 * ----> http://www.adafruit.com/products/1651
*
Check out the links above for our tutorials and wiring diagrams * Check out the links above for our tutorials and wiring diagrams
These displays use SPI to communicate, 4 or 5 pins are required to * These displays use SPI to communicate, 4 or 5 pins are required to
interface (RST is optional) * interface (RST is optional)
Adafruit invests time and resources providing this open source code, * Adafruit invests time and resources providing this open source code,
please support Adafruit and open-source hardware by purchasing * please support Adafruit and open-source hardware by purchasing
products from Adafruit! * products from Adafruit!
*
Written by Limor Fried/Ladyada for Adafruit Industries. * Written by Limor Fried/Ladyada for Adafruit Industries.
MIT license, all text above must be included in any redistribution * MIT license, all text above must be included in any redistribution
****************************************************/ */
#ifndef __HX8357_H__ #ifndef __HX8357_H__
#define __HX8357_H__ #define __HX8357_H__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment