diff options
Diffstat (limited to 'kernel/drivers/staging/fbtft/fbtft.h')
-rw-r--r-- | kernel/drivers/staging/fbtft/fbtft.h | 74 |
1 files changed, 29 insertions, 45 deletions
diff --git a/kernel/drivers/staging/fbtft/fbtft.h b/kernel/drivers/staging/fbtft/fbtft.h index 9fd98cb53..3ccdec94f 100644 --- a/kernel/drivers/staging/fbtft/fbtft.h +++ b/kernel/drivers/staging/fbtft/fbtft.h @@ -10,10 +10,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __LINUX_FBTFT_H @@ -24,7 +20,6 @@ #include <linux/spi/spi.h> #include <linux/platform_device.h> - #define FBTFT_NOP 0x00 #define FBTFT_SWRESET 0x01 #define FBTFT_RDDID 0x04 @@ -251,7 +246,7 @@ struct fbtft_par { } gamma; unsigned long debug; bool first_update_done; - struct timespec update_time; + ktime_t update_time; bool bgr; void *extra; }; @@ -262,40 +257,38 @@ struct fbtft_par { par->fbtftops.write_register(par, NUMARGS(__VA_ARGS__), __VA_ARGS__) /* fbtft-core.c */ -extern void fbtft_dbg_hex(const struct device *dev, - int groupsize, void *buf, size_t len, const char *fmt, ...); -extern struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, - struct device *dev); -extern void fbtft_framebuffer_release(struct fb_info *info); -extern int fbtft_register_framebuffer(struct fb_info *fb_info); -extern int fbtft_unregister_framebuffer(struct fb_info *fb_info); -extern void fbtft_register_backlight(struct fbtft_par *par); -extern void fbtft_unregister_backlight(struct fbtft_par *par); -extern int fbtft_init_display(struct fbtft_par *par); -extern int fbtft_probe_common(struct fbtft_display *display, - struct spi_device *sdev, struct platform_device *pdev); -extern int fbtft_remove_common(struct device *dev, struct fb_info *info); +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, + struct device *dev, + struct fbtft_platform_data *pdata); +void fbtft_framebuffer_release(struct fb_info *info); +int fbtft_register_framebuffer(struct fb_info *fb_info); +int fbtft_unregister_framebuffer(struct fb_info *fb_info); +void fbtft_register_backlight(struct fbtft_par *par); +void fbtft_unregister_backlight(struct fbtft_par *par); +int fbtft_init_display(struct fbtft_par *par); +int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev, + struct platform_device *pdev); +int fbtft_remove_common(struct device *dev, struct fb_info *info); /* fbtft-io.c */ -extern int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len); -extern int fbtft_write_spi_emulate_9(struct fbtft_par *par, - void *buf, size_t len); -extern int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len); -extern int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len); -extern int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len); -extern int fbtft_write_gpio16_wr_latched(struct fbtft_par *par, - void *buf, size_t len); +int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len); +int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len); +int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len); +int fbtft_write_gpio8_wr(struct fbtft_par *par, void *buf, size_t len); +int fbtft_write_gpio16_wr(struct fbtft_par *par, void *buf, size_t len); +int fbtft_write_gpio16_wr_latched(struct fbtft_par *par, void *buf, size_t len); /* fbtft-bus.c */ -extern int fbtft_write_vmem8_bus8(struct fbtft_par *par, size_t offset, size_t len); -extern int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len); -extern int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len); -extern int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len); -extern void fbtft_write_reg8_bus8(struct fbtft_par *par, int len, ...); -extern void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...); -extern void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...); -extern void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...); - +int fbtft_write_vmem8_bus8(struct fbtft_par *par, size_t offset, size_t len); +int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len); +int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len); +int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len); +void fbtft_write_reg8_bus8(struct fbtft_par *par, int len, ...); +void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...); +void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...); +void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...); #define FBTFT_REGISTER_DRIVER(_name, _compatible, _display) \ \ @@ -334,7 +327,6 @@ MODULE_DEVICE_TABLE(of, dt_ids); \ static struct spi_driver fbtft_driver_spi_driver = { \ .driver = { \ .name = _name, \ - .owner = THIS_MODULE, \ .of_match_table = of_match_ptr(dt_ids), \ }, \ .probe = fbtft_driver_probe_spi, \ @@ -370,7 +362,6 @@ static void __exit fbtft_driver_module_exit(void) \ module_init(fbtft_driver_module_init); \ module_exit(fbtft_driver_module_exit); - /* Debug macros */ /* shorthand debug levels */ @@ -416,7 +407,6 @@ module_exit(fbtft_driver_module_exit); #define DEBUG_REQUEST_GPIOS_MATCH (1<<30) #define DEBUG_VERIFY_GPIOS (1<<31) - #define fbtft_init_dbg(dev, format, arg...) \ do { \ if (unlikely((dev)->platform_data && \ @@ -430,12 +420,6 @@ do { \ dev_info(par->info->device, format, ##arg); \ } while (0) -#define fbtft_dev_dbg(level, par, dev, format, arg...) \ -do { \ - if (unlikely(par->debug & level)) \ - dev_info(dev, format, ##arg); \ -} while (0) - #define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \ do { \ if (unlikely(par->debug & level)) \ |