diff options
Diffstat (limited to 'drivers/staging/fbtft')
-rw-r--r-- | drivers/staging/fbtft/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_agm1264k-fl.c | 4 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_ra8875.c | 2 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_ssd1306.c | 3 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_ssd1331.c | 3 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_ssd1351.c | 4 | ||||
-rw-r--r-- | drivers/staging/fbtft/fb_watterott.c | 15 | ||||
-rw-r--r-- | drivers/staging/fbtft/fbtft-io.c | 12 | ||||
-rw-r--r-- | drivers/staging/fbtft/fbtft.h | 1 | ||||
-rw-r--r-- | drivers/staging/fbtft/fbtft_device.c | 2 | ||||
-rw-r--r-- | drivers/staging/fbtft/flexfb.c | 7 |
11 files changed, 28 insertions, 26 deletions
diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig index 84b2e7ebc024..8ec524a95ec8 100644 --- a/drivers/staging/fbtft/Kconfig +++ b/drivers/staging/fbtft/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menuconfig FB_TFT tristate "Support for small TFT LCD display modules" depends on FB && SPI diff --git a/drivers/staging/fbtft/fb_agm1264k-fl.c b/drivers/staging/fbtft/fb_agm1264k-fl.c index 8f27bd8da17d..eeeeec97ad27 100644 --- a/drivers/staging/fbtft/fb_agm1264k-fl.c +++ b/drivers/staging/fbtft/fb_agm1264k-fl.c @@ -383,7 +383,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) /* select right side (sc1) * set addr */ - write_reg(par, 0x01, 1 << 6); + write_reg(par, 0x01, BIT(6)); write_reg(par, 0x01, (0x17 << 3) | (u8)y); /* write bitmap */ @@ -406,7 +406,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 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); + "%s(len=%zu): ", __func__, len); gpiod_set_value(par->RW, 0); /* set write mode */ diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/staging/fbtft/fb_ra8875.c index 70b37fc7fb66..398bdbf53c9a 100644 --- a/drivers/staging/fbtft/fb_ra8875.c +++ b/drivers/staging/fbtft/fb_ra8875.c @@ -24,7 +24,7 @@ static int write_spi(struct fbtft_par *par, void *buf, size_t len) struct spi_message m; fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); if (!par->spi) { dev_err(par->info->device, diff --git a/drivers/staging/fbtft/fb_ssd1306.c b/drivers/staging/fbtft/fb_ssd1306.c index d7c5e2e0eee9..6cf9df579e88 100644 --- a/drivers/staging/fbtft/fb_ssd1306.c +++ b/drivers/staging/fbtft/fb_ssd1306.c @@ -184,7 +184,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) for (y = 0; y < yres / 8; y++) { *buf = 0x00; for (i = 0; i < 8; i++) - *buf |= (vmem16[(y * 8 + i) * xres + x] ? 1 : 0) << i; + if (vmem16[(y * 8 + i) * xres + x]) + *buf |= BIT(i); buf++; } } diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/staging/fbtft/fb_ssd1331.c index 9f54fe28d511..4cfe9f8535d0 100644 --- a/drivers/staging/fbtft/fb_ssd1331.c +++ b/drivers/staging/fbtft/fb_ssd1331.c @@ -74,7 +74,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) for (i = 0; i < len; i++) buf[i] = (u8)va_arg(args, unsigned int); va_end(args); - fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, u8, buf, len, "%s: ", __func__); + fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, + u8, buf, len, "%s: ", __func__); } va_start(args, len); diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c index 9ac78ce30619..900b28d826b2 100644 --- a/drivers/staging/fbtft/fb_ssd1351.c +++ b/drivers/staging/fbtft/fb_ssd1351.c @@ -81,10 +81,10 @@ static int set_var(struct fbtft_par *par) switch (par->info->var.rotate) { case 0: - write_reg(par, 0xA0, remap | 0x00 | 1 << 4); + write_reg(par, 0xA0, remap | 0x00 | BIT(4)); break; case 270: - write_reg(par, 0xA0, remap | 0x03 | 1 << 4); + write_reg(par, 0xA0, remap | 0x03 | BIT(4)); break; case 180: write_reg(par, 0xA0, remap | 0x02); diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c index 0a5206d28da4..27cc8eabcbe9 100644 --- a/drivers/staging/fbtft/fb_watterott.c +++ b/drivers/staging/fbtft/fb_watterott.c @@ -90,15 +90,10 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) return 0; } -#define RGB565toRGB323(c) ((((c) & 0xE000) >> 8) |\ - (((c) & 000600) >> 6) |\ - (((c) & 0x001C) >> 2)) -#define RGB565toRGB332(c) ((((c) & 0xE000) >> 8) |\ - (((c) & 000700) >> 6) |\ - (((c) & 0x0018) >> 3)) -#define RGB565toRGB233(c) ((((c) & 0xC000) >> 8) |\ - (((c) & 000700) >> 5) |\ - (((c) & 0x001C) >> 2)) +static inline int rgb565_to_rgb332(u16 c) +{ + return ((c & 0xE000) >> 8) | ((c & 000700) >> 6) | ((c & 0x0018) >> 3); +} static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len) { @@ -122,7 +117,7 @@ static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len) for (i = start_line; i <= end_line; i++) { pos[1] = cpu_to_be16(i); for (j = 0; j < par->info->var.xres; j++) { - buf8[j] = RGB565toRGB332(*vmem16); + buf8[j] = rgb565_to_rgb332(*vmem16); vmem16++; } ret = par->fbtftops.write(par, diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c index 38cdad6203ea..0863d257d762 100644 --- a/drivers/staging/fbtft/fbtft-io.c +++ b/drivers/staging/fbtft/fbtft-io.c @@ -14,7 +14,7 @@ int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len) struct spi_message m; fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); if (!par->spi) { dev_err(par->info->device, @@ -47,7 +47,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len) u64 val, dc, tmp; fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); if (!par->extra) { dev_err(par->info->device, "%s: error: par->extra is NULL\n", @@ -109,7 +109,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len) txbuf[0] = par->startbyte | 0x3; t.tx_buf = txbuf; fbtft_par_dbg_hex(DEBUG_READ, par, par->info->device, u8, - txbuf, len, "%s(len=%d) txbuf => ", + txbuf, len, "%s(len=%zu) txbuf => ", __func__, len); } @@ -117,7 +117,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len) spi_message_add_tail(&t, &m); ret = spi_sync(par->spi, &m); fbtft_par_dbg_hex(DEBUG_READ, par, par->info->device, u8, buf, len, - "%s(len=%d) buf <= ", __func__, len); + "%s(len=%zu) buf <= ", __func__, len); return ret; } @@ -136,7 +136,7 @@ int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len) #endif fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); while (len--) { data = *(u8 *)buf; @@ -186,7 +186,7 @@ int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len) #endif fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); while (len) { data = *(u16 *)buf; diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 7fdd3b0851ef..9b6bdb62093d 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -238,6 +238,7 @@ struct fbtft_par { /* fbtft-core.c */ int fbtft_write_buf_dc(struct fbtft_par *par, void *buf, size_t len, int dc); +__printf(5, 6) void fbtft_dbg_hex(const struct device *dev, int groupsize, void *buf, size_t len, const char *fmt, ...); struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c index 5f6cd0816d58..44e1410eb3fe 100644 --- a/drivers/staging/fbtft/fbtft_device.c +++ b/drivers/staging/fbtft/fbtft_device.c @@ -965,7 +965,7 @@ static int write_gpio16_wr_slow(struct fbtft_par *par, void *buf, size_t len) #endif fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len, - "%s(len=%d): ", __func__, len); + "%s(len=%zu): ", __func__, len); while (len) { data = *(u16 *)buf; diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c index c5fa59105a43..3747321011fa 100644 --- a/drivers/staging/fbtft/flexfb.c +++ b/drivers/staging/fbtft/flexfb.c @@ -671,7 +671,8 @@ static int flexfb_probe_common(struct spi_device *sdev, break; case 9: if (regwidth == 16) { - dev_err(dev, "argument 'regwidth': %d is not supported with buswidth=%d and SPI.\n", regwidth, buswidth); + dev_err(dev, "argument 'regwidth': %d is not supported with buswidth=%d and SPI.\n", + regwidth, buswidth); return -EINVAL; } par->fbtftops.write_register = fbtft_write_reg8_bus9; @@ -718,7 +719,9 @@ static int flexfb_probe_common(struct spi_device *sdev, par->fbtftops.write_vmem = fbtft_write_vmem16_bus16; break; default: - dev_err(dev, "argument 'buswidth': %d is not supported with parallel.\n", buswidth); + dev_err(dev, + "argument 'buswidth': %d is not supported with parallel.\n", + buswidth); return -EINVAL; } } |