From patchwork Fri Jan 15 22:36:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Chen X-Patchwork-Id: 1427386 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UqUPocA4; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DHbf82H4Gz9rx6 for ; Sat, 16 Jan 2021 09:37:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726172AbhAOWhD (ORCPT ); Fri, 15 Jan 2021 17:37:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725863AbhAOWhC (ORCPT ); Fri, 15 Jan 2021 17:37:02 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A23A1C061757 for ; Fri, 15 Jan 2021 14:36:22 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id u11so1143999plg.13 for ; Fri, 15 Jan 2021 14:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ywqlXS0DMFG48gu1pC9iNZc0yRyZGXmZHZluYtDfIDk=; b=UqUPocA4ts0gq9hP7f3Qb1J/OcQWAbekkb/roAdZFEt+PFWRVJaGkiZ3M1DCDK9oq6 SDQRVWVgjzuswDEGgV2OEFl8cIhhDRZxSqeAy0lPsk6vV8sJ7yIn06UPTmhvmrJhp9ky 6ZZY+9kVsYuVaJFYgx+GGUj2hSFHdX4QmrGTU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ywqlXS0DMFG48gu1pC9iNZc0yRyZGXmZHZluYtDfIDk=; b=V5nDc/vZy7GtQEKdbEUcVd+spIo/fqQy0CrHvUuVaswIdDkJ0vvsBge3dtd5LVwM9O VmZRceAAHJkr3M/qYc0I+UDFG5cfWu08Y/f5ii6kmgFBO7zocO9WMLJJqVa6qMuP9O0j E7hDodbccP4qFK2uBztcRQQooCIYqUdwkqxlG72O9GC28ADBQ4KrUv2ecUQ6ER3Oxg3b rWIo45Wl0xhkPqwwgVux+gtEsLLLlLtZqpo0KkEO+s6WWeg0xjU3t10XBVkhHQb+4ApW +DJiqgf8gR9ktUaIK7ub7CxbYrZ3o182I62fVE0OIDdmot0T6KL//ycta+hiz4PbuJ38 3yzg== X-Gm-Message-State: AOAM531+MvfSwCwtHPXftIS37pN8VU0LW5LsdDGrVJ28eP4i9vL2Dmo+ a3t7/RK6GqiGvUfkLYSw4FxpaA== X-Google-Smtp-Source: ABdhPJwfcmXp/Enm8DCTmC7DYAAKuOQuMDLgHMXVVWWlrn5h2vpAzgoQvQr0nlFLMVn6zX5FCVbHmA== X-Received: by 2002:a17:902:ba8d:b029:dc:bc0:4d5 with SMTP id k13-20020a170902ba8db02900dc0bc004d5mr14763136pls.75.1610750182188; Fri, 15 Jan 2021 14:36:22 -0800 (PST) Received: from philipchen.mtv.corp.google.com ([2620:15c:202:201:a6ae:11ff:fe11:fd59]) by smtp.gmail.com with ESMTPSA id l3sm5208670pjz.27.2021.01.15.14.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 14:36:21 -0800 (PST) From: Philip Chen To: LKML , dmitry.torokhov@gmail.com Cc: swboyd@chromium.org, dianders@chromium.org, Philip Chen , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v6 1/3] dt-bindings: input: Create macros for cros-ec keymap Date: Fri, 15 Jan 2021 14:36:15 -0800 Message-Id: <20210115143555.v6.1.Iaa8a60cf2ed4b7ad5e2fbb4ad76a1c600ee36113@changeid> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In Chrome OS, the keyboard matrix can be split to two groups: The keymap for the top row keys can be customized based on OEM preference, while the keymap for the other keys is generic/fixed across boards. This patch creates marcos for the keymaps of these two groups, making it easier to reuse the generic portion of keymap when we override the keymap in the board-specific dts for custom top row design. Signed-off-by: Philip Chen Reviewed-by: Stephen Boyd Reviewed-by: Stephen Boyd --- (no changes since v2) Changes in v2: - Rename CROS_STD_NON_TOP_ROW_KEYMAP to CROS_STD_MAIN_KEYMAP include/dt-bindings/input/cros-ec-keyboard.h | 103 +++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 include/dt-bindings/input/cros-ec-keyboard.h diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h new file mode 100644 index 0000000000000..a37a8c5701219 --- /dev/null +++ b/include/dt-bindings/input/cros-ec-keyboard.h @@ -0,0 +1,103 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * This header provides the constants of the standard Chrome OS key matrix + * for cros-ec keyboard-controller bindings. + * + * Copyright (c) 2021 Google, Inc + */ + +#ifndef _CROS_EC_KEYBOARD_H +#define _CROS_EC_KEYBOARD_H + +#define CROS_STD_TOP_ROW_KEYMAP \ + MATRIX_KEY(0x00, 0x02, KEY_F1) \ + MATRIX_KEY(0x03, 0x02, KEY_F2) \ + MATRIX_KEY(0x02, 0x02, KEY_F3) \ + MATRIX_KEY(0x01, 0x02, KEY_F4) \ + MATRIX_KEY(0x03, 0x04, KEY_F5) \ + MATRIX_KEY(0x02, 0x04, KEY_F6) \ + MATRIX_KEY(0x01, 0x04, KEY_F7) \ + MATRIX_KEY(0x02, 0x09, KEY_F8) \ + MATRIX_KEY(0x01, 0x09, KEY_F9) \ + MATRIX_KEY(0x00, 0x04, KEY_F10) \ + MATRIX_KEY(0x03, 0x09, KEY_F13) + +#define CROS_STD_MAIN_KEYMAP \ + MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA) \ + MATRIX_KEY(0x00, 0x03, KEY_B) \ + MATRIX_KEY(0x00, 0x05, KEY_RO) \ + MATRIX_KEY(0x00, 0x06, KEY_N) \ + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) \ + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) \ + MATRIX_KEY(0x01, 0x01, KEY_ESC) \ + MATRIX_KEY(0x01, 0x03, KEY_G) \ + MATRIX_KEY(0x01, 0x06, KEY_H) \ + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) \ + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) \ + MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) \ + \ + MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL) \ + MATRIX_KEY(0x02, 0x01, KEY_TAB) \ + MATRIX_KEY(0x02, 0x03, KEY_T) \ + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) \ + MATRIX_KEY(0x02, 0x06, KEY_Y) \ + MATRIX_KEY(0x02, 0x07, KEY_102ND) \ + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) \ + MATRIX_KEY(0x02, 0x0a, KEY_YEN) \ + \ + MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA) \ + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) \ + MATRIX_KEY(0x03, 0x03, KEY_5) \ + MATRIX_KEY(0x03, 0x06, KEY_6) \ + MATRIX_KEY(0x03, 0x08, KEY_MINUS) \ + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) \ + MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) \ + \ + MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL) \ + MATRIX_KEY(0x04, 0x01, KEY_A) \ + MATRIX_KEY(0x04, 0x02, KEY_D) \ + MATRIX_KEY(0x04, 0x03, KEY_F) \ + MATRIX_KEY(0x04, 0x04, KEY_S) \ + MATRIX_KEY(0x04, 0x05, KEY_K) \ + MATRIX_KEY(0x04, 0x06, KEY_J) \ + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) \ + MATRIX_KEY(0x04, 0x09, KEY_L) \ + MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH) \ + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) \ + \ + MATRIX_KEY(0x05, 0x01, KEY_Z) \ + MATRIX_KEY(0x05, 0x02, KEY_C) \ + MATRIX_KEY(0x05, 0x03, KEY_V) \ + MATRIX_KEY(0x05, 0x04, KEY_X) \ + MATRIX_KEY(0x05, 0x05, KEY_COMMA) \ + MATRIX_KEY(0x05, 0x06, KEY_M) \ + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) \ + MATRIX_KEY(0x05, 0x08, KEY_SLASH) \ + MATRIX_KEY(0x05, 0x09, KEY_DOT) \ + MATRIX_KEY(0x05, 0x0b, KEY_SPACE) \ + \ + MATRIX_KEY(0x06, 0x01, KEY_1) \ + MATRIX_KEY(0x06, 0x02, KEY_3) \ + MATRIX_KEY(0x06, 0x03, KEY_4) \ + MATRIX_KEY(0x06, 0x04, KEY_2) \ + MATRIX_KEY(0x06, 0x05, KEY_8) \ + MATRIX_KEY(0x06, 0x06, KEY_7) \ + MATRIX_KEY(0x06, 0x08, KEY_0) \ + MATRIX_KEY(0x06, 0x09, KEY_9) \ + MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT) \ + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) \ + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) \ + \ + MATRIX_KEY(0x07, 0x01, KEY_Q) \ + MATRIX_KEY(0x07, 0x02, KEY_E) \ + MATRIX_KEY(0x07, 0x03, KEY_R) \ + MATRIX_KEY(0x07, 0x04, KEY_W) \ + MATRIX_KEY(0x07, 0x05, KEY_I) \ + MATRIX_KEY(0x07, 0x06, KEY_U) \ + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) \ + MATRIX_KEY(0x07, 0x08, KEY_P) \ + MATRIX_KEY(0x07, 0x09, KEY_O) \ + MATRIX_KEY(0x07, 0x0b, KEY_UP) \ + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) + +#endif /* _CROS_EC_KEYBOARD_H */ From patchwork Fri Jan 15 22:36:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Chen X-Patchwork-Id: 1427387 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=mtSWsJyy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DHbf85J57z9sWP for ; Sat, 16 Jan 2021 09:37:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbhAOWhH (ORCPT ); Fri, 15 Jan 2021 17:37:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726584AbhAOWhH (ORCPT ); Fri, 15 Jan 2021 17:37:07 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49CD1C061795 for ; Fri, 15 Jan 2021 14:36:27 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id b3so6406162pft.3 for ; Fri, 15 Jan 2021 14:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A3QHeBv0dD4s5gNfnmON1tlU9NgzLsj2NG7ehBQ00dQ=; b=mtSWsJyyn/E3m/bOxirC2eQylWPD/zEdB3jMcJo97C2FkFN1wnTVnPymt6cD365E/4 rhccHDZS8Lmfxz6a16Hi+8LK8UYEspZfbQ3WwtjfaxRhQuKrY9z9Rl38ZoI7089PQ9Ub vVkqjTndk4IToHXeSSwzXQBuXXkSfBTkczRuc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A3QHeBv0dD4s5gNfnmON1tlU9NgzLsj2NG7ehBQ00dQ=; b=bT3nm1VJP3vWpnVAVQ+NE014Dn4sHrt3rvkf2AxIxPTN6hzLU3c1g+7mlJLhaHIfZF Xqw0xCx31odOSf297ygDH2ZgepLs6rtWYpn6g8pk80hJxKopyNrFNtS5tHEAQHmX/Ok7 iMojU3cgdzhgyzaNqk6wpVKV5t8d3/AH8sztgaM0cqzmlI5bp5/Iqy61g/L89SfWDcdl GUhCLQqnGRe7A2/glT+gX9TJn87ffEmrj71ZSiIjlLqjx/BH8oeZdLREKLJHFRDHgAPe ZxeaFIrDYWNxDpdtUsnMfgMkC8Fphm1nbkj3W86hNnwHRQ05pFjjYsVx9wljeg09KmV+ 1hXw== X-Gm-Message-State: AOAM5314UXghR+5CQVHQkeiP9DagPsxeYhToEYReONr2yhe1HeDCwhQa eYkCPpVu5+sj6GpOmlYyC0ygng== X-Google-Smtp-Source: ABdhPJwlwsNQq32Qc8tMrciESRZ9K2Hi+zYf71D6e1b++O6SYLlXBMaa2smWgYVhaUvtUoylYX21kg== X-Received: by 2002:a63:b05:: with SMTP id 5mr15071946pgl.163.1610750186891; Fri, 15 Jan 2021 14:36:26 -0800 (PST) Received: from philipchen.mtv.corp.google.com ([2620:15c:202:201:a6ae:11ff:fe11:fd59]) by smtp.gmail.com with ESMTPSA id l3sm5208670pjz.27.2021.01.15.14.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 14:36:26 -0800 (PST) From: Philip Chen To: LKML , dmitry.torokhov@gmail.com Cc: swboyd@chromium.org, dianders@chromium.org, Philip Chen , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v6 3/3] dt-bindings: input: Fix the keymap for LOCK key Date: Fri, 15 Jan 2021 14:36:17 -0800 Message-Id: <20210115143555.v6.3.I96134907488f41f358d03f3c1b08194f9547e670@changeid> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115143555.v6.1.Iaa8a60cf2ed4b7ad5e2fbb4ad76a1c600ee36113@changeid> References: <20210115143555.v6.1.Iaa8a60cf2ed4b7ad5e2fbb4ad76a1c600ee36113@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Decouple LOCK from F13 and directly map the LOCK key (KSI3/KSO9) to KEY_SLEEP action key code. Signed-off-by: Philip Chen Reviewed-by: Stephen Boyd Acked-by: Rob Herring --- Changes in v6: - New patch in v6 include/dt-bindings/input/cros-ec-keyboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h index a37a8c5701219..f0ae03634a966 100644 --- a/include/dt-bindings/input/cros-ec-keyboard.h +++ b/include/dt-bindings/input/cros-ec-keyboard.h @@ -19,8 +19,7 @@ MATRIX_KEY(0x01, 0x04, KEY_F7) \ MATRIX_KEY(0x02, 0x09, KEY_F8) \ MATRIX_KEY(0x01, 0x09, KEY_F9) \ - MATRIX_KEY(0x00, 0x04, KEY_F10) \ - MATRIX_KEY(0x03, 0x09, KEY_F13) + MATRIX_KEY(0x00, 0x04, KEY_F10) #define CROS_STD_MAIN_KEYMAP \ MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA) \ @@ -50,6 +49,7 @@ MATRIX_KEY(0x03, 0x03, KEY_5) \ MATRIX_KEY(0x03, 0x06, KEY_6) \ MATRIX_KEY(0x03, 0x08, KEY_MINUS) \ + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) \ MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) \ MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) \ \