提交 1014c2ce 编写于 作者: A Anish Bhatt 提交者: Greg Kroah-Hartman

staging/fbtft : Fix multiple/missing blank line issues

Remove or add blank lines as recommended by checkpatch.pl
Signed-off-by: NAnish Bhatt <anish@chelsio.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 c3eeca50
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#define CS0 gpio.aux[0] #define CS0 gpio.aux[0]
#define CS1 gpio.aux[1] #define CS1 gpio.aux[1]
/* diffusing error (Floyd-Steinberg) */ /* diffusing error (Floyd-Steinberg) */
#define DIFFUSING_MATRIX_WIDTH 2 #define DIFFUSING_MATRIX_WIDTH 2
#define DIFFUSING_MATRIX_HEIGHT 2 #define DIFFUSING_MATRIX_HEIGHT 2
...@@ -416,7 +415,6 @@ static int write(struct fbtft_par *par, void *buf, size_t len) ...@@ -416,7 +415,6 @@ static int write(struct fbtft_par *par, void *buf, size_t len)
gpio_set_value(par->RW, 0); /* set write mode */ gpio_set_value(par->RW, 0); /* set write mode */
while (len--) { while (len--) {
u8 i, data; u8 i, data;
...@@ -452,6 +450,7 @@ static struct fbtft_display display = { ...@@ -452,6 +450,7 @@ static struct fbtft_display display = {
.write_vmem = write_vmem, .write_vmem = write_vmem,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "displaytronic,fb_agm1264k-fl", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "displaytronic,fb_agm1264k-fl", &display);
MODULE_ALIAS("platform:" DRVNAME); MODULE_ALIAS("platform:" DRVNAME);
......
...@@ -175,6 +175,7 @@ static struct fbtft_display display = { ...@@ -175,6 +175,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "hitachi,bd663474", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "hitachi,bd663474", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -35,12 +35,10 @@ ...@@ -35,12 +35,10 @@
#define DEFAULT_GAMMA "1 3 0E 5 0 2 09 0 6 1 7 1 0 2 2\n" \ #define DEFAULT_GAMMA "1 3 0E 5 0 2 09 0 6 1 7 1 0 2 2\n" \
"3 3 17 8 4 7 05 7 6 0 3 1 6 0 0 " "3 3 17 8 4 7 05 7 6 0 3 1 6 0 0 "
static bool emulate; static bool emulate;
module_param(emulate, bool, 0); module_param(emulate, bool, 0);
MODULE_PARM_DESC(emulate, "Force emulation in 9-bit mode"); MODULE_PARM_DESC(emulate, "Force emulation in 9-bit mode");
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
par->fbtftops.reset(par); par->fbtftops.reset(par);
...@@ -188,7 +186,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -188,7 +186,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -204,6 +201,7 @@ static struct fbtft_display display = { ...@@ -204,6 +201,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8340bn", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8340bn", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define DEFAULT_GAMMA "0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" \ #define DEFAULT_GAMMA "0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" \
"0 0 0 0 0 0 0 0 0 0 0 0 0 0" "0 0 0 0 0 0 0 0 0 0 0 0 0 0"
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -147,7 +146,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -147,7 +146,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -161,6 +159,7 @@ static struct fbtft_display display = { ...@@ -161,6 +159,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8347d", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8347d", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -132,7 +132,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -132,7 +132,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = 128, .width = 128,
...@@ -147,6 +146,7 @@ static struct fbtft_display display = { ...@@ -147,6 +146,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8353d", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8353d", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 480 #define HEIGHT 480
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -204,6 +203,7 @@ static struct fbtft_display display = { ...@@ -204,6 +203,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8357d", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "himax,hx8357d", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#define DEFAULT_GAMMA "07 07 6 0 0 0 5 5 4 0\n" \ #define DEFAULT_GAMMA "07 07 6 0 0 0 5 5 4 0\n" \
"07 08 4 7 5 1 2 0 7 7" "07 08 4 7 5 1 2 0 7 7"
static unsigned read_devicecode(struct fbtft_par *par) static unsigned read_devicecode(struct fbtft_par *par)
{ {
int ret; int ret;
...@@ -92,7 +91,6 @@ static int init_display(struct fbtft_par *par) ...@@ -92,7 +91,6 @@ static int init_display(struct fbtft_par *par)
/* RGB interface polarity */ /* RGB interface polarity */
write_reg(par, 0x000F, 0x0000); write_reg(par, 0x000F, 0x0000);
/* ***********Power On sequence *************** */ /* ***********Power On sequence *************** */
/* SAP, BT[3:0], AP, DSTB, SLP, STB */ /* SAP, BT[3:0], AP, DSTB, SLP, STB */
write_reg(par, 0x0010, 0x0000); write_reg(par, 0x0010, 0x0000);
...@@ -258,7 +256,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -258,7 +256,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 16, .regwidth = 16,
.width = WIDTH, .width = WIDTH,
...@@ -273,6 +270,7 @@ static struct fbtft_display display = { ...@@ -273,6 +270,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9320", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9320", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#define DEFAULT_GAMMA "0F 00 7 2 0 0 6 5 4 1\n" \ #define DEFAULT_GAMMA "0F 00 7 2 0 0 6 5 4 1\n" \
"04 16 2 7 6 3 2 1 7 7" "04 16 2 7 6 3 2 1 7 7"
static unsigned bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */ static unsigned bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */
module_param(bt, uint, 0); module_param(bt, uint, 0);
MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits"); MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits");
...@@ -56,7 +55,6 @@ static unsigned vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */ ...@@ -56,7 +55,6 @@ static unsigned vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */
module_param(vcm, uint, 0); module_param(vcm, uint, 0);
MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage"); MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage");
/* /*
Verify that this configuration is within the Voltage limits Verify that this configuration is within the Voltage limits
...@@ -255,7 +253,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -255,7 +253,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 16, .regwidth = 16,
.width = WIDTH, .width = WIDTH,
...@@ -272,6 +269,7 @@ static struct fbtft_display display = { ...@@ -272,6 +269,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9325", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9325", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define WIDTH 240 #define WIDTH 240
#define HEIGHT 320 #define HEIGHT 320
/* Init sequence taken from: Arduino Library for the Adafruit 2.2" display */ /* Init sequence taken from: Arduino Library for the Adafruit 2.2" display */
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
...@@ -133,7 +132,6 @@ static int set_var(struct fbtft_par *par) ...@@ -133,7 +132,6 @@ static int set_var(struct fbtft_par *par)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -144,6 +142,7 @@ static struct fbtft_display display = { ...@@ -144,6 +142,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9340", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9340", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define DEFAULT_GAMMA "1F 1A 18 0A 0F 06 45 87 32 0A 07 02 07 05 00\n" \ #define DEFAULT_GAMMA "1F 1A 18 0A 0F 06 45 87 32 0A 07 02 07 05 00\n" \
"00 25 27 05 10 09 3A 78 4D 05 18 0D 38 3A 1F" "00 25 27 05 10 09 3A 78 4D 05 18 0D 38 3A 1F"
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -144,7 +143,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -144,7 +143,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -160,6 +158,7 @@ static struct fbtft_display display = { ...@@ -160,6 +158,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9341", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9341", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -98,6 +98,7 @@ static struct fbtft_display display = { ...@@ -98,6 +98,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9481", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9481", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 480 #define HEIGHT 480
/* this init sequence matches PiScreen */ /* this init sequence matches PiScreen */
static int default_init_sequence[] = { static int default_init_sequence[] = {
/* Interface Mode Control */ /* Interface Mode Control */
...@@ -91,7 +90,6 @@ static int set_var(struct fbtft_par *par) ...@@ -91,7 +90,6 @@ static int set_var(struct fbtft_par *par)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -102,6 +100,7 @@ static struct fbtft_display display = { ...@@ -102,6 +100,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9486", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "ilitek,ili9486", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -40,7 +40,6 @@ static unsigned bs = 4; ...@@ -40,7 +40,6 @@ static unsigned bs = 4;
module_param(bs, uint, 0); module_param(bs, uint, 0);
MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)"); MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)");
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -155,7 +154,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -155,7 +154,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -172,6 +170,7 @@ static struct fbtft_display display = { ...@@ -172,6 +170,7 @@ static struct fbtft_display display = {
}, },
.backlight = 1, .backlight = 1,
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "philips,pdc8544", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "philips,pdc8544", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -305,6 +305,7 @@ static struct fbtft_display display = { ...@@ -305,6 +305,7 @@ static struct fbtft_display display = {
.write = write_spi, .write = write_spi,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "raio,ra8875", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "raio,ra8875", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -149,6 +149,7 @@ static struct fbtft_display display = { ...@@ -149,6 +149,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "samsung,s6d02a1", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "samsung,s6d02a1", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -171,7 +171,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -171,7 +171,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 16, .regwidth = 16,
.width = WIDTH, .width = WIDTH,
...@@ -188,6 +187,7 @@ static struct fbtft_display display = { ...@@ -188,6 +187,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "samsung,s6d1121", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "samsung,s6d1121", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -33,7 +33,6 @@ static unsigned reg11 = 0x6040; ...@@ -33,7 +33,6 @@ static unsigned reg11 = 0x6040;
module_param(reg11, uint, 0); module_param(reg11, uint, 0);
MODULE_PARM_DESC(reg11, "Register 11h value"); MODULE_PARM_DESC(reg11, "Register 11h value");
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -171,7 +170,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -171,7 +170,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 16, .regwidth = 16,
.width = WIDTH, .width = WIDTH,
...@@ -186,6 +184,7 @@ static struct fbtft_display display = { ...@@ -186,6 +184,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1289", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1289", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define WIDTH 128 #define WIDTH 128
#define HEIGHT 64 #define HEIGHT 64
/* /*
write_reg() caveat: write_reg() caveat:
...@@ -192,7 +191,6 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -192,7 +191,6 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
return ret; return ret;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -209,7 +207,6 @@ static struct fbtft_display display = { ...@@ -209,7 +207,6 @@ static struct fbtft_display display = {
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1306", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1306", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -123,7 +123,6 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -123,7 +123,6 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
: :
Setting of GS63 has to be > Setting of GS62 +1 Setting of GS63 has to be > Setting of GS62 +1
*/ */
static int set_gamma(struct fbtft_par *par, unsigned long *curves) static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{ {
...@@ -173,7 +172,6 @@ static int blank(struct fbtft_par *par, bool on) ...@@ -173,7 +172,6 @@ static int blank(struct fbtft_par *par, bool on)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
......
...@@ -120,7 +120,6 @@ static int set_var(struct fbtft_par *par) ...@@ -120,7 +120,6 @@ static int set_var(struct fbtft_par *par)
: :
Setting of GS63 has to be > Setting of GS62 +1 Setting of GS63 has to be > Setting of GS62 +1
*/ */
static int set_gamma(struct fbtft_par *par, unsigned long *curves) static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{ {
...@@ -170,7 +169,6 @@ static int blank(struct fbtft_par *par, bool on) ...@@ -170,7 +169,6 @@ static int blank(struct fbtft_par *par, bool on)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -236,7 +234,6 @@ static void register_onboard_backlight(struct fbtft_par *par) ...@@ -236,7 +234,6 @@ static void register_onboard_backlight(struct fbtft_par *par)
static void register_onboard_backlight(struct fbtft_par *par) { }; static void register_onboard_backlight(struct fbtft_par *par) { };
#endif #endif
FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1351", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "solomon,ssd1351", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#define DEFAULT_GAMMA "0F 1A 0F 18 2F 28 20 22 1F 1B 23 37 00 07 02 10\n" \ #define DEFAULT_GAMMA "0F 1A 0F 18 2F 28 20 22 1F 1B 23 37 00 07 02 10\n" \
"0F 1B 0F 17 33 2C 29 2E 30 30 39 3F 00 07 03 10" "0F 1B 0F 17 33 2C 29 2E 30 30 39 3F 00 07 03 10"
static int default_init_sequence[] = { static int default_init_sequence[] = {
/* SWRESET - Software reset */ /* SWRESET - Software reset */
-1, 0x01, -1, 0x01,
...@@ -161,7 +160,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -161,7 +160,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
} }
#undef CURVE #undef CURVE
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = 128, .width = 128,
...@@ -176,6 +174,7 @@ static struct fbtft_display display = { ...@@ -176,6 +174,7 @@ static struct fbtft_display display = {
.set_gamma = set_gamma, .set_gamma = set_gamma,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "sitronix,st7735r", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "sitronix,st7735r", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 480 #define HEIGHT 480
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -96,7 +95,6 @@ static int set_var(struct fbtft_par *par) ...@@ -96,7 +95,6 @@ static int set_var(struct fbtft_par *par)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -107,6 +105,7 @@ static struct fbtft_display display = { ...@@ -107,6 +105,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "neosec,tinylcd", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "neosec,tinylcd", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -147,7 +147,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -147,7 +147,6 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
return 0; return 0;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -164,6 +163,7 @@ static struct fbtft_display display = { ...@@ -164,6 +163,7 @@ static struct fbtft_display display = {
}, },
.backlight = 1, .backlight = 1,
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "teralane,tls8204", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "teralane,tls8204", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
/* column offset for bottom view orientation */ /* column offset for bottom view orientation */
#define SHIFT_ADDR_TOPVIEW 30 #define SHIFT_ADDR_TOPVIEW 30
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__); fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
...@@ -183,7 +182,6 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -183,7 +182,6 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
return ret; return ret;
} }
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.width = WIDTH, .width = WIDTH,
...@@ -195,6 +193,7 @@ static struct fbtft_display display = { ...@@ -195,6 +193,7 @@ static struct fbtft_display display = {
}, },
.backlight = 1, .backlight = 1,
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "UltraChip,uc1701", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "UltraChip,uc1701", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -188,6 +188,7 @@ static struct fbtft_display display = { ...@@ -188,6 +188,7 @@ static struct fbtft_display display = {
.set_var = set_var, .set_var = set_var,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "nec,upd161704", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "nec,upd161704", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#define COLOR_RGB233 10 #define COLOR_RGB233 10
#define COLOR_RGB565 16 #define COLOR_RGB565 16
static short mode = 565; static short mode = 565;
module_param(mode, short, 0); module_param(mode, short, 0);
MODULE_PARM_DESC(mode, "RGB color transfer mode: 332, 565 (default)"); MODULE_PARM_DESC(mode, "RGB color transfer mode: 332, 565 (default)");
...@@ -286,7 +285,6 @@ static void register_chip_backlight(struct fbtft_par *par) ...@@ -286,7 +285,6 @@ static void register_chip_backlight(struct fbtft_par *par)
#define register_chip_backlight NULL #define register_chip_backlight NULL
#endif #endif
static struct fbtft_display display = { static struct fbtft_display display = {
.regwidth = 8, .regwidth = 8,
.buswidth = 8, .buswidth = 8,
...@@ -304,6 +302,7 @@ static struct fbtft_display display = { ...@@ -304,6 +302,7 @@ static struct fbtft_display display = {
.register_backlight = register_chip_backlight, .register_backlight = register_chip_backlight,
}, },
}; };
FBTFT_REGISTER_DRIVER(DRVNAME, "watterott,openlcd", &display); FBTFT_REGISTER_DRIVER(DRVNAME, "watterott,openlcd", &display);
MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("spi:" DRVNAME);
......
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "fbtft.h" #include "fbtft.h"
/***************************************************************************** /*****************************************************************************
* *
* void (*write_reg)(struct fbtft_par *par, int len, ...); * void (*write_reg)(struct fbtft_par *par, int len, ...);
...@@ -117,9 +114,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) ...@@ -117,9 +114,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...)
} }
EXPORT_SYMBOL(fbtft_write_reg8_bus9); EXPORT_SYMBOL(fbtft_write_reg8_bus9);
/***************************************************************************** /*****************************************************************************
* *
* int (*write_vmem)(struct fbtft_par *par); * int (*write_vmem)(struct fbtft_par *par);
......
...@@ -49,7 +49,6 @@ module_param(dma, bool, 0); ...@@ -49,7 +49,6 @@ module_param(dma, bool, 0);
MODULE_PARM_DESC(dma, "Use DMA buffer"); MODULE_PARM_DESC(dma, "Use DMA buffer");
#endif #endif
void fbtft_dbg_hex(const struct device *dev, int groupsize, void fbtft_dbg_hex(const struct device *dev, int groupsize,
void *buf, size_t len, const char *fmt, ...) void *buf, size_t len, const char *fmt, ...)
{ {
...@@ -336,7 +335,6 @@ static void fbtft_set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, ...@@ -336,7 +335,6 @@ static void fbtft_set_addr_win(struct fbtft_par *par, int xs, int ys, int xe,
write_reg(par, 0x2C); write_reg(par, 0x2C);
} }
static void fbtft_reset(struct fbtft_par *par) static void fbtft_reset(struct fbtft_par *par)
{ {
if (par->gpio.reset == -1) if (par->gpio.reset == -1)
...@@ -348,7 +346,6 @@ static void fbtft_reset(struct fbtft_par *par) ...@@ -348,7 +346,6 @@ static void fbtft_reset(struct fbtft_par *par)
mdelay(120); mdelay(120);
} }
static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, static void fbtft_update_display(struct fbtft_par *par, unsigned start_line,
unsigned end_line) unsigned end_line)
{ {
...@@ -427,7 +424,6 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, ...@@ -427,7 +424,6 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line,
} }
} }
static void fbtft_mkdirty(struct fb_info *info, int y, int height) static void fbtft_mkdirty(struct fb_info *info, int y, int height)
{ {
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
...@@ -489,7 +485,6 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist) ...@@ -489,7 +485,6 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)
dirty_lines_start, dirty_lines_end); dirty_lines_start, dirty_lines_end);
} }
static void fbtft_fb_fillrect(struct fb_info *info, static void fbtft_fb_fillrect(struct fb_info *info,
const struct fb_fillrect *rect) const struct fb_fillrect *rect)
{ {
......
...@@ -149,7 +149,6 @@ static struct device_attribute gamma_device_attrs[] = { ...@@ -149,7 +149,6 @@ static struct device_attribute gamma_device_attrs[] = {
__ATTR(gamma, 0660, show_gamma_curve, store_gamma_curve), __ATTR(gamma, 0660, show_gamma_curve, store_gamma_curve),
}; };
void fbtft_expand_debug_value(unsigned long *debug) void fbtft_expand_debug_value(unsigned long *debug)
{ {
switch (*debug & 0x7) { switch (*debug & 0x7) {
...@@ -205,7 +204,6 @@ static ssize_t show_debug(struct device *device, ...@@ -205,7 +204,6 @@ static ssize_t show_debug(struct device *device,
static struct device_attribute debug_device_attr = \ static struct device_attribute debug_device_attr = \
__ATTR(debug, 0660, show_debug, store_debug); __ATTR(debug, 0660, show_debug, store_debug);
void fbtft_sysfs_init(struct fbtft_par *par) void fbtft_sysfs_init(struct fbtft_par *par)
{ {
device_create_file(par->info->dev, &debug_device_attr); device_create_file(par->info->dev, &debug_device_attr);
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#define FBTFT_NOP 0x00 #define FBTFT_NOP 0x00
#define FBTFT_SWRESET 0x01 #define FBTFT_SWRESET 0x01
#define FBTFT_RDDID 0x04 #define FBTFT_RDDID 0x04
...@@ -291,7 +290,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...); ...@@ -291,7 +290,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...);
void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...); void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...);
void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...); void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...);
#define FBTFT_REGISTER_DRIVER(_name, _compatible, _display) \ #define FBTFT_REGISTER_DRIVER(_name, _compatible, _display) \
\ \
static int fbtft_driver_probe_spi(struct spi_device *spi) \ static int fbtft_driver_probe_spi(struct spi_device *spi) \
...@@ -365,7 +363,6 @@ static void __exit fbtft_driver_module_exit(void) \ ...@@ -365,7 +363,6 @@ static void __exit fbtft_driver_module_exit(void) \
module_init(fbtft_driver_module_init); \ module_init(fbtft_driver_module_init); \
module_exit(fbtft_driver_module_exit); module_exit(fbtft_driver_module_exit);
/* Debug macros */ /* Debug macros */
/* shorthand debug levels */ /* shorthand debug levels */
...@@ -411,7 +408,6 @@ module_exit(fbtft_driver_module_exit); ...@@ -411,7 +408,6 @@ module_exit(fbtft_driver_module_exit);
#define DEBUG_REQUEST_GPIOS_MATCH (1<<30) #define DEBUG_REQUEST_GPIOS_MATCH (1<<30)
#define DEBUG_VERIFY_GPIOS (1<<31) #define DEBUG_VERIFY_GPIOS (1<<31)
#define fbtft_init_dbg(dev, format, arg...) \ #define fbtft_init_dbg(dev, format, arg...) \
do { \ do { \
if (unlikely((dev)->platform_data && \ if (unlikely((dev)->platform_data && \
...@@ -425,7 +421,6 @@ do { \ ...@@ -425,7 +421,6 @@ do { \
dev_info(par->info->device, format, ##arg); \ dev_info(par->info->device, format, ##arg); \
} while (0) } while (0)
#define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \ #define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \
do { \ do { \
if (unlikely(par->debug & level)) \ if (unlikely(par->debug & level)) \
......
...@@ -111,7 +111,6 @@ module_param(verbose, uint, 0); ...@@ -111,7 +111,6 @@ module_param(verbose, uint, 0);
MODULE_PARM_DESC(verbose, MODULE_PARM_DESC(verbose,
"0 silent, >0 show gpios, >1 show devices, >2 show devices before (default=3)"); "0 silent, >0 show gpios, >1 show devices, >2 show devices before (default=3)");
struct fbtft_device_display { struct fbtft_device_display {
char *name; char *name;
struct spi_board_info *spi; struct spi_board_info *spi;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册