Commit dbb588a4 authored by Fabio Falzoi's avatar Fabio Falzoi Committed by Greg Kroah-Hartman
Browse files

Staging: fbtft: Use a struct to describe each LCD controller 



Use a struct flexfb_lcd_controller to holds chip properties, instead of
relying on a long 'if - else if' chain.
This allows to:
- use a simple linear search to verify if a certain LCD controller
model is supported or not.
- add support for a new LCD chip controller simply defining a new
flexfb_lcd_controller struct.

Signed-off-by: default avatarFabio Falzoi <fabio.falzoi84@gmail.com>
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25e66320

drivers/staging/fbtft/flexfb.c

+136 −96
Original line number Diff line number Diff line
@@ -126,6 +126,109 @@ static int ssd1351_init[] = { -1, 0xfd, 0x12, -1, 0xfd, 0xb1, -1, 0xae, -1, 0xb3 
			      -1, 0xab, 0x01, -1, 0xb1, 0x32, -1, 0xb4, 0xa0, 0xb5, 0x55, -1, 0xbb, 0x17, -1, 0xbe, 0x05,

			      -1, 0xc1, 0xc8, 0x80, 0xc8, -1, 0xc7, 0x0f, -1, 0xb6, 0x01, -1, 0xa6, -1, 0xaf, -3 };



/**

 * struct flexfb_lcd_controller - Describes the LCD controller properties

 * @name: Model name of the chip

 * @width: Width of display in pixels

 * @height: Height of display in pixels

 * @setaddrwin: Which set_addr_win() implementation to use

 * @regwidth: LCD Controller Register width in bits

 * @init_seq: LCD initialization sequence

 * @init_seq_sz: Size of LCD initialization sequence

 */

struct flexfb_lcd_controller {

	const char *name;

	unsigned int width;

	unsigned int height;

	unsigned int setaddrwin;

	unsigned int regwidth;

	int *init_seq;

	int init_seq_sz;

};



static const struct flexfb_lcd_controller flexfb_chip_table[] = {

	{

		.name = "st7735r",

		.width = 120,

		.height = 160,

		.init_seq = st7735r_init,

		.init_seq_sz = ARRAY_SIZE(st7735r_init),

	},

	{

		.name = "hx8340bn",

		.width = 176,

		.height = 220,

		.init_seq = hx8340bn_init,

		.init_seq_sz = ARRAY_SIZE(hx8340bn_init),

	},

	{

		.name = "ili9225",

		.width = 176,

		.height = 220,

		.regwidth = 16,

		.init_seq = ili9225_init,

		.init_seq_sz = ARRAY_SIZE(ili9225_init),

	},

	{

		.name = "ili9225",

		.width = 176,

		.height = 220,

		.regwidth = 16,

		.init_seq = ili9225_init,

		.init_seq_sz = ARRAY_SIZE(ili9225_init),

	},

	{

		.name = "ili9225",

		.width = 176,

		.height = 220,

		.regwidth = 16,

		.init_seq = ili9225_init,

		.init_seq_sz = ARRAY_SIZE(ili9225_init),

	},

	{

		.name = "ili9320",

		.width = 240,

		.height = 320,

		.setaddrwin = 1,

		.regwidth = 16,

		.init_seq = ili9320_init,

		.init_seq_sz = ARRAY_SIZE(ili9320_init),

	},

	{

		.name = "ili9325",

		.width = 240,

		.height = 320,

		.setaddrwin = 1,

		.regwidth = 16,

		.init_seq = ili9325_init,

		.init_seq_sz = ARRAY_SIZE(ili9325_init),

	},

	{

		.name = "ili9341",

		.width = 240,

		.height = 320,

		.init_seq = ili9341_init,

		.init_seq_sz = ARRAY_SIZE(ili9341_init),

	},

	{

		.name = "ssd1289",

		.width = 240,

		.height = 320,

		.setaddrwin = 2,

		.regwidth = 16,

		.init_seq = ssd1289_init,

		.init_seq_sz = ARRAY_SIZE(ssd1289_init),

	},

	{

		.name = "ssd1351",

		.width = 128,

		.height = 128,

		.setaddrwin = 3,

		.init_seq = ssd1351_init,

		.init_seq_sz = ARRAY_SIZE(ssd1351_init),

	},

};



