Staging: fbtft: Switch to the gpio descriptor interface
Subsystems (3)
PATCH v2 1/1 Staging: fbtft: Switch to the gpio descriptor interface
This switches the fbtft driver to use GPIO descriptors rather than numerical gpios:
Utilize the GPIO library's intrinsic handling of OF GPIOs and polarity. If the line is flagged active low, gpiolib will deal with this.
Remove gpios from platform device structure. Neither assign statically numbers to gpios in platform device nor allow gpios to be parsed as module parameters.
Changes in v2:
- Merge all patches in a single patch. This is because the first patch changes par->gpio from an int to a pointer so all the checks have to be updated in the same patch. Otherwie it breaks 'git bisect'.
--- drivers/staging/fbtft/fb_agm1264k-fl.c | 52 ++-- drivers/staging/fbtft/fb_bd663474.c | 6 +- drivers/staging/fbtft/fb_ili9163.c | 6 +- drivers/staging/fbtft/fb_ili9320.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 6 +- drivers/staging/fbtft/fb_ili9340.c | 2 +- drivers/staging/fbtft/fb_pcd8544.c | 4 +- drivers/staging/fbtft/fb_ra8875.c | 4 +- drivers/staging/fbtft/fb_s6d1121.c | 6 +- drivers/staging/fbtft/fb_sh1106.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 6 +- drivers/staging/fbtft/fb_ssd1305.c | 4 +- drivers/staging/fbtft/fb_ssd1306.c | 4 +- drivers/staging/fbtft/fb_ssd1325.c | 6 +- drivers/staging/fbtft/fb_ssd1331.c | 10 +- drivers/staging/fbtft/fb_ssd1351.c | 2 +- drivers/staging/fbtft/fb_tls8204.c | 6 +- drivers/staging/fbtft/fb_uc1611.c | 4 +- drivers/staging/fbtft/fb_uc1701.c | 6 +- drivers/staging/fbtft/fb_upd161704.c | 6 +- drivers/staging/fbtft/fb_watterott.c | 4 +- drivers/staging/fbtft/fbtft-bus.c | 6 +- drivers/staging/fbtft/fbtft-core.c | 173 +++---------- drivers/staging/fbtft/fbtft-io.c | 26 +- drivers/staging/fbtft/fbtft.h | 21 +- drivers/staging/fbtft/fbtft_device.c | 344 +------------------------ drivers/staging/fbtft/flexfb.c | 12 +- 27 files changed, 143 insertions(+), 587 deletions(-)
drivers/staging/fbtft/fb_agm1264k-fl.c +26 -26
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include <linux/slab.h>
@@ -79,14 +79,14 @@ static int init_display(struct fbtft_par *par)static void reset (struct fbtft_par *par) { -if (par->gpio.reset ==-1 ) +if (!par->gpio.reset)return ;dev_dbg (par->info->device,"%s()\n" , __func__); -gpio_set_value (par->gpio.reset,0 ); +gpiod_set_value (par->gpio.reset,0 );udelay (20 ); -gpio_set_value (par->gpio.reset,1 ); +gpiod_set_value (par->gpio.reset,1 );mdelay (120 ); }
@@ -98,30 +98,30 @@ static int verify_gpios(struct fbtft_par *par)dev_dbg (par->info->device,"%s()\n" , __func__); -if (par->EPIN <0 ) { +if (!par->EPIN) {dev_err (par->info->device,"Missing info about 'wr' (aka E) gpio. Aborting.\n" );return -EINVAL ; }for (i =0 ; i <8 ; ++i) { -if (par->gpio.db[i] <0 ) { +if (!par->gpio.db[i]) {dev_err (par->info->device,"Missing info about 'db[%i]' gpio. Aborting.\n" , i);return -EINVAL ; } } -if (par->CS0 <0 ) { +if (!par->CS0) {dev_err (par->info->device,"Missing info about 'cs0' gpio. Aborting.\n" );return -EINVAL ; } -if (par->CS1 <0 ) { +if (!par->CS1) {dev_err (par->info->device,"Missing info about 'cs1' gpio. Aborting.\n" );return -EINVAL ; } -if (par->RW <0 ) { +if (!par->RW) {dev_err (par->info->device,"Missing info about 'rw' gpio. Aborting.\n" );return -EINVAL ;
@@ -139,22 +139,22 @@ request_gpios_match(struct fbtft_par *par, const struct fbtft_gpio *gpio)if (strcasecmp (gpio->name,"wr" ) ==0 ) {/* left ks0108 E pin */ par->EPIN = gpio->gpio; -return GPIOF_OUT_INIT_LOW ; +return GPIOD_OUT_LOW ; }else if (strcasecmp (gpio->name,"cs0" ) ==0 ) {/* left ks0108 controller pin */ par->CS0 = gpio->gpio; -return GPIOF_OUT_INIT_HIGH ; +return GPIOD_OUT_HIGH ; }else if (strcasecmp (gpio->name,"cs1" ) ==0 ) {/* right ks0108 controller pin */ par->CS1 = gpio->gpio; -return GPIOF_OUT_INIT_HIGH ; +return GPIOD_OUT_HIGH ; }/* if write (rw = 0) e(1->0) perform write */ /* if read (rw = 1) e(0->1) set data on D0-7*/ else if (strcasecmp (gpio->name,"rw" ) ==0 ) { par->RW = gpio->gpio; -return GPIOF_OUT_INIT_LOW ; +return GPIOD_OUT_LOW ; }return FBTFT_GPIO_NO_MATCH ;
@@ -194,15 +194,15 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)/* select chip */ if (*buf) {/* cs1 */ -gpio_set_value (par->CS0,1 ); -gpio_set_value (par->CS1,0 ); +gpiod_set_value (par->CS0,1 ); +gpiod_set_value (par->CS1,0 ); }else {/* cs0 */ -gpio_set_value (par->CS0,0 ); -gpio_set_value (par->CS1,1 ); +gpiod_set_value (par->CS0,0 ); +gpiod_set_value (par->CS1,1 ); } -gpio_set_value (par->RS,0 );/* RS->0 (command mode) */ +gpiod_set_value (par->RS,0 );/* RS->0 (command mode) */ len--;if (len) {
@@ -364,7 +364,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)write_reg (par,0x00 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ -gpio_set_value (par->RS,1 );/* RS->1 (data mode) */ +gpiod_set_value (par->RS,1 );/* RS->1 (data mode) */ ret = par->fbtftops.write (par, buf, len);if (ret <0 ) dev_err(par->info->device,
@@ -387,7 +387,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)write_reg (par,0x01 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ -gpio_set_value (par->RS,1 );/* RS->1 (data mode) */ +gpiod_set_value (par->RS,1 );/* RS->1 (data mode) */ par->fbtftops.write (par, buf, len);if (ret <0 ) dev_err(par->info->device,
@@ -397,8 +397,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }kfree (convert_buf); -gpio_set_value (par->CS0,1 ); -gpio_set_value (par->CS1,1 ); +gpiod_set_value (par->CS0,1 ); +gpiod_set_value (par->CS1,1 );return ret; }
@@ -408,7 +408,7 @@ static int write(struct fbtft_par *par, void *buf, size_t len)fbtft_par_dbg_hex (DEBUG_WRITE , par, par->info->device, u8, buf, len,"%s(len=%d): " , __func__, len); -gpio_set_value (par->RW,0 );/* set write mode */ +gpiod_set_value (par->RW,0 );/* set write mode */ while (len--) {u8 i, data;
@@ -417,12 +417,12 @@ static int write(struct fbtft_par *par, void *buf, size_t len)/* set data bus */ for (i =0 ; i <8 ; ++i) -gpio_set_value (par->gpio.db[i], data & (1 << i)); +gpiod_set_value (par->gpio.db[i], data & (1 << i));/* set E */ -gpio_set_value (par->EPIN,1 ); +gpiod_set_value (par->EPIN,1 );udelay (5 );/* unset E - write */ -gpio_set_value (par->EPIN,0 ); +gpiod_set_value (par->EPIN,0 );udelay (1 ); }
drivers/staging/fbtft/fb_bd663474.c +3 -3
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -24,8 +24,8 @@static int init_display (struct fbtft_par *par) { -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ par->fbtftops.reset (par);
drivers/staging/fbtft/fb_ili9163.c +3 -3
@@ -11,7 +11,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include <video/mipi_display.h>
@@ -77,8 +77,8 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ write_reg (par,MIPI_DCS_SOFT_RESET );/* software reset */ mdelay (500 );
drivers/staging/fbtft/fb_ili9320.c +1 -1
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
drivers/staging/fbtft/fb_ili9325.c +3 -3
@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -85,8 +85,8 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ bt &=0x07 ; vc &=0x07 ;
drivers/staging/fbtft/fb_ili9340.c +1 -1
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include <video/mipi_display.h>
drivers/staging/fbtft/fb_pcd8544.c +2 -2
@@ -11,7 +11,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -119,7 +119,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }/* Write data */ -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 ); ret = par->fbtftops.write (par, par->txbuf.buf,6 *84 );if (ret <0 ) dev_err(par->info->device, "write failed and returned: %d\n",
drivers/staging/fbtft/fb_ra8875.c +2 -2
@@ -9,7 +9,7 @@#include <linux/init.h> #include <linux/delay.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include "fbtft.h" #define DRVNAME "fb_ra8875"
@@ -39,7 +39,7 @@ static int write_spi(struct fbtft_par *par, void *buf, size_t len)static int init_display (struct fbtft_par *par) { -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 );fbtft_par_dbg (DEBUG_INIT_DISPLAY , par,"%s()\n" , __func__);
drivers/staging/fbtft/fb_s6d1121.c +3 -3
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -29,8 +29,8 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ /* Initialization sequence from Lib_UTFT */
drivers/staging/fbtft/fb_sh1106.c +1 -1
@@ -9,7 +9,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
drivers/staging/fbtft/fb_ssd1289.c +3 -3
@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include "fbtft.h"
@@ -28,8 +28,8 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ write_reg (par,0x00 ,0x0001 );write_reg (par,0x03 ,0xA8A4 );
drivers/staging/fbtft/fb_ssd1305.c +2 -2
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -168,7 +168,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }/* Write data */ -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 ); ret = par->fbtftops.write (par, par->txbuf.buf, par->info->var.xres * par->info->var.yres /8 );
drivers/staging/fbtft/fb_ssd1306.c +2 -2
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -190,7 +190,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }/* Write data */ -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 ); ret = par->fbtftops.write (par, par->txbuf.buf, xres * yres /8 );if (ret <0 ) dev_err(par->info->device, "write failed and returned: %d\n",
drivers/staging/fbtft/fb_ssd1325.c +3 -3
@@ -6,7 +6,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -35,7 +35,7 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -gpio_set_value (par->gpio.cs,0 ); +gpiod_set_value (par->gpio.cs,0 );write_reg (par,0xb3 );write_reg (par,0xf0 );
@@ -155,7 +155,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) } } -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 );/* Write data */ ret = par->fbtftops.write(par, par->txbuf.buf,
drivers/staging/fbtft/fb_ssd1331.c +5 -5
@@ -2,7 +2,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -80,8 +80,8 @@ 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 !=-1 ) -gpio_set_value (par->gpio.dc,0 ); +if (!par->gpio.dc) +gpiod_set_value (par->gpio.dc,0 ); ret = par->fbtftops.write (par, par->buf,sizeof (u8));if (ret <0 ) {va_end (args);
@@ -103,8 +103,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)return ; } } -if (par->gpio.dc !=-1 ) -gpio_set_value (par->gpio.dc,1 ); +if (!par->gpio.dc) +gpiod_set_value (par->gpio.dc,1 );va_end (args); }
drivers/staging/fbtft/fb_ssd1351.c +1 -1
@@ -2,7 +2,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
drivers/staging/fbtft/fb_tls8204.c +3 -3
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -94,7 +94,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)/* The display is 102x68 but the LCD is 84x48. * Set the write pointer at the start of each row. */ -gpio_set_value (par->gpio.dc,0 ); +gpiod_set_value (par->gpio.dc,0 );write_reg (par,0x80 |0 );write_reg (par,0x40 | y);
@@ -109,7 +109,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) *buf++ = ch; }/* Write the row */ -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 ); ret = par->fbtftops.write (par, par->txbuf.buf,WIDTH );if (ret <0 ) { dev_err(par->info->device,
drivers/staging/fbtft/fb_uc1611.c +2 -2
@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -251,7 +251,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }break ; } -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 );/* Write data */ ret = par->fbtftops.write (par, par->txbuf.buf, len /2 );
drivers/staging/fbtft/fb_uc1701.c +3 -3
@@ -11,7 +11,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -136,9 +136,9 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)write_reg (par,LCD_PAGE_ADDRESS | (u8 )y);write_reg (par,0x00 );write_reg (par,LCD_COL_ADDRESS ); -gpio_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 ); ret = par->fbtftops.write (par, par->txbuf.buf,WIDTH ); -gpio_set_value (par->gpio.dc,0 ); +gpiod_set_value (par->gpio.dc,0 ); }if (ret <0 )
drivers/staging/fbtft/fb_upd161704.c +3 -3
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -26,8 +26,8 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs !=-1 ) -gpio_set_value (par->gpio.cs,0 );/* Activate chip */ +if (!par->gpio.cs) +gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ /* Initialization sequence from Lib_UTFT */
drivers/staging/fbtft/fb_watterott.c +2 -2
@@ -8,7 +8,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -213,7 +213,7 @@ static int set_var(struct fbtft_par *par)static int verify_gpios (struct fbtft_par *par) { -if (par->gpio.reset <0 ) { +if (!par->gpio.reset) {dev_err (par->info->device,"Missing 'reset' gpio. Aborting.\n" );return -EINVAL ; }
drivers/staging/fbtft/fbtft-bus.c +3 -3
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/export.h> #include <linux/errno.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include "fbtft.h"
@@ -135,8 +135,8 @@ 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 !=-1 ) -gpio_set_value (par->gpio.dc,1 ); +if (!par->gpio.dc) +gpiod_set_value (par->gpio.dc,1 );/* non buffered write */ if (!par->txbuf.buf)
drivers/staging/fbtft/fbtft-core.c +29 -144
281 lines not on this page · raw message
drivers/staging/fbtft/fbtft-io.c +13 -13
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/export.h> #include <linux/errno.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include "fbtft.h"
@@ -142,30 +142,30 @@ int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len) data = *(u8 *)buf;/* Start writing by pulling down /WR */ -gpio_set_value (par->gpio.wr,0 ); +gpiod_set_value (par->gpio.wr,0 );/* Set data */ #ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO if (data == prev_data) { -gpio_set_value (par->gpio.wr,0 );/* used as delay */ +gpiod_set_value (par->gpio.wr,0 );/* used as delay */ }else {for (i =0 ; i <8 ; i++) {if ((data &1 ) != (prev_data &1 )) -gpio_set_value (par->gpio.db[i], - data &1 ); +gpiod_set_value (par->gpio.db[i], + data &1 ); data >>=1 ; prev_data >>=1 ; } }#else for (i =0 ; i <8 ; i++) { -gpio_set_value (par->gpio.db[i], data &1 ); +gpiod_set_value (par->gpio.db[i], data &1 ); data >>=1 ; }#endif /* Pullup /WR */ -gpio_set_value (par->gpio.wr,1 ); +gpiod_set_value (par->gpio.wr,1 );#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO prev_data = *(u8 *)buf;
@@ -192,30 +192,30 @@ int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len) data = *(u16 *)buf;/* Start writing by pulling down /WR */ -gpio_set_value (par->gpio.wr,0 ); +gpiod_set_value (par->gpio.wr,0 );/* Set data */ #ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO if (data == prev_data) { -gpio_set_value (par->gpio.wr,0 );/* used as delay */ +gpiod_set_value (par->gpio.wr,0 );/* used as delay */ }else {for (i =0 ; i <16 ; i++) {if ((data &1 ) != (prev_data &1 )) -gpio_set_value (par->gpio.db[i], - data &1 ); +gpiod_set_value (par->gpio.db[i], + data &1 ); data >>=1 ; prev_data >>=1 ; } }#else for (i =0 ; i <16 ; i++) { -gpio_set_value (par->gpio.db[i], data &1 ); +gpiod_set_value (par->gpio.db[i], data &1 ); data >>=1 ; }#endif /* Pullup /WR */ -gpio_set_value (par->gpio.wr,1 ); +gpiod_set_value (par->gpio.wr,1 );#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO prev_data = *(u16 *)buf;
drivers/staging/fbtft/fbtft.h +10 -11
@@ -27,7 +27,7 @@*/ struct fbtft_gpio {char name[FBTFT_GPIO_NAME_SIZE ]; -unsigned int gpio; +struct gpio_desc *gpio; };struct fbtft_par ;
@@ -134,7 +134,6 @@ struct fbtft_display {*/ struct fbtft_platform_data {struct fbtft_display display; -const struct fbtft_gpio *gpios;unsigned int rotate;bool bgr;unsigned int fps;
@@ -207,15 +206,15 @@ struct fbtft_par {unsigned int dirty_lines_start;unsigned int dirty_lines_end;struct { -int reset; -int dc; -int rd; -int wr; -int latch; -int cs; -int db[16 ]; -int led[16 ]; -int aux[16 ]; +struct gpio_desc *reset; +struct gpio_desc *dc; +struct gpio_desc *rd; +struct gpio_desc *wr; +struct gpio_desc *latch; +struct gpio_desc *cs; +struct gpio_desc *db[16 ]; +struct gpio_desc *led[16 ]; +struct gpio_desc *aux[16 ]; } gpio;const s16 *init_sequence;struct {
drivers/staging/fbtft/fbtft_device.c +8 -336
718 lines not on this page · raw message
drivers/staging/fbtft/flexfb.c +6 -6
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/vmalloc.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
@@ -521,7 +521,7 @@ static int flexfb_verify_gpios_dc(struct fbtft_par *par) {fbtft_par_dbg (DEBUG_VERIFY_GPIOS , par,"%s()\n" , __func__); -if (par->gpio.dc <0 ) { +if (!par->gpio.dc) {dev_err (par->info->device,"Missing info about 'dc' gpio. Aborting.\n" );return -EINVAL ;
@@ -537,22 +537,22 @@ static int flexfb_verify_gpios_db(struct fbtft_par *par)fbtft_par_dbg (DEBUG_VERIFY_GPIOS , par,"%s()\n" , __func__); -if (par->gpio.dc <0 ) { +if (!par->gpio.dc) {dev_err (par->info->device,"Missing info about 'dc' gpio. Aborting.\n" );return -EINVAL ; } -if (par->gpio.wr <0 ) { +if (!par->gpio.wr) {dev_err (par->info->device,"Missing info about 'wr' gpio. Aborting.\n" );return -EINVAL ; } -if (latched && (par->gpio.latch <0 )) { +if (latched && !par->gpio.latch) {dev_err (par->info->device,"Missing info about 'latch' gpio. Aborting.\n" );return -EINVAL ; }if (latched) num_db = buswidth /2 ;for (i =0 ; i < num_db; i++) { -if (par->gpio.db[i] <0 ) { +if (!par->gpio.db[i]) {dev_err (par->info->device,"Missing info about 'db%02d' gpio. Aborting.\n" , i);
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 11 lines · Nishad Kamdar
This switches the fbtft driver to use GPIO descriptors rather than numerical gpios:
Utilize the GPIO library's intrinsic handling of OF GPIOs and polarity. If the line is flagged active low, gpiolib will deal with this.
Remove gpios from platform device structure. Neither assign statically numbers to gpios in platform device nor allow gpios to be parsed as module parameters.
Quoted 6 lines
Signed-off-by Nishad Kamdar <[email protected]>Changes in v2:
- Merge all patches in a single patch. This is because the first patch changespar->gpiofrom an int to a pointer so all the checks have to be updated in the same patch. Otherwie it breaks 'git bisect'.
The "v2" information goes below the --- line please.
Also, I got 2 copies of this, both different, so I have no idea which to apply. Please fix up and resend a v3.
thanks,
greg k-h
Quoted 19 lines · Greg Kroah-Hartman
Quoted 11 lines · Nishad Kamdar
This switches the fbtft driver to use GPIO descriptors rather than numerical gpios:
Utilize the GPIO library's intrinsic handling of OF GPIOs and polarity. If the line is flagged active low, gpiolib will deal with this.
Remove gpios from platform device structure. Neither assign statically numbers to gpios in platform device nor allow gpios to be parsed as module parameters.
Quoted 6 lines
Signed-off-by Nishad Kamdar <[email protected]>Changes in v2:
- Merge all patches in a single patch. This is because the first patch changespar->gpiofrom an int to a pointer so all the checks have to be updated in the same patch. Otherwie it breaks 'git bisect'.
Quoted 5 lines
The "v2" information goes below the --- line please.
Also, I got 2 copies of this, both different, so I have no idea which to apply. Please fix up and resend a v3.
Sorry for the confusion. I'll fix and resend.
Quoted 3 lines
thanks,
greg k-h
Thanks for the review.
Regards,
Nishad