summaryrefslogtreecommitdiff
path: root/drivers/video/cfb_console.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-11-11 10:05:47 -0700
committerSimon Glass <sjg@chromium.org>2015-11-19 20:13:41 -0700
commit39f615ed8871e42677fc5283884b0ab36463b551 (patch)
tree55be6d8addd58ba4f45fbea2dd0d2f1267209ab8 /drivers/video/cfb_console.c
parent011d89d6066592a67253df81905ace358968dacc (diff)
video: input: Clean up after i8042 conversion
Now that i8042 uses driver model, adjust other mentions of it and remove old code that is no-longer used. Update the README and unify the keyboard text into one place. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/video/cfb_console.c')
-rw-r--r--drivers/video/cfb_console.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index f1913922e5..f15c964546 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -15,8 +15,10 @@
* logo can be placed in the upper left corner and additional board
* information strings (that normally goes to serial port) can be drawn.
*
- * The console driver can use the standard PC keyboard interface (i8042)
- * for character input. Character output goes to a memory mapped video
+ * The console driver can use a keyboard interface for character input
+ * but this is deprecated. Only rk51 uses it.
+ *
+ * Character output goes to a memory-mapped video
* framebuffer with little or big-endian organisation.
* With environment setting 'console=serial' the console i/o can be
* forced to serial port.
@@ -38,7 +40,6 @@
* VIDEO_DATA_FORMAT - graphical data format GDF
* VIDEO_FB_ADRS - start of video memory
*
- * CONFIG_I8042_KBD - AT Keyboard driver for i8042
* VIDEO_KBD_INIT_FCT - init function for keyboard
* VIDEO_TSTC_FCT - keyboard_tstc function
* VIDEO_GETC_FCT - keyboard_getc function
@@ -158,19 +159,6 @@
#define VIDEO_FB_ADRS (pGD->frameAdrs)
/*
- * Console device defines with i8042 keyboard controller
- * Any other keyboard controller must change this section
- */
-
-#ifdef CONFIG_I8042_KBD
-#include <i8042.h>
-
-#define VIDEO_KBD_INIT_FCT i8042_kbd_init()
-#define VIDEO_TSTC_FCT i8042_tstc
-#define VIDEO_GETC_FCT i8042_getc
-#endif
-
-/*
* Console device
*/