diff mbox

[U-Boot,27/28] video: input: Clean up after i8042 conversion

Message ID 1441773171-4575-28-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Sept. 9, 2015, 4:32 a.m. UTC
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>
---

 README                      | 33 +++++++++++----------------------
 drivers/video/cfb_console.c | 20 ++++----------------
 2 files changed, 15 insertions(+), 38 deletions(-)

Comments

Bin Meng Sept. 15, 2015, 6:12 a.m. UTC | #1
On Wed, Sep 9, 2015 at 12:32 PM, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
>  README                      | 33 +++++++++++----------------------
>  drivers/video/cfb_console.c | 20 ++++----------------
>  2 files changed, 15 insertions(+), 38 deletions(-)
>
> diff --git a/README b/README
> index dd857c4..d1f9b38 100644
> --- a/README
> +++ b/README
> @@ -885,11 +885,11 @@ The following options need to be configured:
>                                                 (0-5, cf. cfb_console.c)
>                         VIDEO_FB_ADRS           framebuffer address
>                         VIDEO_KBD_INIT_FCT      keyboard int fct
> -                                               (i.e. i8042_kbd_init())
> +                                               (i.e. rx51_kp_init())
>                         VIDEO_TSTC_FCT          test char fct
> -                                               (i.e. i8042_tstc)
> +                                               (i.e. rx51_kp_tstc)
>                         VIDEO_GETC_FCT          get char fct
> -                                               (i.e. i8042_getc)
> +                                               (i.e. rx51_kp_getc)
>                         CONFIG_VIDEO_LOGO       display Linux logo in
>                                                 upper left corner
>                         CONFIG_VIDEO_BMP_LOGO   use bmp_logo.h instead of
> @@ -1785,18 +1785,16 @@ CBFS (Coreboot Filesystem) support
>                 a default value of 65536 will be defined.
>
>  - Keyboard Support:
> -               CONFIG_I8042_KBD
> -               Standard PC keyboard driver with US (is default) and
> -               GERMAN key layout (switch via environment 'keymap=de') support.
> -               Export function i8042_kbd_init, i8042_tstc and i8042_getc
> -               for cfb_console. Supports cursor blinking.
> -
> -               CONFIG_CROS_EC_KEYB
> -               Enables a Chrome OS keyboard using the CROS_EC interface.
> -               This uses CROS_EC to communicate with a second microcontroller
> -               which provides key scans on request.
>                 See Kconfig help for available keyboard drivers.
>
> +               CONFIG_KEYBOARD
> +
> +               Define this to enable a custom keyboard support.
> +               This simply calls drv_keyboard_init() which must be
> +               defined in your board-specific files. This option is deprecated
> +               and is only used by novena. For new boards, driver model
> +               instead.
> +
>  - Video support:
>                 CONFIG_VIDEO
>
> @@ -1856,15 +1854,6 @@ CBFS (Coreboot Filesystem) support
>                 boot.  See the documentation file README.video for a
>                 description of this variable.
>
> -
> -- Keyboard Support:
> -               CONFIG_KEYBOARD
> -
> -               Define this to enable a custom keyboard support.
> -               This simply calls drv_keyboard_init() which must be
> -               defined in your board-specific files.
> -               The only board using this so far is RBC823.
> -
>  - LCD Support: CONFIG_LCD
>
>                 Define this to enable LCD support (for output to LCD
> diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
> index 1b5c3e0..fde0bd4 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
>   */
>
> --

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff mbox

Patch

diff --git a/README b/README
index dd857c4..d1f9b38 100644
--- a/README
+++ b/README
@@ -885,11 +885,11 @@  The following options need to be configured:
 						(0-5, cf. cfb_console.c)
 			VIDEO_FB_ADRS		framebuffer address
 			VIDEO_KBD_INIT_FCT	keyboard int fct
-						(i.e. i8042_kbd_init())
+						(i.e. rx51_kp_init())
 			VIDEO_TSTC_FCT		test char fct
-						(i.e. i8042_tstc)
+						(i.e. rx51_kp_tstc)
 			VIDEO_GETC_FCT		get char fct
-						(i.e. i8042_getc)
+						(i.e. rx51_kp_getc)
 			CONFIG_VIDEO_LOGO	display Linux logo in
 						upper left corner
 			CONFIG_VIDEO_BMP_LOGO	use bmp_logo.h instead of
@@ -1785,18 +1785,16 @@  CBFS (Coreboot Filesystem) support
 		a default value of 65536 will be defined.
 
 - Keyboard Support:
-		CONFIG_I8042_KBD
-		Standard PC keyboard driver with US (is default) and
-		GERMAN key layout (switch via environment 'keymap=de') support.
-		Export function i8042_kbd_init, i8042_tstc and i8042_getc
-		for cfb_console. Supports cursor blinking.
-
-		CONFIG_CROS_EC_KEYB
-		Enables a Chrome OS keyboard using the CROS_EC interface.
-		This uses CROS_EC to communicate with a second microcontroller
-		which provides key scans on request.
 		See Kconfig help for available keyboard drivers.
 
+		CONFIG_KEYBOARD
+
+		Define this to enable a custom keyboard support.
+		This simply calls drv_keyboard_init() which must be
+		defined in your board-specific files. This option is deprecated
+		and is only used by novena. For new boards, driver model
+		instead.
+
 - Video support:
 		CONFIG_VIDEO
 
@@ -1856,15 +1854,6 @@  CBFS (Coreboot Filesystem) support
 		boot.  See the documentation file README.video for a
 		description of this variable.
 
-
-- Keyboard Support:
-		CONFIG_KEYBOARD
-
-		Define this to enable a custom keyboard support.
-		This simply calls drv_keyboard_init() which must be
-		defined in your board-specific files.
-		The only board using this so far is RBC823.
-
 - LCD Support:	CONFIG_LCD
 
 		Define this to enable LCD support (for output to LCD
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 1b5c3e0..fde0bd4 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
  */