From patchwork Wed Sep 9 04:32:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 515699 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 C703E140549 for ; Wed, 9 Sep 2015 14:43:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=X1YQGirn; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B95F44B825; Wed, 9 Sep 2015 06:43:09 +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 HSs5680zQFw7; Wed, 9 Sep 2015 06:43:09 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BE2ED4B83A; Wed, 9 Sep 2015 06:42:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 804164B7DD for ; Wed, 9 Sep 2015 06:42:29 +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 cZ0gQQ8lXRIv for ; Wed, 9 Sep 2015 06:42:29 +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-ig0-f175.google.com (mail-ig0-f175.google.com [209.85.213.175]) by theia.denx.de (Postfix) with ESMTPS id 8CD224B7BD for ; Wed, 9 Sep 2015 06:42:16 +0200 (CEST) Received: by igbni9 with SMTP id ni9so5888919igb.0 for ; Tue, 08 Sep 2015 21:42:15 -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=scYcViWQ3yXd+21uO4Z5/R8JIeE4JasNJRVE+3SW5ZI=; b=X1YQGirnFzJcagbjOGb5J/uaErrmLyeAi9cDQX1fnHm0FTnaCjTughnIQq0vjhwIuy bDteokdAt/Z4Q6o+2ZG44kq2wkCdSFDXQUjKsPeqafVbISt97USGNh1tg/0uKK9DZ4we GggpBGQWQy0NYWYsYpu4LmRMAOnwpHDSCANwDxL0hkJLnARJYYt/ClrV+s6AwRNG9tms tYSZeH6DZMLV7F5ioOeIeHXFTBCB6yzxNIQ4oAuiLlxw2uHHXFNABdpM15FZPr1J7iBl SpwkBWMNsgLodDhtzb4sGYjD3EAH8qgEEOhM6i1GbKG9bBqLfL1MXL5ir1+rYIN89ONf C2+A== 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=scYcViWQ3yXd+21uO4Z5/R8JIeE4JasNJRVE+3SW5ZI=; b=RC4pPYLBrae19hrhJQ3linucx86waUCvRvuzH3D7XK3Kjx4W/9aOSXfIGDBRbvKvXc y55GaDAG/Rc6oXwAgxXUqkRlk/HVSb79k54OW8Unyao3KB5rGS/qguE9Vr/MnoFpE+em AT177sCng05cnp/o13A33FjdZb6R1IO6pxhHf/wu5H0wGQj+lFwSXAhZOGn4DYeOCVKn 6FaRT8gQxeTpB2UHoDGFQYXoh7VfCFTnN1+uySS53gj2+3HWjzoM5lvvagZOZMyVaDH6 +v4PALsZp+r5iFsfwi7ODRbIKO3Ly3UkAkQtsy5Nv++dMbjO/VSTyOqkmos0J5/KbvxE Akag== X-Gm-Message-State: ALoCoQmi8qf+3iuRkNgLCkA3PlENFAmcd3ZX6PQEbi6V39IcnTkEp9DKyFvr6312oHGEA++Vtzvf X-Received: by 10.50.36.106 with SMTP id p10mr48731234igj.31.1441773735337; Tue, 08 Sep 2015 21:42:15 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id p65sm3822163ioe.26.2015.09.08.21.42.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 21:42:13 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id B5AF12219E2; Tue, 8 Sep 2015 22:33:20 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 8 Sep 2015 22:32:47 -0600 Message-Id: <1441773171-4575-25-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc0.131.gf624c3d In-Reply-To: <1441773171-4575-1-git-send-email-sjg@chromium.org> References: <1441773171-4575-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Graeme Russ , Gabriel Huau , Masahiro Yamada , Christophe Ricard , Andrew Bradford Subject: [U-Boot] [PATCH 24/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 --- arch/x86/Kconfig | 6 ++++++ arch/x86/dts/bayleybay.dts | 1 + arch/x86/dts/chromebook_link.dts | 1 + arch/x86/dts/keyboard.dtsi | 5 +++++ include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 arch/x86/dts/keyboard.dtsi 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..a52c84f 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" 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/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