From patchwork Mon Oct 19 03:17:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 532102 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 E2A32140134 for ; Mon, 19 Oct 2015 14:21:06 +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=YuXylE0L; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB3924B830; Mon, 19 Oct 2015 05:19:49 +0200 (CEST) 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 hpZOJa9V4Doe; Mon, 19 Oct 2015 05:19:49 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 84C4A4B832; Mon, 19 Oct 2015 05:18:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A3864B742 for ; Mon, 19 Oct 2015 05:18:06 +0200 (CEST) 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 iN1-5TjGlGCx for ; Mon, 19 Oct 2015 05:18:06 +0200 (CEST) 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-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by theia.denx.de (Postfix) with ESMTPS id 28E3E4B761 for ; Mon, 19 Oct 2015 05:17:54 +0200 (CEST) Received: by iodv82 with SMTP id v82so174840360iod.0 for ; Sun, 18 Oct 2015 20:17:53 -0700 (PDT) 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=0cujOaJeAXTofrVCi4AyDAjETifd1GCQffPpzis2HNs=; b=YuXylE0L0udjCe+UDO89/ASAwkwa5laQ0LSzSp+/tYFBdth+Gh7o/ap88Kgj4333Uq gtQRSGRrUbJ2Y2jpbGqdCew2yg3Kmr0B/KvE7GFGWaVZB2DpFaasCiNbWbcXiF/dkSiB xzKl+4te4MPOEeClv2OzRaY3YvN0lZOt0RWhYEBcetaKGq0Rr9Xl0fsy9GuLBPOs6wdO moDvovW3TiW6kudUEb6LQcI7xo6z+6MfpLSg9WvAIRA2xvV9N0rXmsIeftLLbhs4ae0X YkyVeFH8A3d6Ci41k4VH43HnuqA/pX83AGLaD7M9n/vTplgmeigBsEoHLDBS7FGOsCiJ PEZQ== 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=0cujOaJeAXTofrVCi4AyDAjETifd1GCQffPpzis2HNs=; b=marX5yvEEaXy6fBZ7ho21guUyRzxYgFcqlGtx3+F+hB5FtmUmeR51ev0TTufZnnk4D cF4VMe6XhOVoKVS5/V06QswNltbyK8i8tf6gGCAWyAlAnyLofvhNCy1XVXjVbeampD5B ZgiftMtnc/Eg5zylSv78j1lDb1szyu+ZF6ORWECs/PRJ5jXPshT1Z90oWMGiBTTPT6xx WNSY47HhhMyrIgZKd2cvhRNzYt5f2+lMC3JdEPfbteUCbkrAbEkhUdDNN43ZuRSBW1OM NXTQeO4ZjmOYzvZlZiGpQfiZz1UJY631rbCRqbmXpZkepVZa9loS01XjTTLBF4rld1go jJtA== X-Gm-Message-State: ALoCoQnCmI7Jqy+sJXVExM08N6yqisSMFdLw0wXauLcwhslhBCatE2PjbYD/6IDyPLFRtvqXEOLT X-Received: by 10.107.46.136 with SMTP id u8mr23941610iou.69.1445224673500; Sun, 18 Oct 2015 20:17:53 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id y15sm4668388ioi.44.2015.10.18.20.17.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Oct 2015 20:17:50 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id BD46422346D; Sun, 18 Oct 2015 21:17:45 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Oct 2015 21:17:32 -0600 Message-Id: <1445224657-20622-24-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445224657-20622-1-git-send-email-sjg@chromium.org> References: <1445224657-20622-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ Subject: [U-Boot] [PATCH v2 23/28] 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 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 5e42d7d..72a66ea 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -401,6 +401,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 d646987..58d97c8 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 4291141..f09868b 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 3f153f2..ff8fe0f 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -147,7 +147,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