summaryrefslogtreecommitdiff
path: root/drivers/i8042.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-01-18 20:05:34 +0100
committerStefan Roese <sr@denx.de>2006-01-18 20:05:34 +0100
commita7b9fb9110e3c0be644b3e2c8f397f606138a710 (patch)
tree37d161379024789efa1a579482df722835e80420 /drivers/i8042.c
parent2076d0a15ff1dba2b46d96e81d02d625254611ff (diff)
downloadu-boot-imx-a7b9fb9110e3c0be644b3e2c8f397f606138a710.zip
u-boot-imx-a7b9fb9110e3c0be644b3e2c8f397f606138a710.tar.gz
u-boot-imx-a7b9fb9110e3c0be644b3e2c8f397f606138a710.tar.bz2
Add VGA support (CT69000) to CPCI750 board.
Insert missing __le32_to_cpu() for filesize in ext2fs_read_file(). Patch by Reinhard Arlt, 30 Dec 2005
Diffstat (limited to 'drivers/i8042.c')
-rw-r--r--drivers/i8042.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/i8042.c b/drivers/i8042.c
index e21978d..5f273a2 100644
--- a/drivers/i8042.c
+++ b/drivers/i8042.c
@@ -29,6 +29,14 @@
#ifdef CONFIG_I8042_KBD
+#ifdef CONFIG_USE_CPCIDVI
+extern u8 gt_cpcidvi_in8(u32 offset);
+extern void gt_cpcidvi_out8(u32 offset, u8 data);
+
+#define in8(a) gt_cpcidvi_in8(a)
+#define out8(a, b) gt_cpcidvi_out8(a,b)
+#endif
+
#include <i8042.h>
/* defines */
@@ -318,6 +326,13 @@ int i8042_kbd_init (void)
int keymap, try;
char *penv;
+#ifdef CONFIG_USE_CPCIDVI
+ if ((penv = getenv ("console")) != NULL) {
+ if (strncmp (penv, "serial", 7) == 0) {
+ return -1;
+ }
+ }
+#endif
/* Init keyboard device (default US layout) */
keymap = KBD_US;
if ((penv = getenv ("keymap")) != NULL)
@@ -633,7 +648,11 @@ static int kbd_reset (void)
if (kbd_input_empty() == 0)
return -1;
+#ifdef CONFIG_USE_CPCIDVI
+ out8 (I8042_COMMAND_REG, 0x60);
+#else
out8 (I8042_DATA_REG, 0x60);
+#endif
if (kbd_input_empty() == 0)
return -1;