From patchwork Thu Jun 6 17:34:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daisuke Nojiri X-Patchwork-Id: 13688843 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FBA319645E for ; Thu, 6 Jun 2024 17:35:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695344; cv=none; b=la0/4bN5YcJOwELcfrx+SONyZVzrXDRRSGoQmNaegor81Wss78KwSjpGmto7MdAgyR1UpCq84XF0r9jVDyVyw9oPcqDWfyHlu3h7ay9J0LpIqNCAP8fv1R3epbLGq9qnQlGWXhHvoTK2An9TCmXt7FstJ6TPMpOst2zZNYFQ5is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695344; c=relaxed/simple; bh=xABQwRoV/rPfzO361kpsP71OpAjQdGoHAsuSMSpEf8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O4GVV3Px/YcBu1Q71bJ+ZUtTp9vZsEbF0/HgA21zLeOwDbhPGrtELy77EU8tltTsOrtp6g+ZihRxeM+Sd0Nj8N91ptL/+641EeOwN7CG49u23BcLRlULq67EZlSR916lYpVUpZgBoHoA77M3t1IIF5mVjlFh4IFte972Kb8WwdY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=I3C6U6ir; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="I3C6U6ir" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-70264bcb631so1070200b3a.2 for ; Thu, 06 Jun 2024 10:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717695342; x=1718300142; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FhekWzHrW9NurW+RaIOThqGP3SBDgZ6s+7MlrIOk/wY=; b=I3C6U6ireXGedg63IzZH6PLqRkj9QrHa8y1fORZqcAMUFHwJ4wQDtNe+GEqEWh0izV 3xU6OUfChOR4eYZDjTmHqa35PgqzAqv/N0aMDXfofstp9X4Rmfm3ZrvzR2Zh8vEw6ihj VOOk4ozmr0NEtzupcnbCqEQVexPwfmO6lzfJ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717695342; x=1718300142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FhekWzHrW9NurW+RaIOThqGP3SBDgZ6s+7MlrIOk/wY=; b=ldDVk5ZUj+Q1QErR44TxZpZvI3G6/LUV/gfLG6GO8q29718DxmWIaLGqTv0OI++TDQ Vw/R1NIpUhql0Zz5yoFxMu14TEvn55qNVxZCxKP0IVvp9v9IuBvRK6vNxyQXpaamzUlG GqmJWn6yTu4J03pGasyMtwyIl//24iGBP3yTwy3TnHY6/0zhHbBM3wxH/aaTjNqUw1tr EnVrhwhwdM9bhePn7GVNuh956Nf6KIMcTkpY42sfx5R+yd0doxlNlpDg29j/+xaFwgM5 yDBlHd405NMBKWB2IHWlTVUJurlUyllA3HWN2fmNhMk5jK+NujWQUAjZb3nzpxhvP3yI c6gA== X-Forwarded-Encrypted: i=1; AJvYcCV0HIZgxqAKGz1NV3SwEHesoSZ8/rT5seZyIGlElFrP+or3XBRegQSB2KUd3bjKUOvNJ74tL9HBmVgDrj7tYQ1Qxfsr5wHccBr2Li+JUKyF X-Gm-Message-State: AOJu0YyqA8tlkUxvildQZGPaYXTIoTcvjVdaNBrE5X9GkJboJLvuDw7p Bt1nKaf0W8wdeNDEMjrmONUR7BRqj1WSVzOOZurKKShcGMDSrU6UgBvC54MW+g== X-Google-Smtp-Source: AGHT+IGqky3MNy6C2rzmt/288+9Xbb/3YZaZphiKwa4B9QhEBIhCOCT7QnAC/sV7qoLsAhgL5gCPbA== X-Received: by 2002:a05:6a20:7f8c:b0:1af:fff9:30dd with SMTP id adf61e73a8af0-1b2f9bd93c6mr270327637.35.1717695342540; Thu, 06 Jun 2024 10:35:42 -0700 (PDT) Received: from pc98uv11.mtv.corp.google.com ([2620:15c:9d:2:3fe9:f321:712c:442f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-703fd375503sm1334904b3a.42.2024.06.06.10.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 10:35:42 -0700 (PDT) From: Daisuke Nojiri To: Cc: Daisuke Nojiri , Benson Leung , Guenter Roeck , Hans Verkuil , Reka Norman , Tzung-Bi Shih , Gwendal Grignou , Abhishek Pandit-Subedi , Pavan Holla , Ching-Kang Yen , Lukasz Majczak , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/3 v4] platform/chrome: Add struct ec_response_get_next_event_v3 Date: Thu, 6 Jun 2024 10:34:28 -0700 Message-ID: <20240606173509.243739-2-dnojiri@chromium.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240606173509.243739-1-dnojiri@chromium.org> References: <20240604005354.2294468-1-dnojiri@chromium.org> <20240606173509.243739-1-dnojiri@chromium.org> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add struct ec_response_get_next_event_v3 to upgrade EC_CMD_GET_NEXT_EVENT to version 3. Signed-off-by: Daisuke Nojiri --- .../linux/platform_data/cros_ec_commands.h | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux/platform_data/cros_ec_commands.h index 070e49c5381e..fff191a8d413 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -3527,6 +3527,34 @@ union __ec_align_offset1 ec_response_get_next_data_v1 { }; BUILD_ASSERT(sizeof(union ec_response_get_next_data_v1) == 16); +union __ec_align_offset1 ec_response_get_next_data_v3 { + uint8_t key_matrix[18]; + + /* Unaligned */ + uint32_t host_event; + uint64_t host_event64; + + struct __ec_todo_unpacked { + /* For aligning the fifo_info */ + uint8_t reserved[3]; + struct ec_response_motion_sense_fifo_info info; + } sensor_fifo; + + uint32_t buttons; + + uint32_t switches; + + uint32_t fp_events; + + uint32_t sysrq; + + /* CEC events from enum mkbp_cec_event */ + uint32_t cec_events; + + uint8_t cec_message[16]; +}; +BUILD_ASSERT(sizeof(union ec_response_get_next_data_v3) == 18); + struct ec_response_get_next_event { uint8_t event_type; /* Followed by event data if any */ @@ -3539,6 +3567,12 @@ struct ec_response_get_next_event_v1 { union ec_response_get_next_data_v1 data; } __ec_align1; +struct ec_response_get_next_event_v3 { + uint8_t event_type; + /* Followed by event data if any */ + union ec_response_get_next_data_v3 data; +} __ec_align1; + /* Bit indices for buttons and switches.*/ /* Buttons */ #define EC_MKBP_POWER_BUTTON 0 From patchwork Thu Jun 6 17:34:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daisuke Nojiri X-Patchwork-Id: 13688844 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9372E19597A for ; Thu, 6 Jun 2024 17:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695353; cv=none; b=WotMfa9dBY9CHum5Kxe9pd5NZEXcZtGgTxqdjY4lHixOI4tUsFuyXY8Nwaah63AOlzdJqaww4WAwzFVYchoLnqLQ6Y10IRAGL86z6yXOFPJsCh1IYemU0dvbMmlR93flGxjgHpFMwews9It8rzx8BN0nZ7J4PYSMVCh36ZtlAz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695353; c=relaxed/simple; bh=qQ216A7Cu3X95KjC96oChuTYwL6nPl5HT7+Ubx2VE4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MKc/WKVM4eM4xnW8c8Ft+afqlNNHeAkbM5rAtaCwjxWEn897XLhAXkHaAA/s6zmEKsobGWfbSezMcZH3FqQsnzNYUlNSQImmuKkfCVBQmTbiYmfv7PYcCe1Ez7oo9W/E3eh27t6naAeCc1jay3FbhSKqa6Z+WWAfGp349TMSd2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kRbl1ec6; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kRbl1ec6" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-702555eb23bso1038943b3a.1 for ; Thu, 06 Jun 2024 10:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717695351; x=1718300151; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jbUvxHBzQ3FTw0LHwYR3I6ZzDjqDjsM/1Nz1IUatQIk=; b=kRbl1ec6UsjJUv1laa74pbnq9KNHPFhyNc0rzOdDhLSbLAoD06nyeVPyFzcgH0Gu/K N2bnxzp7j/ahx0+7ec5BPy8UJnJkL/s3nuJLFXPoLGW2EehySoEpmvugSHLPVGyUn/LR 5t94kYhcwuk0Pg3zXD8H2W/Wc56fOef1dC9MY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717695351; x=1718300151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jbUvxHBzQ3FTw0LHwYR3I6ZzDjqDjsM/1Nz1IUatQIk=; b=CDUt9YvOA71D7UtjhEAux2rL/6nY/FiGUmbgM/G/pPnm/s9livE/BV+vMIme8pu2gy a/6uzVgstVeaQlEl/nui3/xGEQOVi03zXQdoAxr8ZMCFbz2vu7/QWJt0t0c8X/Z67XV4 FA/GSSw1v6OJLFR7a/WC4SL88Ee5kkk7yAvGYb/kWY2fEv0LYjPh43ygVJXimgHltlHV 0R5QXpl1AXBm6Q7mwRShExwsWK/NhpCgezBn++oMXcL8QgdXqq8CDsLKmmPjUvUB8/bM o2TChZMEmPFdxaI6JuMf84aTwgpX2Xu5vrnpKIkqd3abMTcZCSrvPboqQBaFGDQ0kyw8 2iCg== X-Forwarded-Encrypted: i=1; AJvYcCVZAhkpTwcR5M+Yl3NEmsmeqj/6lcD0P9XZGBN22PkipHclC024yo3NOvYJ/HvAJCQG87ySvs7zXgIMPJO1VKBVXnViQMJHZ7A8fJbYNroa X-Gm-Message-State: AOJu0Yw/FodfXk9q1PD2EywKNO9Z3wsKVf3Ja8A8tzxFPCcEqKxBZbQD ZQzTj6JF3hGYvWXP6Q0L2pFpDx6Cw4iq0XRQMtteyLaNVtVJ1K3nhyG9kzqbmw== X-Google-Smtp-Source: AGHT+IEtOrPb4+1UjzrSVqS0irLPa19FnZHz7O6ML/YLqJhzc7RglwIlsVafldvdolZroniQNOeNxQ== X-Received: by 2002:a05:6a00:218f:b0:6f8:f020:af02 with SMTP id d2e1a72fcca58-7040c749e6emr122067b3a.34.1717695350886; Thu, 06 Jun 2024 10:35:50 -0700 (PDT) Received: from pc98uv11.mtv.corp.google.com ([2620:15c:9d:2:3fe9:f321:712c:442f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-703fd375503sm1334904b3a.42.2024.06.06.10.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 10:35:50 -0700 (PDT) From: Daisuke Nojiri To: Cc: Daisuke Nojiri , Benson Leung , Tzung-Bi Shih , Guenter Roeck , Stephen Boyd , Prashant Malani , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/3 v4] platform/chrome: cros_ec_proto: Upgrade get_next_event to v3 Date: Thu, 6 Jun 2024 10:34:29 -0700 Message-ID: <20240606173509.243739-3-dnojiri@chromium.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240606173509.243739-1-dnojiri@chromium.org> References: <20240604005354.2294468-1-dnojiri@chromium.org> <20240606173509.243739-1-dnojiri@chromium.org> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Upgrade EC_CMD_GET_NEXT_EVENT to version 3. The max supported version will be v3. So, we speak v3 even if the EC says it supports v4+. Signed-off-by: Daisuke Nojiri --- drivers/platform/chrome/cros_ec_proto.c | 27 ++++++++++++++------- include/linux/platform_data/cros_ec_proto.h | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c index 945b1b15a04c..df257ab12968 100644 --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -686,7 +686,7 @@ EXPORT_SYMBOL(cros_ec_cmd_xfer_status); static int get_next_event_xfer(struct cros_ec_device *ec_dev, struct cros_ec_command *msg, - struct ec_response_get_next_event_v1 *event, + struct ec_response_get_next_event_v3 *event, int version, uint32_t size) { int ret; @@ -709,11 +709,12 @@ static int get_next_event(struct cros_ec_device *ec_dev) { struct { struct cros_ec_command msg; - struct ec_response_get_next_event_v1 event; + struct ec_response_get_next_event_v3 event; } __packed buf; struct cros_ec_command *msg = &buf.msg; - struct ec_response_get_next_event_v1 *event = &buf.event; - const int cmd_version = ec_dev->mkbp_event_supported - 1; + struct ec_response_get_next_event_v3 *event = &buf.event; + int cmd_version = ec_dev->mkbp_event_supported - 1; + uint32_t size; memset(msg, 0, sizeof(*msg)); if (ec_dev->suspended) { @@ -721,12 +722,20 @@ static int get_next_event(struct cros_ec_device *ec_dev) return -EHOSTDOWN; } - if (cmd_version == 0) - return get_next_event_xfer(ec_dev, msg, event, 0, - sizeof(struct ec_response_get_next_event)); + if (cmd_version == 0) { + size = sizeof(struct ec_response_get_next_event); + } else if (cmd_version < 3) { + size = sizeof(struct ec_response_get_next_event_v1); + } else { + /* + * The max version we support is v3. So, we speak v3 even if the + * EC says it supports v4+. + */ + cmd_version = 3; + size = sizeof(struct ec_response_get_next_event_v3); + } - return get_next_event_xfer(ec_dev, msg, event, cmd_version, - sizeof(struct ec_response_get_next_event_v1)); + return get_next_event_xfer(ec_dev, msg, event, cmd_version, size); } static int get_keyboard_state_event(struct cros_ec_device *ec_dev) diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h index 8865e350c12a..dbfd38b3becd 100644 --- a/include/linux/platform_data/cros_ec_proto.h +++ b/include/linux/platform_data/cros_ec_proto.h @@ -185,7 +185,7 @@ struct cros_ec_device { bool host_sleep_v1; struct blocking_notifier_head event_notifier; - struct ec_response_get_next_event_v1 event_data; + struct ec_response_get_next_event_v3 event_data; int event_size; u32 host_event_wake_mask; u32 last_resume_result; From patchwork Thu Jun 6 17:34:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daisuke Nojiri X-Patchwork-Id: 13688845 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C76F1991DA for ; Thu, 6 Jun 2024 17:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695355; cv=none; b=N9xgvA9Ckq+lYOq2itFyEDq6cS5iZbtiIPUPlGr+apFcUNWQP+d3lCLMjKSTEa8RF6pQmqYyLjqPc5qwSmoCyg4gfA0CiRHW53rNAn8AYZ2FK6/Blz3c2AI8YN/9ayz0yoQ1mNteizuLvD4yGPvQA1uTeUYbughzj2his2bPmJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717695355; c=relaxed/simple; bh=JNXCflDio0Du4CwfDelhowY/4X5glDuOivTHSZ4vr60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N59Ox8RqoEREGeaOPZbULCJ1OoAr8//ZZnBe/HyrHrnNK3JD9JktdRM2K7a3p+t/17k26SjcJvJTACrUxHPNjmeFegPq8+l/MK3aGRYsUnvRRNK7QogHXweOQ0kLBVgd8XU2xfDUsi4C6VNwb5nSzyDRZbgl/IJGipGS8OtRZ7g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Gr8+mfR4; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Gr8+mfR4" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7025ca8bebcso1087460b3a.3 for ; Thu, 06 Jun 2024 10:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717695353; x=1718300153; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SNZT90i7xX7z9SBNw7Fi+15fEhA21+XfQ1kCVGtVUWU=; b=Gr8+mfR4SzmOApUrc7EFYmUM/+AECZdRNBxrVgO5Ry/ZQXMXevMKxL8agyPLPcIawk PxQTPZhWW4UMYSwzu63FRWKymsS7bsHdOmX9/86yI9GLDHo0JBsu1Tc3vnvJo6nBNbrr +LwOLyf5HoOID8ft0fGhsEx8BShXPHMG7U0wc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717695353; x=1718300153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SNZT90i7xX7z9SBNw7Fi+15fEhA21+XfQ1kCVGtVUWU=; b=bvhg86VUusT42PucOl0PcaQLvVKEJdVjDqcs2nFft3eNWTicKTnlsrZYyrqRPRrrio ZTBb2bhB3maQkAGfyOSNlB4BA/8J87zERZtoJVT0kp/M2d85r5zHb6HHFg/fV0qsqQfQ s4+5O7h3MfnkO1WNZhrjCfoEFP/eByOE6WOL9yfC6qkyL8ZwkxdrZ4OMbs7J2pxqnaYy UM43buazAYXxoaY5lB5sPiE5reAUo5/4EQISQs3Xb50MrXZIrTqLuCww0tY2fXcM+wZw wK3sBXtMepIVoq0MLJMoYUDraj+dF8pgUmiyGrJrPqALGw/F8dz7b0QChzUkv0nO4soH /3PA== X-Forwarded-Encrypted: i=1; AJvYcCW4pAykaoCilKnNRspt6r2o+PJ/3v6y3Xx3+gBmkI0ROUtmfzm0vXMMfW+4VprW3mCHNoN0mp9BTHrs99alDHEP5Pxsosr8hyY4+uJiX2RF X-Gm-Message-State: AOJu0YxMP1bc9/IYxp+/LHJps3WroxJpcvEUZS8PEXFzlocwaLFRY3ju V42vppDwrVO3q+UjINADijuP5nU6ahpE5mhz7LPjVvjcqoP+0eBMb9B6iCENXw== X-Google-Smtp-Source: AGHT+IHvUtVDhjTFNuhMNUZCXM9tIRlP4ACCXa2ST0RxyLrWRDwQVLc2GshKOnDDj1UIRLsNM512eQ== X-Received: by 2002:a05:6a00:21c9:b0:6f3:e6e0:d9f3 with SMTP id d2e1a72fcca58-7040c752719mr134972b3a.31.1717695353412; Thu, 06 Jun 2024 10:35:53 -0700 (PDT) Received: from pc98uv11.mtv.corp.google.com ([2620:15c:9d:2:3fe9:f321:712c:442f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-703fd375503sm1334904b3a.42.2024.06.06.10.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 10:35:53 -0700 (PDT) From: Daisuke Nojiri To: Cc: Daisuke Nojiri , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Benson Leung , Guenter Roeck , linux-input@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/3 v4] dt-bindings: cros-ec-keyboard: Add keyboard matrix v3.0 Date: Thu, 6 Jun 2024 10:34:30 -0700 Message-ID: <20240606173509.243739-4-dnojiri@chromium.org> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog In-Reply-To: <20240606173509.243739-1-dnojiri@chromium.org> References: <20240604005354.2294468-1-dnojiri@chromium.org> <20240606173509.243739-1-dnojiri@chromium.org> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add support for keyboard matrix version 3.0, which reduces keyboard ghosting. Signed-off-by: Daisuke Nojiri --- include/dt-bindings/input/cros-ec-keyboard.h | 104 +++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h index f0ae03634a96..afc12f6aa642 100644 --- a/include/dt-bindings/input/cros-ec-keyboard.h +++ b/include/dt-bindings/input/cros-ec-keyboard.h @@ -100,4 +100,108 @@ MATRIX_KEY(0x07, 0x0b, KEY_UP) \ MATRIX_KEY(0x07, 0x0c, KEY_LEFT) +/* No numpad */ +#define CROS_TOP_ROW_KEYMAP_V30 \ + MATRIX_KEY(0x00, 0x01, KEY_F11) /* T11 */ \ + MATRIX_KEY(0x00, 0x02, KEY_F1) /* T1 */ \ + MATRIX_KEY(0x00, 0x04, KEY_F10) /* T10 */ \ + MATRIX_KEY(0x00, 0x0b, KEY_F14) /* T14 */ \ + MATRIX_KEY(0x00, 0x0c, KEY_F15) /* T15 */ \ + MATRIX_KEY(0x01, 0x02, KEY_F4) /* T4 */ \ + MATRIX_KEY(0x01, 0x04, KEY_F7) /* T7 */ \ + MATRIX_KEY(0x01, 0x05, KEY_F12) /* T12 */ \ + MATRIX_KEY(0x01, 0x09, KEY_F9) /* T9 */ \ + MATRIX_KEY(0x02, 0x02, KEY_F3) /* T3 */ \ + MATRIX_KEY(0x02, 0x04, KEY_F6) /* T6 */ \ + MATRIX_KEY(0x02, 0x0b, KEY_F8) /* T8 */ \ + MATRIX_KEY(0x03, 0x02, KEY_F2) /* T2 */ \ + MATRIX_KEY(0x03, 0x05, KEY_F13) /* T13 */ \ + MATRIX_KEY(0x04, 0x04, KEY_F5) /* T5 */ + +#define CROS_MAIN_KEYMAP_V30 /* Keycode */ \ + MATRIX_KEY(0x00, 0x03, KEY_B) /* 50 */ \ + MATRIX_KEY(0x00, 0x05, KEY_N) /* 51 */ \ + MATRIX_KEY(0x00, 0x06, KEY_RO) /* 56 (JIS) */ \ + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) /* 13 */ \ + MATRIX_KEY(0x00, 0x09, KEY_HOME) /* 80 (Numpad) */ \ + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) /* 62 */ \ + MATRIX_KEY(0x00, 0x10, KEY_FN) /* 127 */ \ + \ + MATRIX_KEY(0x01, 0x01, KEY_ESC) /* 110 */ \ + MATRIX_KEY(0x01, 0x03, KEY_G) /* 35 */ \ + MATRIX_KEY(0x01, 0x06, KEY_H) /* 36 */ \ + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) /* 41 */ \ + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) /* 15 */ \ + MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) /* 65 (JIS) */ \ + MATRIX_KEY(0x01, 0x0e, KEY_LEFTCTRL) /* 58 */ \ + \ + MATRIX_KEY(0x02, 0x01, KEY_TAB) /* 16 */ \ + MATRIX_KEY(0x02, 0x03, KEY_T) /* 21 */ \ + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) /* 28 */ \ + MATRIX_KEY(0x02, 0x06, KEY_Y) /* 22 */ \ + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) /* 27 */ \ + MATRIX_KEY(0x02, 0x09, KEY_DELETE) /* 76 (Numpad) */ \ + MATRIX_KEY(0x02, 0x0c, KEY_PAGEUP) /* 85 (Numpad) */ \ + MATRIX_KEY(0x02, 0x011, KEY_YEN) /* 14 (JIS) */ \ + \ + MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA) /* Launcher */ \ + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) /* 1 */ \ + MATRIX_KEY(0x03, 0x03, KEY_5) /* 6 */ \ + MATRIX_KEY(0x03, 0x04, KEY_S) /* 32 */ \ + MATRIX_KEY(0x03, 0x06, KEY_MINUS) /* 12 */ \ + MATRIX_KEY(0x03, 0x08, KEY_6) /* 7 */ \ + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* Lock */ \ + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) /* 29 */ \ + MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) /* 63 (JIS) */ \ + MATRIX_KEY(0x03, 0x0e, KEY_RIGHTCTRL) /* 64 */ \ + \ + MATRIX_KEY(0x04, 0x01, KEY_A) /* 31 */ \ + MATRIX_KEY(0x04, 0x02, KEY_D) /* 33 */ \ + MATRIX_KEY(0x04, 0x03, KEY_F) /* 34 */ \ + MATRIX_KEY(0x04, 0x05, KEY_K) /* 38 */ \ + MATRIX_KEY(0x04, 0x06, KEY_J) /* 37 */ \ + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) /* 40 */ \ + MATRIX_KEY(0x04, 0x09, KEY_L) /* 39 */ \ + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) /* 43 */ \ + MATRIX_KEY(0x04, 0x0c, KEY_END) /* 81 (Numpad) */ \ + \ + MATRIX_KEY(0x05, 0x01, KEY_1) /* 2 */ \ + MATRIX_KEY(0x05, 0x02, KEY_COMMA) /* 53 */ \ + MATRIX_KEY(0x05, 0x03, KEY_DOT) /* 54 */ \ + MATRIX_KEY(0x05, 0x04, KEY_SLASH) /* 55 */ \ + MATRIX_KEY(0x05, 0x05, KEY_C) /* 48 */ \ + MATRIX_KEY(0x05, 0x06, KEY_SPACE) /* 61 */ \ + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) /* 44 */ \ + MATRIX_KEY(0x05, 0x08, KEY_X) /* 47 */ \ + MATRIX_KEY(0x05, 0x09, KEY_V) /* 49 */ \ + MATRIX_KEY(0x05, 0x0b, KEY_M) /* 52 */ \ + MATRIX_KEY(0x05, 0x0c, KEY_PAGEDOWN) /* 86 (Numpad) */ \ + \ + MATRIX_KEY(0x06, 0x01, KEY_Z) /* 46 */ \ + MATRIX_KEY(0x06, 0x02, KEY_3) /* 4 */ \ + MATRIX_KEY(0x06, 0x03, KEY_4) /* 5 */ \ + MATRIX_KEY(0x06, 0x04, KEY_2) /* 3 */ \ + MATRIX_KEY(0x06, 0x05, KEY_8) /* 9 */ \ + MATRIX_KEY(0x06, 0x06, KEY_0) /* 11 */ \ + MATRIX_KEY(0x06, 0x08, KEY_7) /* 8 */ \ + MATRIX_KEY(0x06, 0x09, KEY_9) /* 10 */ \ + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) /* 84 */ \ + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) /* 89 */ \ + MATRIX_KEY(0x06, 0x0d, KEY_LEFTALT) /* 60 */ \ + MATRIX_KEY(0x06, 0x0f, KEY_ASSISTANT) /* 128 */ \ + MATRIX_KEY(0x06, 0x11, KEY_BACKSLASH) /* 42 (JIS, ISO) */ \ + \ + MATRIX_KEY(0x07, 0x01, KEY_U) /* 23 */ \ + MATRIX_KEY(0x07, 0x02, KEY_I) /* 24 */ \ + MATRIX_KEY(0x07, 0x03, KEY_O) /* 25 */ \ + MATRIX_KEY(0x07, 0x04, KEY_P) /* 26 */ \ + MATRIX_KEY(0x07, 0x05, KEY_Q) /* 17 */ \ + MATRIX_KEY(0x07, 0x06, KEY_W) /* 18 */ \ + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) /* 57 */ \ + MATRIX_KEY(0x07, 0x08, KEY_E) /* 19 */ \ + MATRIX_KEY(0x07, 0x09, KEY_R) /* 20 */ \ + MATRIX_KEY(0x07, 0x0b, KEY_UP) /* 83 */ \ + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) /* 79 */ \ + MATRIX_KEY(0x07, 0x11, KEY_102ND) /* 45 (ISO) */ + #endif /* _CROS_EC_KEYBOARD_H */