Commit 9f8e0562 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging: fbtft: Convert int arrays to s16

These arrays use -1, -2, and -3 as initiators for various types of
writes to initialize hardware.

No values are used that conflict with using these arrays as s16
instead of int and reducing overall data is good.

$ size drivers/staging/fbtft/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 116120	  32872	   4152	 153144	  25638	drivers/staging/fbtft/built-in.o.new
 116104	  36344	   6200	 158648	  26bb8	drivers/staging/fbtft/built-in.o.old

Miscellaneous:

o Realign some of the arrays to make reading a bit easier
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d45f1a56
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 480 #define HEIGHT 480
static int default_init_sequence[] = { static s16 default_init_sequence[] = {
/* SLP_OUT - Sleep out */ /* SLP_OUT - Sleep out */
-1, MIPI_DCS_EXIT_SLEEP_MODE, -1, MIPI_DCS_EXIT_SLEEP_MODE,
-2, 50, -2, 50,
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define HEIGHT 480 #define HEIGHT 480
/* this init sequence matches PiScreen */ /* this init sequence matches PiScreen */
static int default_init_sequence[] = { static s16 default_init_sequence[] = {
/* Interface Mode Control */ /* Interface Mode Control */
-1, 0xb0, 0x0, -1, 0xb0, 0x0,
-1, MIPI_DCS_EXIT_SLEEP_MODE, -1, MIPI_DCS_EXIT_SLEEP_MODE,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define DRVNAME "fb_s6d02a1" #define DRVNAME "fb_s6d02a1"
static int default_init_sequence[] = { static s16 default_init_sequence[] = {
-1, 0xf0, 0x5a, 0x5a, -1, 0xf0, 0x5a, 0x5a,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#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 s16 default_init_sequence[] = {
-1, MIPI_DCS_SOFT_RESET, -1, MIPI_DCS_SOFT_RESET,
-2, 150, /* delay */ -2, 150, /* delay */
......
...@@ -660,7 +660,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, ...@@ -660,7 +660,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
unsigned int bpp = display->bpp; unsigned int bpp = display->bpp;
unsigned int fps = display->fps; unsigned int fps = display->fps;
int vmem_size, i; int vmem_size, i;
int *init_sequence = display->init_sequence; s16 *init_sequence = display->init_sequence;
char *gamma = display->gamma; char *gamma = display->gamma;
unsigned long *gamma_curves = NULL; unsigned long *gamma_curves = NULL;
......
...@@ -124,7 +124,7 @@ struct fbtft_display { ...@@ -124,7 +124,7 @@ struct fbtft_display {
unsigned int bpp; unsigned int bpp;
unsigned int fps; unsigned int fps;
int txbuflen; int txbuflen;
int *init_sequence; s16 *init_sequence;
char *gamma; char *gamma;
int gamma_num; int gamma_num;
int gamma_len; int gamma_len;
...@@ -229,7 +229,7 @@ struct fbtft_par { ...@@ -229,7 +229,7 @@ struct fbtft_par {
int led[16]; int led[16];
int aux[16]; int aux[16];
} gpio; } gpio;
int *init_sequence; s16 *init_sequence;
struct { struct {
struct mutex lock; struct mutex lock;
unsigned long *curves; unsigned long *curves;
......
...@@ -96,9 +96,9 @@ static unsigned int buswidth = 8; ...@@ -96,9 +96,9 @@ static unsigned int buswidth = 8;
module_param(buswidth, uint, 0); module_param(buswidth, uint, 0);
MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument"); MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument");
static int init[FBTFT_MAX_INIT_SEQUENCE]; static s16 init[FBTFT_MAX_INIT_SEQUENCE];
static int init_num; static int init_num;
module_param_array(init, int, &init_num, 0); module_param_array(init, short, &init_num, 0);
MODULE_PARM_DESC(init, "Init sequence, used with the custom argument"); MODULE_PARM_DESC(init, "Init sequence, used with the custom argument");
static unsigned long debug; static unsigned long debug;
...@@ -131,7 +131,7 @@ static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par, ...@@ -131,7 +131,7 @@ static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,
"D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\n" \ "D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\n" \
"D0 00 14 15 13 0B 43 55 53 0C 17 14 23 20" "D0 00 14 15 13 0B 43 55 53 0C 17 14 23 20"
static int cberry28_init_sequence[] = { static s16 cberry28_init_sequence[] = {
/* turn off sleep mode */ /* turn off sleep mode */
-1, MIPI_DCS_EXIT_SLEEP_MODE, -1, MIPI_DCS_EXIT_SLEEP_MODE,
-2, 120, -2, 120,
...@@ -180,7 +180,7 @@ static int cberry28_init_sequence[] = { ...@@ -180,7 +180,7 @@ static int cberry28_init_sequence[] = {
-3, -3,
}; };
static int hy28b_init_sequence[] = { static s16 hy28b_init_sequence[] = {
-1, 0x00e7, 0x0010, -1, 0x0000, 0x0001, -1, 0x00e7, 0x0010, -1, 0x0000, 0x0001,
-1, 0x0001, 0x0100, -1, 0x0002, 0x0700, -1, 0x0001, 0x0100, -1, 0x0002, 0x0700,
-1, 0x0003, 0x1030, -1, 0x0004, 0x0000, -1, 0x0003, 0x1030, -1, 0x0004, 0x0000,
...@@ -211,7 +211,7 @@ static int hy28b_init_sequence[] = { ...@@ -211,7 +211,7 @@ static int hy28b_init_sequence[] = {
"04 1F 4 7 7 0 7 7 6 0\n" \ "04 1F 4 7 7 0 7 7 6 0\n" \
"0F 00 1 7 4 0 0 0 6 7" "0F 00 1 7 4 0 0 0 6 7"
static int pitft_init_sequence[] = { static s16 pitft_init_sequence[] = {
-1, MIPI_DCS_SOFT_RESET, -1, MIPI_DCS_SOFT_RESET,
-2, 5, -2, 5,
-1, MIPI_DCS_SET_DISPLAY_OFF, -1, MIPI_DCS_SET_DISPLAY_OFF,
...@@ -242,7 +242,7 @@ static int pitft_init_sequence[] = { ...@@ -242,7 +242,7 @@ static int pitft_init_sequence[] = {
-3 -3
}; };
static int waveshare32b_init_sequence[] = { static s16 waveshare32b_init_sequence[] = {
-1, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02, -1, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02,
-1, 0xCF, 0x00, 0xC1, 0x30, -1, 0xCF, 0x00, 0xC1, 0x30,
-1, 0xE8, 0x85, 0x00, 0x78, -1, 0xE8, 0x85, 0x00, 0x78,
......
This diff is collapsed.
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