/* ili9320, ili9325 */

static void flexfb_set_addr_win_1(struct fbtft_par *par,

				  int xs, int ys, int xe, int ye)
@@ -247,8 +350,38 @@ static int flexfb_verify_gpios_db(struct fbtft_par *par) 
	return 0;

}



static void flexfb_chip_load_param(const struct flexfb_lcd_controller *chip)

{

	if (!width)

		width = chip->width;

	if (!height)

		height = chip->height;

	setaddrwin = chip->setaddrwin;

	if (chip->regwidth)

		regwidth = chip->regwidth;

	if (!init_num) {

		initp = chip->init_seq;

		initp_num = chip->init_seq_sz;

	}

}



static struct fbtft_display flex_display = { };



static int flexfb_chip_init(const struct device *dev)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(flexfb_chip_table); i++)

		if (!strcmp(chip, flexfb_chip_table[i].name)) {

			flexfb_chip_load_param(&flexfb_chip_table[i]);

			return 0;

		}



	dev_err(dev, "chip=%s is not supported\n", chip);



	return -EINVAL;

}



static int flexfb_probe_common(struct spi_device *sdev,

			       struct platform_device *pdev)

{
@@ -269,102 +402,9 @@ static int flexfb_probe_common(struct spi_device *sdev, 
		       sdev ? "'SPI device'" : "'Platform device'");



	if (chip) {



		if (!strcmp(chip, "st7735r")) {

			if (!width)

				width = 128;

			if (!height)

				height = 160;

			if (init_num == 0) {

				initp = st7735r_init;

				initp_num = ARRAY_SIZE(st7735r_init);

			}



		} else if (!strcmp(chip, "hx8340bn")) {

			if (!width)

				width = 176;

			if (!height)

				height = 220;

			setaddrwin = 0;

			if (init_num == 0) {

				initp = hx8340bn_init;

				initp_num = ARRAY_SIZE(hx8340bn_init);

			}



		} else if (!strcmp(chip, "ili9225")) {

			if (!width)

				width = 176;

			if (!height)

				height = 220;

			setaddrwin = 0;

			regwidth = 16;

			if (init_num == 0) {

				initp = ili9225_init;

				initp_num = ARRAY_SIZE(ili9225_init);

			}



		} else if (!strcmp(chip, "ili9320")) {

			if (!width)

				width = 240;

			if (!height)

				height = 320;

			setaddrwin = 1;

			regwidth = 16;

			if (init_num == 0) {

				initp = ili9320_init;

				initp_num = ARRAY_SIZE(ili9320_init);

			}



		} else if (!strcmp(chip, "ili9325")) {

			if (!width)

				width = 240;

			if (!height)

				height = 320;

			setaddrwin = 1;

			regwidth = 16;

			if (init_num == 0) {

				initp = ili9325_init;

				initp_num = ARRAY_SIZE(ili9325_init);

			}



		} else if (!strcmp(chip, "ili9341")) {

			if (!width)

				width = 240;

			if (!height)

				height = 320;

			setaddrwin = 0;

			regwidth = 8;

			if (init_num == 0) {

				initp = ili9341_init;

				initp_num = ARRAY_SIZE(ili9341_init);

			}



		} else if (!strcmp(chip, "ssd1289")) {

			if (!width)

				width = 240;

			if (!height)

				height = 320;

			setaddrwin = 2;

			regwidth = 16;

			if (init_num == 0) {

				initp = ssd1289_init;

				initp_num = ARRAY_SIZE(ssd1289_init);

			}



		} else if (!strcmp(chip, "ssd1351")) {

			if (!width)

				width = 128;

			if (!height)

				height = 128;

			setaddrwin = 3;

			if (init_num == 0) {

				initp = ssd1351_init;

				initp_num = ARRAY_SIZE(ssd1351_init);

			}

		} else {

			dev_err(dev, "chip=%s is not supported\n", chip);

			return -EINVAL;

		}

		ret = flexfb_chip_init(dev);

		if (ret)

			return ret;

	}



	if (width == 0 || height == 0) {