staging: fbtft: Fixing GPIO handling issues
Subsystems (3)
v4 cover staging: fbtft: Fixing GPIO handling issues
This series fixes a number of GPIO handling issues after converting this driver to use descriptors.
The series has been tested on HX8347d display with parallel interface. Without first patch it's not working.
In v4:
- fixed Fixes tags (Greg)
- added return statement to dev_err_probe() (Dan)
- new patch to support orientation on HX8347d
In v3:
- added staging prefix (Fabio)
- slightly amended commit message in the patch 1
- added Rb tag (Phil)
- dropped Fixes tag from the patch 2 (Greg)
Andy Shevchenko (5):
staging: fbtft: Rectify GPIO handling
staging: fbtft: Don't spam logs when probe is deferred
staging: fbtft: Add support for orientation on Himax HX8347d
staging: fbtft: Replace custom ->reset() with generic one
staging: fbtft: Update TODO
drivers/staging/fbtft/TODO | 5 ----- drivers/staging/fbtft/fb_agm1264k-fl.c | 30 +++++++------------------- drivers/staging/fbtft/fb_bd663474.c | 4 ---- drivers/staging/fbtft/fb_hx8347d.c | 29 ++++++++++++++++++++++--- drivers/staging/fbtft/fb_ili9163.c | 4 ---- drivers/staging/fbtft/fb_ili9320.c | 1 - drivers/staging/fbtft/fb_ili9325.c | 4 ---- drivers/staging/fbtft/fb_ili9340.c | 1 - drivers/staging/fbtft/fb_s6d1121.c | 4 ---- drivers/staging/fbtft/fb_sh1106.c | 1 - drivers/staging/fbtft/fb_ssd1289.c | 4 ---- drivers/staging/fbtft/fb_ssd1325.c | 2 -- drivers/staging/fbtft/fb_ssd1331.c | 6 ++---- drivers/staging/fbtft/fb_ssd1351.c | 1 - drivers/staging/fbtft/fb_upd161704.c | 4 ---- drivers/staging/fbtft/fb_watterott.c | 1 - drivers/staging/fbtft/fbtft-bus.c | 3 +-- drivers/staging/fbtft/fbtft-core.c | 25 +++++++++------------ drivers/staging/fbtft/fbtft-io.c | 12 +++++------ 19 files changed, 53 insertions(+), 88 deletions(-)
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 1/5 staging: fbtft: Rectify GPIO handling
The infamous commit c440eee1a7a1 ("Staging: staging: fbtft: Switch to the GPIO descriptor interface") broke GPIO handling completely. It has already four commits to rectify and it seems not enough. In order to fix the mess here we:
1) Set default to "inactive" for all requested pins
2) Fix CS#, RD#, and WR# pins polarity since it's active low and GPIO descriptor interface takes it into consideration from the Device Tree or ACPI
3) Consolidate chip activation (CS# assertion) under default
->reset() callback
To summarize the expectations about polarity for GPIOs:
RD# Low
WR# Low
CS# Low
RESET# Low
DC or RS High
RW High
Data 0 .. 15 High
See also Adafruit learning course [1] for the example of the schematics.
While at it, drop unneeded NULL checks, since GPIO API is tolerant to that.
[1]: https://learn.adafruit.com/adafruit-2-8-and-3-2-color-tft-touchscreen-breakout-v2/downloads
--- drivers/staging/fbtft/fb_agm1264k-fl.c | 20 ++++++++++---------- drivers/staging/fbtft/fb_bd663474.c | 4 ---- drivers/staging/fbtft/fb_ili9163.c | 4 ---- drivers/staging/fbtft/fb_ili9320.c | 1 - drivers/staging/fbtft/fb_ili9325.c | 4 ---- drivers/staging/fbtft/fb_ili9340.c | 1 - drivers/staging/fbtft/fb_s6d1121.c | 4 ---- drivers/staging/fbtft/fb_sh1106.c | 1 - drivers/staging/fbtft/fb_ssd1289.c | 4 ---- drivers/staging/fbtft/fb_ssd1325.c | 2 -- drivers/staging/fbtft/fb_ssd1331.c | 6 ++---- drivers/staging/fbtft/fb_ssd1351.c | 1 - drivers/staging/fbtft/fb_upd161704.c | 4 ---- drivers/staging/fbtft/fb_watterott.c | 1 - drivers/staging/fbtft/fbtft-bus.c | 3 +-- drivers/staging/fbtft/fbtft-core.c | 13 ++++++------- drivers/staging/fbtft/fbtft-io.c | 12 ++++++------ 17 files changed, 25 insertions(+), 60 deletions(-)
drivers/staging/fbtft/fb_agm1264k-fl.c +10 -10
@@ -84,9 +84,9 @@ static void reset(struct fbtft_par *par)dev_dbg (par->info->device,"%s()\n" , __func__); -gpiod_set_value (par->gpio.reset,0 ); -udelay (20 );gpiod_set_value (par->gpio.reset,1 ); +udelay (20 ); +gpiod_set_value (par->gpio.reset,0 );mdelay (120 ); }
@@ -194,12 +194,12 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)/* select chip */ if (*buf) {/* cs1 */ -gpiod_set_value (par->CS0,1 ); -gpiod_set_value (par->CS1,0 ); - }else { -/* cs0 */ gpiod_set_value (par->CS0,0 );gpiod_set_value (par->CS1,1 ); + }else { +/* cs0 */ +gpiod_set_value (par->CS0,1 ); +gpiod_set_value (par->CS1,0 ); }gpiod_set_value (par->RS,0 );/* RS->0 (command mode) */
@@ -397,8 +397,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) }kfree (convert_buf); -gpiod_set_value (par->CS0,1 ); -gpiod_set_value (par->CS1,1 ); +gpiod_set_value (par->CS0,0 ); +gpiod_set_value (par->CS1,0 );return ret; }
@@ -419,10 +419,10 @@ static int write(struct fbtft_par *par, void *buf, size_t len)for (i =0 ; i <8 ; ++i)gpiod_set_value (par->gpio.db[i], data & (1 << i));/* set E */ -gpiod_set_value (par->EPIN,1 ); +gpiod_set_value (par->EPIN,0 );udelay (5 );/* unset E - write */ -gpiod_set_value (par->EPIN,0 ); +gpiod_set_value (par->EPIN,1 );udelay (1 ); }
drivers/staging/fbtft/fb_bd663474.c +0 -4
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -24,9 +23,6 @@static int init_display (struct fbtft_par *par) { -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ - par->fbtftops.reset (par);/* Initialization sequence from Lib_UTFT */
drivers/staging/fbtft/fb_ili9163.c +0 -4
@@ -11,7 +11,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include <video/mipi_display.h>
@@ -77,9 +76,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ -write_reg (par,MIPI_DCS_SOFT_RESET );/* software reset */ mdelay (500 );write_reg (par,MIPI_DCS_EXIT_SLEEP_MODE );/* exit sleep */
drivers/staging/fbtft/fb_ili9320.c +0 -1
@@ -8,7 +8,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
drivers/staging/fbtft/fb_ili9325.c +0 -4
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -85,9 +84,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ - bt &=0x07 ; vc &=0x07 ; vrh &=0x0f ;
drivers/staging/fbtft/fb_ili9340.c +0 -1
@@ -8,7 +8,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include <video/mipi_display.h>
drivers/staging/fbtft/fb_s6d1121.c +0 -4
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -29,9 +28,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ -/* Initialization sequence from Lib_UTFT */ write_reg (par,0x0011 ,0x2004 );
drivers/staging/fbtft/fb_sh1106.c +0 -1
@@ -9,7 +9,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
drivers/staging/fbtft/fb_ssd1289.c +0 -4
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include "fbtft.h"
@@ -28,9 +27,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ -write_reg (par,0x00 ,0x0001 );write_reg (par,0x03 ,0xA8A4 );write_reg (par,0x0C ,0x0000 );
drivers/staging/fbtft/fb_ssd1325.c +0 -2
@@ -35,8 +35,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -gpiod_set_value (par->gpio.cs,0 ); -write_reg (par,0xb3 );write_reg (par,0xf0 );write_reg (par,0xae );
drivers/staging/fbtft/fb_ssd1331.c +2 -4
@@ -81,8 +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) -gpiod_set_value (par->gpio.dc,0 ); +gpiod_set_value (par->gpio.dc,0 ); ret = par->fbtftops.write (par, par->buf,sizeof (u8));if (ret <0 ) {va_end (args);
@@ -104,8 +103,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)return ; } } -if (par->gpio.dc) -gpiod_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 );va_end (args); }
drivers/staging/fbtft/fb_ssd1351.c +0 -1
@@ -2,7 +2,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/spi/spi.h> #include <linux/delay.h>
drivers/staging/fbtft/fb_upd161704.c +0 -4
@@ -12,7 +12,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
@@ -26,9 +25,6 @@ static int init_display(struct fbtft_par *par) { par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ -/* Initialization sequence from Lib_UTFT */ /* register reset */
drivers/staging/fbtft/fb_watterott.c +0 -1
@@ -8,7 +8,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/gpio/consumer.h> #include <linux/delay.h> #include "fbtft.h"
drivers/staging/fbtft/fbtft-bus.c +1 -2
@@ -135,8 +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) -gpiod_set_value (par->gpio.dc,1 ); +gpiod_set_value (par->gpio.dc,1 );/* non buffered write */ if (!par->txbuf.buf)
drivers/staging/fbtft/fbtft-core.c +6 -7
@@ -38,8 +38,7 @@ int fbtft_write_buf_dc(struct fbtft_par *par, void *buf, size_t len, int dc) {int ret; -if (par->gpio.dc) -gpiod_set_value (par->gpio.dc, dc); +gpiod_set_value (par->gpio.dc, dc); ret = par->fbtftops.write (par, buf, len);if (ret <0 )
@@ -79,7 +78,7 @@ static int fbtft_request_one_gpio(struct fbtft_par *par,int ret =0 ; *gpiop =devm_gpiod_get_index_optional (dev, name, index, -GPIOD_OUT_HIGH ); +GPIOD_OUT_LOW );if (IS_ERR (*gpiop)) { ret =PTR_ERR (*gpiop); dev_err(dev,
@@ -226,11 +225,15 @@ static void fbtft_reset(struct fbtft_par *par) {if (!par->gpio.reset)return ; +fbtft_par_dbg (DEBUG_RESET , par,"%s()\n" , __func__); +gpiod_set_value_cansleep (par->gpio.reset,1 );usleep_range (20 ,40 );gpiod_set_value_cansleep (par->gpio.reset,0 );msleep (120 ); + +gpiod_set_value_cansleep (par->gpio.cs,1 );/* Activate chip */ } static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
@@ -922,8 +925,6 @@ static int fbtft_init_display_from_property(struct fbtft_par *par) goto out_free; par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ index =-1 ; val = values[++index];
@@ -1018,8 +1019,6 @@ int fbtft_init_display(struct fbtft_par *par) } par->fbtftops.reset (par); -if (par->gpio.cs) -gpiod_set_value (par->gpio.cs,0 );/* Activate chip */ i =0 ;while (i <FBTFT_MAX_INIT_SEQUENCE ) {
drivers/staging/fbtft/fbtft-io.c +6 -6
@@ -142,12 +142,12 @@ int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len) data = *(u8 *)buf;/* Start writing by pulling down /WR */ -gpiod_set_value (par->gpio.wr,0 ); +gpiod_set_value (par->gpio.wr,1 );/* Set data */ #ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO if (data == prev_data) { -gpiod_set_value (par->gpio.wr,0 );/* used as delay */ +gpiod_set_value (par->gpio.wr,1 );/* used as delay */ }else {for (i =0 ; i <8 ; i++) {if ((data &1 ) != (prev_data &1 ))
@@ -165,7 +165,7 @@ int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len)#endif /* Pullup /WR */ -gpiod_set_value (par->gpio.wr,1 ); +gpiod_set_value (par->gpio.wr,0 );#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO prev_data = *(u8 *)buf;
@@ -192,12 +192,12 @@ int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len) data = *(u16 *)buf;/* Start writing by pulling down /WR */ -gpiod_set_value (par->gpio.wr,0 ); +gpiod_set_value (par->gpio.wr,1 );/* Set data */ #ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO if (data == prev_data) { -gpiod_set_value (par->gpio.wr,0 );/* used as delay */ +gpiod_set_value (par->gpio.wr,1 );/* used as delay */ }else {for (i =0 ; i <16 ; i++) {if ((data &1 ) != (prev_data &1 ))
@@ -215,7 +215,7 @@ int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len)#endif /* Pullup /WR */ -gpiod_set_value (par->gpio.wr,1 ); +gpiod_set_value (par->gpio.wr,0 );#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO prev_data = *(u16 *)buf;
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 2/5 staging: fbtft: Don't spam logs when probe is deferred
In reply to Andy ShevchenkoWhen requesting GPIO line the probe can be deferred. In such case don't spam logs with an error message. This can be achieved by switching to dev_err_probe().
--- drivers/staging/fbtft/fbtft-core.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/fbtft/fbtft-core.c +4 -8
@@ -75,20 +75,16 @@ static int fbtft_request_one_gpio(struct fbtft_par *par, struct gpio_desc **gpiop) {struct device *dev = par->info->device; -int ret =0 ; *gpiop =devm_gpiod_get_index_optional (dev, name, index,GPIOD_OUT_LOW ); -if (IS_ERR (*gpiop)) { - ret =PTR_ERR (*gpiop); -dev_err (dev, -"Failed to request %s GPIO: %d\n" , name, ret); -return ret; - } +if (IS_ERR (*gpiop)) +return dev_err_probe (dev,PTR_ERR (*gpiop),"Failed to request %s GPIO\n" , name); +fbtft_par_dbg (DEBUG_REQUEST_GPIOS , par,"%s: '%s' GPIO\n" , __func__, name); -return ret; +return 0 ; }static int fbtft_request_gpios (struct fbtft_par *par)
Signature · 1 line
2.30.2
PATCH v4 3/5 staging: fbtft: Add support for orientation on Himax HX8347d
In reply to Andy ShevchenkoHimax HX8347d has non-standard register to control orientation. Add support for different orientation values.
--- drivers/staging/fbtft/fb_hx8347d.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
drivers/staging/fbtft/fb_hx8347d.c +26 -3
@@ -68,9 +68,6 @@ static int init_display(struct fbtft_par *par)mdelay (40 );write_reg (par,0x28 ,0x3C ); -/* orientation */ -write_reg (par,0x16 ,0x60 | (par->bgr <<3 )); -return 0 ; }
@@ -87,6 +84,31 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)write_reg (par,0x22 ); } +#define MEM_Y BIT(7)/* MY row address order */ +#define MEM_X BIT(6)/* MX column address order */ +#define MEM_V BIT(5)/* MV row / column exchange */ +#define MEM_L BIT(4)/* ML vertical refresh order */ +#define MEM_BGR (3)/* RGB-BGR Order */ +static int set_var (struct fbtft_par *par) +{ +switch (par->info->var.rotate) { +case 0 : +write_reg (par,0x16 ,MEM_V |MEM_X | (par->bgr <<MEM_BGR )); +break ; +case 270 : +write_reg (par,0x16 , par->bgr <<MEM_BGR ); +break ; +case 180 : +write_reg (par,0x16 ,MEM_V |MEM_Y | (par->bgr <<MEM_BGR )); +break ; +case 90 : +write_reg (par,0x16 ,MEM_X |MEM_Y | (par->bgr <<MEM_BGR )); +break ; + } + +return 0 ; +} +/* * Gamma string format: * VRP0 VRP1 VRP2 VRP3 VRP4 VRP5 PRP0 PRP1 PKP0 PKP1 PKP2 PKP3 PKP4 CGM
@@ -144,6 +166,7 @@ static struct fbtft_display display = { .fbtftops = { .init_display = init_display, .set_addr_win = set_addr_win, + .set_var = set_var, .set_gamma = set_gamma, }, };
Signature · 1 line
2.30.2
PATCH v4 4/5 staging: fbtft: Replace custom ->reset() with generic one
In reply to Andy ShevchenkoThe custom ->reset() repeats the generic one, replace it.
Note, in newer kernels the context of the function is a sleeping one, it's fine to switch over to the sleeping functions. Keeping the reset line asserted longer than 20 microseconds is also okay, it's an idling state of the hardware.
--- drivers/staging/fbtft/fb_agm1264k-fl.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/fbtft/fb_agm1264k-fl.c +0 -14
@@ -77,19 +77,6 @@ static int init_display(struct fbtft_par *par)return 0 ; } -static void reset (struct fbtft_par *par) -{ -if (!par->gpio.reset) -return ; - -dev_dbg (par->info->device,"%s()\n" , __func__); - -gpiod_set_value (par->gpio.reset,1 ); -udelay (20 ); -gpiod_set_value (par->gpio.reset,0 ); -mdelay (120 ); -} -/* Check if all necessary GPIOS defined */ static int verify_gpios (struct fbtft_par *par) {
@@ -439,7 +426,6 @@ static struct fbtft_display display = { .set_addr_win = set_addr_win, .verify_gpios = verify_gpios, .request_gpios_match = request_gpios_match, - .reset = reset, .write = write, .write_register = write_reg8_bus8, .write_vmem = write_vmem,
Signature · 1 line
2.30.2
PATCH v4 5/5 staging: fbtft: Update TODO
In reply to Andy ShevchenkoNow, after a few fixes we may consider the conversion to the GPIO descriptor API is done.
--- drivers/staging/fbtft/TODO | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/fbtft/TODO +0 -5
@@ -1,8 +1,3 @@ -* convert all uses of the old GPIO API from <linux/gpio.h> to the - GPIO descriptor API in <linux/gpio/consumer.h> and look up GPIO - lines from device tree, ACPI or board files, board files should - use <linux/gpio/machine.h> - * convert all these over to drm_simple_display_pipe and submit for inclusion into the DRM subsystem under drivers/gpu/drm - fbdev doesn't take any new drivers anymore.
Signature · 1 line
2.30.2