diff options
author | 2016-04-11 10:41:07 +0300 | |
---|---|---|
committer | 2016-04-13 08:17:18 +0300 | |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/fbtft/fbtft-bus.c | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/fbtft/fbtft-bus.c')
-rw-r--r-- | kernel/drivers/staging/fbtft/fbtft-bus.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/kernel/drivers/staging/fbtft/fbtft-bus.c b/kernel/drivers/staging/fbtft/fbtft-bus.c index 52af9cbbc..58449ad84 100644 --- a/kernel/drivers/staging/fbtft/fbtft-bus.c +++ b/kernel/drivers/staging/fbtft/fbtft-bus.c @@ -4,9 +4,6 @@ #include <linux/spi/spi.h> #include "fbtft.h" - - - /***************************************************************************** * * void (*write_reg)(struct fbtft_par *par, int len, ...); @@ -41,7 +38,7 @@ void func(struct fbtft_par *par, int len, ...) \ *buf = modifier((type)va_arg(args, unsigned int)); \ if (par->gpio.dc != -1) \ gpio_set_value(par->gpio.dc, 0); \ - ret = par->fbtftops.write(par, par->buf, sizeof(type)+offset); \ + ret = par->fbtftops.write(par, par->buf, sizeof(type) + offset); \ if (ret < 0) { \ va_end(args); \ dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ @@ -59,7 +56,8 @@ void func(struct fbtft_par *par, int len, ...) \ } \ if (par->gpio.dc != -1) \ gpio_set_value(par->gpio.dc, 1); \ - ret = par->fbtftops.write(par, par->buf, len * (sizeof(type)+offset)); \ + ret = par->fbtftops.write(par, par->buf, \ + len * (sizeof(type) + offset)); \ if (ret < 0) { \ va_end(args); \ dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ @@ -117,9 +115,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) } EXPORT_SYMBOL(fbtft_write_reg8_bus9); - - - /***************************************************************************** * * int (*write_vmem)(struct fbtft_par *par); @@ -142,7 +137,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) __func__, offset, len); remain = len / 2; - vmem16 = (u16 *)(par->info->screen_base + offset); + vmem16 = (u16 *)(par->info->screen_buffer + offset); if (par->gpio.dc != -1) gpio_set_value(par->gpio.dc, 1); @@ -201,7 +196,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) } remain = len; - vmem8 = par->info->screen_base + offset; + vmem8 = par->info->screen_buffer + offset; tx_array_size = par->txbuf.len / 2; @@ -212,15 +207,15 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) #ifdef __LITTLE_ENDIAN for (i = 0; i < to_copy; i += 2) { - txbuf16[i] = 0x0100 | vmem8[i+1]; - txbuf16[i+1] = 0x0100 | vmem8[i]; + txbuf16[i] = 0x0100 | vmem8[i + 1]; + txbuf16[i + 1] = 0x0100 | vmem8[i]; } #else for (i = 0; i < to_copy; i++) txbuf16[i] = 0x0100 | vmem8[i]; #endif vmem8 = vmem8 + to_copy; - ret = par->fbtftops.write(par, par->txbuf.buf, to_copy*2); + ret = par->fbtftops.write(par, par->txbuf.buf, to_copy * 2); if (ret < 0) return ret; remain -= to_copy; @@ -245,7 +240,7 @@ int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len) fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "%s(offset=%zu, len=%zu)\n", __func__, offset, len); - vmem16 = (u16 *)(par->info->screen_base + offset); + vmem16 = (u16 *)(par->info->screen_buffer + offset); if (par->gpio.dc != -1) gpio_set_value(par->gpio.dc, 1); |