From patchwork Wed Nov 11 17:05:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 542969 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 16AED1402D1 for ; Thu, 12 Nov 2015 04:07:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=GJagVnay; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A7C04B7D3; Wed, 11 Nov 2015 18:07:01 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vr7MpwTDFuZ3; Wed, 11 Nov 2015 18:07:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A2214B7D4; Wed, 11 Nov 2015 18:06:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B73B94B70B for ; Wed, 11 Nov 2015 18:06:13 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0MRkN-oc801f for ; Wed, 11 Nov 2015 18:06:13 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f179.google.com (mail-io0-f179.google.com [209.85.223.179]) by theia.denx.de (Postfix) with ESMTPS id 0F21C4B718 for ; Wed, 11 Nov 2015 18:06:09 +0100 (CET) Received: by iody8 with SMTP id y8so40134942iod.1 for ; Wed, 11 Nov 2015 09:06:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=U1esuDm6Hyy48cMkwBU+DyO6iYbGKQQrGfxPC0ktC0o=; b=GJagVnayy6Fd7p01PHuDpBT0MhaO4MyfHAch31ueC1fl7AN9teHGDAoGA3agOevDng bYHp36o6DTilK0hC/Gid/0p5eBK8sD8f7ip+F30ZCQpqAIWWKmXAbD5JrWyB6rEiUYjI zLVOq1R8006u0wJe/wvTPUFw+fJmDT0b+PrL6Lo0IjpHLxVw3hjd6kjOZyb5kmYFm26+ RzYdcce+9OwIvzAUsWTRhxMIq2KgBGC2LdIom+FxiyGh+LIztA0NYgkT9MkXrnIcVdp6 jLTK6xhyi3G+BE5VdCSrn1GLVxzUQFF//XASmngFYyHoJI5wth7+QXr9wcvx+Jxz0L3R RKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=U1esuDm6Hyy48cMkwBU+DyO6iYbGKQQrGfxPC0ktC0o=; b=Dp4sQIdymzM/kVvvHyPcXaUaRWEl9qtyLDenOW6ZuELEIJc8sTlAZ83xdTNvTo4fiP twFQ5vNR97jw9cZ/tXCuZiL07mGannpUGATtiLNQr5ejBjIxDCwnzXQhprn1aayRkGfH hvo0QyWvk1l8FxZqBMZtcqsrgjUoJByZwkxHQVKt0g9VjdYq099CYVo20fD9DT5a2tyW VovZF4aly+RVXAkz6ET+Q5Zr1iVbR3QCPi3w+P3JyL4PspbtQljLkPm3OqdpVSIQRAV5 Y9JiJmLk+BBTbR/cEVSqcIyPai1YhZFlw7nzWUVZLCFHMLRFKv//6DqWbyfUj1TIymKC QOdQ== X-Gm-Message-State: ALoCoQntbI/PVWH3eq5puP5fOZh1DbXcoTMTfnxfDvl70hQjIrd+5+nQ1JVcggpGSj7U106hSDJa X-Received: by 10.107.154.67 with SMTP id c64mr8452813ioe.53.1447261568470; Wed, 11 Nov 2015 09:06:08 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id rj10sm8791285igc.20.2015.11.11.09.06.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Nov 2015 09:06:06 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 0A5A5221439; Wed, 11 Nov 2015 10:06:04 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Wed, 11 Nov 2015 10:05:43 -0700 Message-Id: <1447261548-14304-8-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1447261548-14304-1-git-send-email-sjg@chromium.org> References: <1447261548-14304-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ Subject: [U-Boot] [PATCH v3 07/12] x86: Add an i8042 device for boards that have it X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Bin Meng --- Changes in v3: None Changes in v2: - Drop CONFIG_VGA_AS_SINGLE_DEVICE from all x86 board config files arch/x86/Kconfig | 6 ++++++ arch/x86/dts/bayleybay.dts | 1 + arch/x86/dts/chromebook_link.dts | 5 +++++ arch/x86/dts/keyboard.dtsi | 5 +++++ doc/device-tree-bindings/input/i8042.txt | 10 ++++++++++ include/configs/bayleybay.h | 3 --- include/configs/chromebox_panther.h | 2 -- include/configs/minnowmax.h | 1 - include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- 10 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 arch/x86/dts/keyboard.dtsi create mode 100644 doc/device-tree-bindings/input/i8042.txt diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f92082d..d8aeaaf 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -420,6 +420,12 @@ config PCIE_ECAM_SIZE so a default 0x10000000 size covers all of the 256 buses which is the maximum number of PCI buses as defined by the PCI specification. +config I8042_KEYB + default y + +config DM_KEYBOARD + default y + source "arch/x86/lib/efi/Kconfig" endmenu diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index 52d0999..aa86387 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -10,6 +10,7 @@ #include /include/ "skeleton.dtsi" +/include/ "keyboard.dtsi" /include/ "serial.dtsi" /include/ "rtc.dtsi" diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts index f27263a..7870bb1 100644 --- a/arch/x86/dts/chromebook_link.dts +++ b/arch/x86/dts/chromebook_link.dts @@ -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>; diff --git a/arch/x86/dts/keyboard.dtsi b/arch/x86/dts/keyboard.dtsi new file mode 100644 index 0000000..000751b --- /dev/null +++ b/arch/x86/dts/keyboard.dtsi @@ -0,0 +1,5 @@ +/ { + keyboard { + compatible = "intel,i8042-keyboard"; + }; +}; diff --git a/doc/device-tree-bindings/input/i8042.txt b/doc/device-tree-bindings/input/i8042.txt new file mode 100644 index 0000000..cd079c2 --- /dev/null +++ b/doc/device-tree-bindings/input/i8042.txt @@ -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. diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 1ba2998..ac6b45b 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -33,9 +33,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 diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h index dc732b8..00fe26d 100644 --- a/include/configs/chromebox_panther.h +++ b/include/configs/chromebox_panther.h @@ -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 */ diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 53d86a2..c90af40 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -43,7 +43,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_FIT_SIGNATURE #define CONFIG_RSA diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 2be8850..4ff8b94 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -51,7 +51,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" diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index faadab8..302985a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -146,7 +146,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