From patchwork Wed Apr 13 03:33:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 562712 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32900C433FE for ; Wed, 13 Apr 2022 03:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231989AbiDMDgD (ORCPT ); Tue, 12 Apr 2022 23:36:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231566AbiDMDgB (ORCPT ); Tue, 12 Apr 2022 23:36:01 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B76B31172 for ; Tue, 12 Apr 2022 20:33:38 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id 2so717388pjw.2 for ; Tue, 12 Apr 2022 20:33:38 -0700 (PDT) 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=t5+17MwOfKkjlV7qFQ2T4jzjQQOl3tsJ8bcwnmeF1zs=; b=gbH9pYSjrXenr+hUMeYXKSMyWCpkwKnnto8bFtn/g1IZ1uI7kom4DXNkPWQSgFGQW5 by9E/tmsfTyEpyLgDkMsxkw6GAQJztqGH2edbwAAlvi2eU3wbhyZNwd+kfbQS3o9X146 tKxmkPIQ349/AiN2qc2+epD7kPXKjd8rsErwY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t5+17MwOfKkjlV7qFQ2T4jzjQQOl3tsJ8bcwnmeF1zs=; b=cXSa3w82NRnGtdWXeti/ROTaRBZUXGjNMZBarKYDkoo5WmhzzA038arSm31ki21WyQ 9sWLgPFUb0avqUKYILrerpVBlEaHbDzgmaizc3lP+nfSdTVb6ue9I5EvmQaZrdQz8Q5W jxymurYTi+06dHqPhj5ACSARfSBHa/PyylSILPLzx0wPaom9iUHQgKubCqZ7+yt2VZob 1E2kGGde0kWmzVqA20IEedMvKWOv6CHxCB3BuVqhwNQer2Pj7IgKr+EPTYzqf2hIq4hP AZMLch2DNvvR93BotwwNGjqzqdMbjofJZe2B8ojzUHWs0cwy68dP/VpJhUDnDD+2gnX1 VOkA== X-Gm-Message-State: AOAM533catgt+yQk5lXPkyxvwWkej2qaBzaZx+MyltVJDgPxd80a1p7L GCBWpPO5Wemai/sQ4Mh+SnZcKGz07+hskg== X-Google-Smtp-Source: ABdhPJw9jZo+lRdE1iLDIO0NPPq39p5vIfxagy7X9ANc7aXbHjJGphu1yS8zKqRb4HpQTnlksnxo4Q== X-Received: by 2002:a17:90a:8581:b0:1b2:7541:af6c with SMTP id m1-20020a17090a858100b001b27541af6cmr8534884pjn.48.1649820818315; Tue, 12 Apr 2022 20:33:38 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:87b3:e0ea:c924:6d1f]) by smtp.gmail.com with ESMTPSA id h10-20020a056a00230a00b004faa0f67c3esm39788276pfh.23.2022.04.12.20.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 20:33:38 -0700 (PDT) From: Stephen Boyd To: Dmitry Torokhov Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-input@vger.kernel.org, chrome-platform@lists.linux.dev, Benson Leung , Guenter Roeck , Douglas Anderson , Hsin-Yi Wang Subject: [PATCH 1/2] Input: cros-ec-keyb: Only register keyboard if rows/columns exist Date: Tue, 12 Apr 2022 20:33:33 -0700 Message-Id: <20220413033334.1514008-2-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog In-Reply-To: <20220413033334.1514008-1-swboyd@chromium.org> References: <20220413033334.1514008-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org If the device is a detachable, we may still probe this device because there are some button switches, e.g. volume buttons and power buttons, registered by this driver. Let's allow the device node to be missing row and column device properties to indicate that the keyboard matrix shouldn't be registered. This removes an input device on Trogdor devices such as Wormdingler that don't have a matrix keyboard, but still have power and volume buttons. That helps userspace understand there isn't a keyboard present when the detachable keyboard is disconnected. Cc: Benson Leung Cc: Guenter Roeck Cc: Douglas Anderson Cc: Hsin-Yi Wang Signed-off-by: Stephen Boyd --- I tried to use mkbp info to query the number of rows and columns, but my EC firmware doesn't have commit 8505881ed0b9 ("mkbp: Separate MKBP_INFO host command from the keyboard driver") so it always returns 8 and 13 for the rows and columns. Sigh. With updated firmware we could query it, or we could rely on DT like we do already. Originally I was setting the properties to 0, but matrix_keypad_parse_properties() spits out an error message in that case and so it seems better to delete the properties and check for their existence instead. Another alternative would be to change the compatible to be "google,cros-ec-keyb-switches" or something that indicates there are only switches and no matrix keyboard. drivers/input/keyboard/cros_ec_keyb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index 6534dfca60b4..ac9a953bff02 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -537,6 +537,15 @@ static int cros_ec_keyb_register_matrix(struct cros_ec_keyb *ckdev) u32 key_pos; unsigned int row, col, scancode, n_physmap; + /* + * No rows and columns? There isn't a matrix but maybe there are + * switches to register in cros_ec_keyb_register_bs() because this is a + * detachable device. + */ + if (!device_property_read_bool(dev, "keypad,num-rows") && + !device_property_read_bool(dev, "keypad,num-cols")) + return 0; + err = matrix_keypad_parse_properties(dev, &ckdev->rows, &ckdev->cols); if (err) return err; From patchwork Wed Apr 13 03:33:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 561057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 793A1C433EF for ; Wed, 13 Apr 2022 03:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231970AbiDMDgD (ORCPT ); Tue, 12 Apr 2022 23:36:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbiDMDgC (ORCPT ); Tue, 12 Apr 2022 23:36:02 -0400 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 09B1BBC3B for ; Tue, 12 Apr 2022 20:33:39 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id q3so853655plg.3 for ; Tue, 12 Apr 2022 20:33:39 -0700 (PDT) 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=wWjcJ6txlWYmGPmWUa/lkqIm8X8YcOdSGrKx1dUT1Lo=; b=YgtAnaC55D0KkRpSdrIiP6T3P81urr5g/Wsyj5iqniK8Yo6uNqXmgNDQKU8guUyzhO jlSo+XbhOceULSlwk/0SCtnBuGDZkatovifAvcLcQayYQv1lEq7uY+F77RUJezmvxfNq FYphnBMKohDI4+o1T5n5ebz12m/dXUiLta+AQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wWjcJ6txlWYmGPmWUa/lkqIm8X8YcOdSGrKx1dUT1Lo=; b=OO88155f+xRMoi1e7JY9+Hh4A4iu2xna5/lSL/G4LQrTsaWaHVBdv8HK7OLSadr7Le YSsHXNqSl2c3pY9xuRtpMtHmBVkS59sLlIakbRA0fda79tMd/8GYnL/tiDHvoI2EF5zz lt2T5vusaJEt2syKL1l0k1HbTsMX/LOxvoHcncmjKzCOLz3oReHZsdHIL8/vrDVV4Gru p7VI8d2BlJ3W+5nDOCe51uajQWhMM9ngH3vlPWAXGvDNRJZvl1FAa0sO4qqflzobuWYX pZghYlfz4aDrqsL5t7MWUPE+8beWQeT8AeDNBru7FjYI0AZ/y6CPQ+BhAI4eIVFg7l51 J+TA== X-Gm-Message-State: AOAM530zplKEQb0UQ1r1MdsdInLvOYUtnHqqflWmR6vx1p92qO5UQkiz rCiGEWQsy8QNR3hqGGqGBkMMtw== X-Google-Smtp-Source: ABdhPJygH42DZ5/k1O8K6z1nX5nC/7dmhOUdeF3Vfk0lEF1VmUGlNmFOQQytziHcSMNRDQiwjuoVuw== X-Received: by 2002:a17:90a:aa96:b0:1cb:c57f:9218 with SMTP id l22-20020a17090aaa9600b001cbc57f9218mr7161259pjq.227.1649820819494; Tue, 12 Apr 2022 20:33:39 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:87b3:e0ea:c924:6d1f]) by smtp.gmail.com with ESMTPSA id h10-20020a056a00230a00b004faa0f67c3esm39788276pfh.23.2022.04.12.20.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 20:33:39 -0700 (PDT) From: Stephen Boyd To: Dmitry Torokhov Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-input@vger.kernel.org, chrome-platform@lists.linux.dev, Benson Leung , Guenter Roeck , Douglas Anderson , Hsin-Yi Wang Subject: [RFC/PATCH 2/2] arm64: dts: qcom: sc7180-trogdor: Remove cros-ec keyboard from detachables Date: Tue, 12 Apr 2022 20:33:34 -0700 Message-Id: <20220413033334.1514008-3-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog In-Reply-To: <20220413033334.1514008-1-swboyd@chromium.org> References: <20220413033334.1514008-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Trogdor devices that have a detachable keyboard still have a non-detachable keyboard input device present because we include the cros-ec-keyboard.dtsi snippet in the top-level sc7180-trogdor.dtsi file that every variant board includes. We do this because the keyboard-controller node also provides some buttons like the power button and volume buttons. Unfortunately, this means we register a keyboard input device that doesn't do anything on boards with a detachable keyboard. Let's delete the rows/columns properties of the device node to indicate that there isn't a matrix keyboard on these boards. Cc: Benson Leung Cc: Guenter Roeck Cc: Douglas Anderson Cc: Hsin-Yi Wang Signed-off-by: Stephen Boyd --- This is mostly to show an example. The patch will be picked up by qcom maintainer if the first patch is accepted. arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index c81805ef2250..4173623cc241 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -119,6 +119,11 @@ &i2c9 { status = "disabled"; }; +&keyboard_controller { + /delete-property/keypad,num-rows; + /delete-property/keypad,num-columns; +}; + &panel { compatible = "boe,nv110wtm-n61"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index bff2b556cc75..7205062e88b4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -121,6 +121,11 @@ &camcc { status = "okay"; }; +&keyboard_controller { + /delete-property/keypad,num-rows; + /delete-property/keypad,num-columns; +}; + &panel { compatible = "samsung,atna33xc20"; enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;