From 8708cc3c5c703787f965047d7b93cbb9af40290a Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Sun, 29 Apr 2012 19:45:57 +0000 Subject: [PATCH] --- yaml --- r: 310266 b: refs/heads/master c: 3499b1d829649880be07248d6339d060266bbe96 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/Kconfig | 35 +- trunk/drivers/video/Makefile | 3 + trunk/drivers/video/auo_k1900fb.c | 198 ++++++ trunk/drivers/video/auo_k1901fb.c | 251 +++++++ trunk/drivers/video/auo_k190x.c | 1046 ++++++++++++++++++++++++++++ trunk/drivers/video/auo_k190x.h | 129 ++++ trunk/drivers/video/cobalt_lcdfb.c | 45 +- trunk/drivers/video/fb_defio.c | 4 + trunk/drivers/video/smscufx.c | 2 +- trunk/drivers/video/udlfb.c | 2 +- trunk/include/linux/fb.h | 1 + trunk/include/video/auo_k190xfb.h | 106 +++ 13 files changed, 1819 insertions(+), 5 deletions(-) create mode 100644 trunk/drivers/video/auo_k1900fb.c create mode 100644 trunk/drivers/video/auo_k1901fb.c create mode 100644 trunk/drivers/video/auo_k190x.c create mode 100644 trunk/drivers/video/auo_k190x.h create mode 100644 trunk/include/video/auo_k190xfb.h diff --git a/[refs] b/[refs] index b0053b70efc1..643c206d4f7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aac63a4ac861476858d24a5a8b09098b1ef9c54d +refs/heads/master: 3499b1d829649880be07248d6339d060266bbe96 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index a290be51a1f4..0217f7415ef5 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -2210,7 +2210,7 @@ config FB_XILINX config FB_COBALT tristate "Cobalt server LCD frame buffer support" - depends on FB && MIPS_COBALT + depends on FB && (MIPS_COBALT || MIPS_SEAD3) config FB_SH7760 bool "SH7760/SH7763/SH7720/SH7721 LCDC support" @@ -2382,6 +2382,39 @@ config FB_BROADSHEET and could also have been called by other names when coupled with a bridge adapter. +config FB_AUO_K190X + tristate "AUO-K190X EPD controller support" + depends on FB + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_DEFERRED_IO + help + Provides support for epaper controllers from the K190X series + of AUO. These controllers can be used to drive epaper displays + from Sipix. + + This option enables the common support, shared by the individual + controller drivers. You will also have to enable the driver + for the controller type used in your device. + +config FB_AUO_K1900 + tristate "AUO-K1900 EPD controller support" + depends on FB && FB_AUO_K190X + help + This driver implements support for the AUO K1900 epd-controller. + This controller can drive Sipix epaper displays but can only do + serial updates, reducing the number of possible frames per second. + +config FB_AUO_K1901 + tristate "AUO-K1901 EPD controller support" + depends on FB && FB_AUO_K190X + help + This driver implements support for the AUO K1901 epd-controller. + This controller can drive Sipix epaper displays and supports + concurrent updates, making higher frames per second possible. + config FB_JZ4740 tristate "JZ4740 LCD framebuffer support" depends on FB && MACH_JZ4740 diff --git a/trunk/drivers/video/Makefile b/trunk/drivers/video/Makefile index 9356add945b3..ee8dafb69e36 100644 --- a/trunk/drivers/video/Makefile +++ b/trunk/drivers/video/Makefile @@ -118,6 +118,9 @@ obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o obj-$(CONFIG_FB_MAXINE) += maxinefb.o obj-$(CONFIG_FB_METRONOME) += metronomefb.o obj-$(CONFIG_FB_BROADSHEET) += broadsheetfb.o +obj-$(CONFIG_FB_AUO_K190X) += auo_k190x.o +obj-$(CONFIG_FB_AUO_K1900) += auo_k1900fb.o +obj-$(CONFIG_FB_AUO_K1901) += auo_k1901fb.o obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o obj-$(CONFIG_FB_SH7760) += sh7760fb.o obj-$(CONFIG_FB_IMX) += imxfb.o diff --git a/trunk/drivers/video/auo_k1900fb.c b/trunk/drivers/video/auo_k1900fb.c new file mode 100644 index 000000000000..c36cf961dcb2 --- /dev/null +++ b/trunk/drivers/video/auo_k1900fb.c @@ -0,0 +1,198 @@ +/* + * auok190xfb.c -- FB driver for AUO-K1900 controllers + * + * Copyright (C) 2011, 2012 Heiko Stuebner + * + * based on broadsheetfb.c + * + * Copyright (C) 2008, Jaya Kumar + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. + * + * This driver is written to be used with the AUO-K1900 display controller. + * + * It is intended to be architecture independent. A board specific driver + * must be used to perform all the physical IO interactions. + * + * The controller supports different update modes: + * mode0+1 16 step gray (4bit) + * mode2 4 step gray (2bit) - FIXME: add strange refresh + * mode3 2 step gray (1bit) - FIXME: add strange refresh + * mode4 handwriting mode (strange behaviour) + * mode5 automatic selection of update mode + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include