Staging: fbtft: Fix GPIO handling
Commitc440eee1a7
("Staging: fbtft: Switch to the gpio descriptor interface") breaks GPIO handling. In several places, checks to only set a GPIO if it was configured ended up backwards. I have tested this fix. The fixed driver works with a ili9486 display connected to a raspberry pi via SPI. Fixes:c440eee1a7
("Staging: fbtft: Switch to the gpio descriptor interface") Tested-by: Jan Sebastian Götte <linux@jaseg.net> Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Signed-off-by: Jan Sebastian Götte <linux@jaseg.net> Link: https://lore.kernel.org/r/75ada52f-afa1-08bc-d0ce-966fc1110e70@jaseg.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
6105043012
Коммит
92e3e88488
|
@ -24,7 +24,7 @@
|
|||
|
||||
static int init_display(struct fbtft_par *par)
|
||||
{
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
par->fbtftops.reset(par);
|
||||
|
|
|
@ -77,7 +77,7 @@ static int init_display(struct fbtft_par *par)
|
|||
{
|
||||
par->fbtftops.reset(par);
|
||||
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
write_reg(par, MIPI_DCS_SOFT_RESET); /* software reset */
|
||||
|
|
|
@ -85,7 +85,7 @@ static int init_display(struct fbtft_par *par)
|
|||
{
|
||||
par->fbtftops.reset(par);
|
||||
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
bt &= 0x07;
|
||||
|
|
|
@ -29,7 +29,7 @@ static int init_display(struct fbtft_par *par)
|
|||
{
|
||||
par->fbtftops.reset(par);
|
||||
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
/* Initialization sequence from Lib_UTFT */
|
||||
|
|
|
@ -28,7 +28,7 @@ static int init_display(struct fbtft_par *par)
|
|||
{
|
||||
par->fbtftops.reset(par);
|
||||
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
write_reg(par, 0x00, 0x0001);
|
||||
|
|
|
@ -81,7 +81,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
|
|||
va_start(args, len);
|
||||
|
||||
*buf = (u8)va_arg(args, unsigned int);
|
||||
if (!par->gpio.dc)
|
||||
if (par->gpio.dc)
|
||||
gpiod_set_value(par->gpio.dc, 0);
|
||||
ret = par->fbtftops.write(par, par->buf, sizeof(u8));
|
||||
if (ret < 0) {
|
||||
|
@ -104,7 +104,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
|
|||
return;
|
||||
}
|
||||
}
|
||||
if (!par->gpio.dc)
|
||||
if (par->gpio.dc)
|
||||
gpiod_set_value(par->gpio.dc, 1);
|
||||
va_end(args);
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ static int init_display(struct fbtft_par *par)
|
|||
{
|
||||
par->fbtftops.reset(par);
|
||||
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
/* Initialization sequence from Lib_UTFT */
|
||||
|
|
|
@ -135,7 +135,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)
|
|||
remain = len / 2;
|
||||
vmem16 = (u16 *)(par->info->screen_buffer + offset);
|
||||
|
||||
if (!par->gpio.dc)
|
||||
if (par->gpio.dc)
|
||||
gpiod_set_value(par->gpio.dc, 1);
|
||||
|
||||
/* non buffered write */
|
||||
|
|
|
@ -918,7 +918,7 @@ static int fbtft_init_display_dt(struct fbtft_par *par)
|
|||
return -EINVAL;
|
||||
|
||||
par->fbtftops.reset(par);
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
while (p) {
|
||||
|
@ -1009,7 +1009,7 @@ int fbtft_init_display(struct fbtft_par *par)
|
|||
}
|
||||
|
||||
par->fbtftops.reset(par);
|
||||
if (!par->gpio.cs)
|
||||
if (par->gpio.cs)
|
||||
gpiod_set_value(par->gpio.cs, 0); /* Activate chip */
|
||||
|
||||
i = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче