x86: Add an i8042 device for boards that have it

Some boards have an i8042 device. Enable the driver for all x86 boards, and
add a device tree node for those which may have this keyboard.

Also adjust the configuration so that i8042 is always separate from the VGA,
and rename the stdin driver accordingly. With this commit the keyboard will
not work, but it is fixed in the next commit.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
master
Simon Glass 9 years ago
parent b0abfeff98
commit 6b44ae6b06
  1. 6
      arch/x86/Kconfig
  2. 1
      arch/x86/dts/bayleybay.dts
  3. 5
      arch/x86/dts/chromebook_link.dts
  4. 5
      arch/x86/dts/keyboard.dtsi
  5. 10
      doc/device-tree-bindings/input/i8042.txt
  6. 3
      include/configs/bayleybay.h
  7. 2
      include/configs/chromebox_panther.h
  8. 1
      include/configs/minnowmax.h
  9. 2
      include/configs/x86-chromebook.h
  10. 2
      include/configs/x86-common.h

@ -435,6 +435,12 @@ config I8254_TIMER
Intel 8254 timer contains three counters which have fixed uses.
Include this to have U-Boot set up the timer correctly.
config I8042_KEYB
default y
config DM_KEYBOARD
default y
source "arch/x86/lib/efi/Kconfig"
endmenu

@ -10,6 +10,7 @@
#include <dt-bindings/interrupt-router/intel-irq.h>
/include/ "skeleton.dtsi"
/include/ "keyboard.dtsi"
/include/ "serial.dtsi"
/include/ "rtc.dtsi"

@ -1,6 +1,7 @@
/dts-v1/;
/include/ "skeleton.dtsi"
/include/ "keyboard.dtsi"
/include/ "serial.dtsi"
/include/ "rtc.dtsi"
@ -41,6 +42,10 @@
stdout-path = "/serial";
};
keyboard {
intel,duplicate-por;
};
spd {
compatible = "memory-spd";
#address-cells = <1>;

@ -0,0 +1,5 @@
/ {
keyboard {
compatible = "intel,i8042-keyboard";
};
};

@ -0,0 +1,10 @@
i8042 Keyboard
The Intel i8042 is a keyboard controller used on many x86 PCs.
Required properties:
- compatible: "intel,i8042-keyboard"
Optional properties:
- intel,duplicate-por: Indicates that a keyboard reset may result in a
duplicate POR byte, which should be ignored.

@ -32,9 +32,6 @@
#define CONFIG_MMC_SDMA
#define CONFIG_CMD_MMC
/* BayTrail IGD support */
#define CONFIG_VGA_AS_SINGLE_DEVICE
/* Environment configuration */
#define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0x006ff000

@ -14,6 +14,4 @@
/* Avoid a warning in the Realtek Ethernet driver */
#define CONFIG_SYS_CACHELINE_SIZE 16
#define CONFIG_VGA_AS_SINGLE_DEVICE
#endif /* __CONFIG_H */

@ -42,7 +42,6 @@
#define VIDEO_IO_OFFSET 0
#define CONFIG_X86EMU_RAW_IO
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_FIT_SIGNATURE
#define CONFIG_RSA

@ -50,7 +50,7 @@
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x003f8000
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
"stdout=vga,serial\0" \
"stderr=vga,serial\0"

@ -145,7 +145,7 @@
#define CONFIG_VIDEO
#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
#define CONFIG_I8042_KBD
#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CFB_CONSOLE
#define CONFIG_CONSOLE_SCROLL_LINES 5

Loading…
Cancel
Save