From patchwork Tue Sep 29 01:56:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1372966 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=B9V60XcQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C0jDg0L8sz9sSG for ; Tue, 29 Sep 2020 11:56:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3061581E17; Tue, 29 Sep 2020 03:56:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="B9V60XcQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3436781F22; Tue, 29 Sep 2020 03:56:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6F7ED81C2C for ; Tue, 29 Sep 2020 03:56:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601344585; bh=ZqTAO6Is8hrAf7wiWTYi6dAGSEvScEshSo5GrR6IzHo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=B9V60XcQ28PACi3RU8s7+/Gp3Tqm+v4vWvABqydwmVXE4ut6N76hii87zO6PW9FI9 62UnvewDpRfp3QYgOyeRIgB9yseXlaxx+zj5Widol1GH/2H04Sk0YJap/xMfnIyvt5 KmKP+s+86e/ZjKayTcY/+I/lhF8nWOvnKPQD3sq0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MYeR1-1js5sI1cn5-00VdSc; Tue, 29 Sep 2020 03:56:25 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] sandbox: avoid duplicate backslash input Date: Tue, 29 Sep 2020 03:56:20 +0200 Message-Id: <20200929015620.190731-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ogTwNuwrA6VA34dEzz4Z3fkUG/zUEWwngeG38wNGehoMj0EEdYz ZVa08lkEoR/kSvcrRGQExfrFe/8ClUn6D85rbMQQ1wued697uNVdqu7tBdtEFzp6qjOudCl Q4DzOBNdndsQCoXB9sTo+MBmJBNCk7PHwDjpHOkyucfHsHctQZm2UyEg9Q+xXaR6qgGw6NP dRW+0d2f8ssw1eSELWpvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Y34fQ4AX5Rg=:/bPEdjBHuwzx4ZTHmLdO5x gBi2A/qFTUwEMgJvEESknivwOuNLeDXyyFLVp7fQbSYAIdpkxoKiFVexq8X0zUWpHJlb9TQP5 I6S+IFhoa6fQ8I0bjck4TbzUggXg3gbRao05MNCi9hNfgPeqVa5WEC7FCiylfDNb1aqs2zCpy 0NdIVuFq1qWQ5On4R6wKfv2RzKmnpl4hfRI6UrseqOOBdsT7aPCALCZP5eYAwLnrUuTw1817+ RDazC0cP6jNM05AQ0l4JSTd4uhXlPiJReHWJwjmwsuSjY5KRRGFKQmUuhdJK4rciv4XkHeb5s mn8rLThXZ0gSaLVEqjdISiMYev/c9pN2VIel6cE3PDx8IaBNKszYsn5S0WWgTHKPGwCDpzZdG V0IC48DSYkiJxnziZ9mm8E9H8aKMhh6nDVsGkzfbXzWk/DKX3Poob4bt7sDQ1lEMXDtXJa0o7 7Og8h2A+4jDf6gQs/pIE2RbWWwpF5F656BKlWb5E/RTvGJInbb5YEVYUC0Dc++4fjaOin0dfp R8RDMgeJc+zxgnVpwyBCKelrGea1+Yb5O798wT1VVsgDaYEZmLdyGgSNhd46qkDSTCLxy1z2T 0BKZyoULrfZV62XOtoJDFfd6p6U47zPKOywsnAo2uLCLTgsJlov1f7myOv0xgY2qml9lHAD59 YTtJeb7YwxGkk3w0ahzQxyH01RA0lIVqR9R2ztF90dl273ebL3MeNnMusYcsqt6WrX13n3/O2 +hKTDcvIl+esQdfven45zt3mVPa46TS49l8F2O2jd82POx+rEbfOqd7MxN3wTOMhXXD2SLUcJ 0V9dxtxqCdr8PF/1OeCyKmT8NugTVcEkDglnwaSXpKkTZx+1jU27UQu1dW5NGZLfPmCFr4gyr hF1vDQ1KWUVTPDMBgSlG3SbF4uH3w0n7oXgsRk+zLX2r6WDdblch5LVxRxwaIEjFMHGudAuen 6J8fWi3Qvif6gSMmxeNFO0w2tEp01oKVu6YpBh/8uWhcueXa7HOA4peWIV+DFcRgRZnWTTpp1 v4QGZMtwi+bXkrdG20J4orBrI0EA4vfmygmNj9QP/ZfebY1OuLkbZ5asER70SPV96woVSL1ck ZFNjIhT0wfmjJfrCqoxL0tdckaLsCsoSBszm4lfvT1YrYhfqKNYcP+I1r57JuWmyRSoHEpI7n PVKLvWVUTJpw9w35jxzzpMlfRZDE9Iep8C1Vw5M4G/p/+m7yxNtCBAzFnT/e9Jm8SrI+nsKff uHAMWVX8XkhYprI3H0WTqBtKHIksLtms81RFRkA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean When using SDL for input the SDL key codes are first converted to Linux key codes and then to matrix entries of the cross wired keyboard. We must not map any key code to two different places on the keyboard. So comment out one backslash position. Update the rest of the file from Linux 5.7. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- arch/sandbox/dts/cros-ec-keyboard.dtsi | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) -- 2.28.0 diff --git a/arch/sandbox/dts/cros-ec-keyboard.dtsi b/arch/sandbox/dts/cros-ec-keyboard.dtsi index 9c7fb0acae..d885a5ecd2 100644 --- a/arch/sandbox/dts/cros-ec-keyboard.dtsi +++ b/arch/sandbox/dts/cros-ec-keyboard.dtsi @@ -1,12 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Keyboard dts fragment for devices that use cros-ec-keyboard * * Copyright (c) 2014 Google, Inc * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ + * This file is taken from Linux + * arch/arm/boot/dts/cros-ec-keyboard.dtsi. + * + * A duplicate KEY_BACKSLASH key had to be removed. + */ #include @@ -22,6 +24,7 @@ MATRIX_KEY(0x00, 0x02, KEY_F1) MATRIX_KEY(0x00, 0x03, KEY_B) MATRIX_KEY(0x00, 0x04, KEY_F10) + MATRIX_KEY(0x00, 0x05, KEY_RO) MATRIX_KEY(0x00, 0x06, KEY_N) MATRIX_KEY(0x00, 0x08, KEY_EQUAL) MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) @@ -34,6 +37,7 @@ MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) MATRIX_KEY(0x01, 0x09, KEY_F9) MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) + MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL) MATRIX_KEY(0x02, 0x01, KEY_TAB) @@ -45,6 +49,7 @@ MATRIX_KEY(0x02, 0x07, KEY_102ND) MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) MATRIX_KEY(0x02, 0x09, KEY_F8) + MATRIX_KEY(0x02, 0x0a, KEY_YEN) MATRIX_KEY(0x03, 0x01, KEY_GRAVE) MATRIX_KEY(0x03, 0x02, KEY_F2) @@ -52,7 +57,9 @@ MATRIX_KEY(0x03, 0x04, KEY_F5) MATRIX_KEY(0x03, 0x06, KEY_6) MATRIX_KEY(0x03, 0x08, KEY_MINUS) + MATRIX_KEY(0x03, 0x09, KEY_F13) MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) + MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL) MATRIX_KEY(0x04, 0x01, KEY_A) @@ -63,7 +70,10 @@ MATRIX_KEY(0x04, 0x06, KEY_J) MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) MATRIX_KEY(0x04, 0x09, KEY_L) - MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) + /* + * Do not map any key twice + * MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) + */ MATRIX_KEY(0x04, 0x0b, KEY_ENTER) MATRIX_KEY(0x05, 0x01, KEY_Z)