From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 12 Nov 2015 13:33:05 +0000 (-0800)
Subject: x86: crownbay: Convert to use driver model keyboard
X-Git-Tag: v2016.01-rc2~205
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=60fe101873dbc84a8ffd5b3fc13143af8b540521;p=u-boot

x86: crownbay: Convert to use driver model keyboard

Convert to use driver model keyboard on Intel Crown Bay.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index 3e354c4093..eb8421cc79 100644
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -10,6 +10,7 @@
 
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
+/include/ "keyboard.dtsi"
 /include/ "rtc.dtsi"
 
 / {
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 54a2905c1d..c052e8aaed 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -22,7 +22,7 @@
 
 #define CONFIG_PCI_PNP
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,vga,usbkbd\0" \
+#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vga\0" \
 					"stderr=serial,vga\0"