From patchwork Wed Jan 4 13:59:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Valek - 2N X-Patchwork-Id: 38939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5158204wrt; Wed, 4 Jan 2023 06:03:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXuvXk5beIIMPX11NQAKCIVnC/XUR9lezxS1PZVqKYLN8IFie4hdiSWwjbuOElMu92IWViQx X-Received: by 2002:a05:6402:d9:b0:48e:c83d:a935 with SMTP id i25-20020a05640200d900b0048ec83da935mr4761664edu.29.1672841007908; Wed, 04 Jan 2023 06:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672841007; cv=none; d=google.com; s=arc-20160816; b=fYoNVD66FwhWbafS52UuNe/rYYlm2kV63ojHEDOM/oR3u3zKONxv3PBrROsF0YKRsa humABlYnX735DAsQ14p9VcTj0msnM0T4wMez0CtqylZT5PwI/CxBO2SOj0zBFAk3Guge iEF4uKj3BWstaPQ+PZpblOZmAfNiaLWnj1A6MIRiNv+djBTe4lKltX5OgJa0p8bI7o3E MkDmf0bhkgwX7wYQdT/RYL4a0Lp/abp9ATSIQMPigyeMht02odfE+jXSSxVnQcmbjjjx XzJhvrLFG/azntCsjANdO5LTe5p4G0N88hSDCPPNQ9DbmjASwO5FIlmsz5HJPecONP56 qm/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=l5bZsXUcGNYMik0vfIYtBBpU340uhdhRP1oUa6rsGbs=; b=N3GYEkUeG/kLcLGdiN0xvaZbKbHgy/53W8au+Wlo9n7W9yFpJTq8gQZjVCbRUKd/87 rFNpYI/TSphi+Yrvt/WKwoJgL+7GbdqgOtfek/kCuo4GiBF3kdCljQYE02X5r2jRoFoE WSrgA5er7Wk5A3DVYUUrq3+PBcA3p5Z9Je9hKzTXXW6YDfj//F94P9EDHy2+Xsy78iZT PB1FIfMdCnKxdMR/roWjfEEmw99sBfA5ikLKdP7DwqO3iXFg9aN7rXJw0+xF2UxYL/Ao 1cybFd9eRc3C0r3hSTC3aRGOjJTHUrUT3xjKoYQL+Jg0HWjoGIv2LqC5Bhp63kEIdJlf UArQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b="pF6/1z7g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb3-20020a1709071c8300b007adf3ed5d20si32134922ejc.376.2023.01.04.06.03.03; Wed, 04 Jan 2023 06:03:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b="pF6/1z7g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239374AbjADOAg (ORCPT + 99 others); Wed, 4 Jan 2023 09:00:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234001AbjADOAc (ORCPT ); Wed, 4 Jan 2023 09:00:32 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1BB219C07; Wed, 4 Jan 2023 06:00:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1672840832; x=1704376832; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l5bZsXUcGNYMik0vfIYtBBpU340uhdhRP1oUa6rsGbs=; b=pF6/1z7g7K1kILyM64KqAxd03lkLuaTVmPT8DulAymksN0b9dHzmfdIB S6KAVu9DYqt8jkH9Ms6mW1FFkmDG8yipggDTXOKwPaIAN3mkTbqwQLaqR SsoTIRUByLz/ZO6XM2sXo8aU6jtrHPa0nWeEaSAEOme5sDt9zHznJQiDw FKmNjCm1yWmrSMvB0kUvr4CoF5XXfh+152qvQSpmx3Kp5JeWdLSxm8x5Y ooHSrO0dM4M7jIaCdQ2RNBLItu+Frnc0GXQEdiusmEQalMak8sNPY6agU VgbdLq30MwWD416wfMkCtuF7a/oo9Qy0hzPg0Ld8iEeYXUS2jm1t4nJ1f g==; From: Jiri Valek - 2N To: CC: , , , , , , Subject: [PATCH v2 1/2] dt-bindings: input: microchip,cap11xx: add cap1203, cap1293 and cap1298 Date: Wed, 4 Jan 2023 14:59:50 +0100 Message-ID: <20230104135951.930783-2-jiriv@axis.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230104135951.930783-1-jiriv@axis.com> References: <20230103134105.736346-3-jiriv@axis.com> <20230104135951.930783-1-jiriv@axis.com> MIME-Version: 1.0 X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail05w.axis.com (10.20.40.11) To se-mail03w.axis.com (10.20.40.9) X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754100932618627501?= X-GMAIL-MSGID: =?utf-8?q?1754100932618627501?= Add support for cap1203, cap1293 and cap1298. Signed-off-by: Jiri Valek - 2N --- Documentation/devicetree/bindings/input/microchip,cap11xx.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml index 67d4d8f86a2d..08ca993b94c4 100644 --- a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml +++ b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml @@ -20,6 +20,9 @@ properties: - microchip,cap1126 - microchip,cap1188 - microchip,cap1206 + - microchip,cap1203 + - microchip,cap1293 + - microchip,cap1298 reg: maxItems: 1 From patchwork Wed Jan 4 13:59:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Valek - 2N X-Patchwork-Id: 38940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5158254wrt; Wed, 4 Jan 2023 06:03:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXslQONklSzRkYDhkhcfLVKOi1WSr+wkmY76W/UPBcfx37cngdeYRDkyCdHc7LlL3Ck8SEz+ X-Received: by 2002:a05:6402:390b:b0:465:f6a9:cb7b with SMTP id fe11-20020a056402390b00b00465f6a9cb7bmr41764349edb.12.1672841011420; Wed, 04 Jan 2023 06:03:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672841011; cv=none; d=google.com; s=arc-20160816; b=si4OxInJIhqoFuelBCf6SuLlq5be/Rhtf43QAF2vPIZ6qawoNVQviYtIPCGw2J9NRh fX/aHLGycGBR1nzizLZhcD7p2F9v8NmV8s+Vy+CiwvO8DPzSZoMQ2wq74Hw+mrtxTWZB lnD+i9gF57H9pgfxYKtuK9UX6jiWhhg5LYVizcTsDlY1190bN2dVCe6NCzd88QxhykjU qx/7b5kQmQll19Xnu7owufXPWo9Nykn748f2y3FO8kOr9hkG2quK0cAzmfDqzrX8+F+e SdZ0v3s0U328mFto6DiJQHuTg+2gvQhSnH+gCsdLB8W+X5CQG5YSni2OxMAbhEw8uZv/ 7VFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3kQKpLUbS1RfUFcGB0PQY8ZweNB1fOUnLTFsFkiF8Qs=; b=rrmosWz0IRCS8P9WlM7mfFIhNy6iETGsZPasVAaLkvtxuYg0pRQFijeTJ0XIbmnx7i y437EhGYAMthrwLCa8nOTMZSTiBoLSNrRNowT1tlPNQbtCLMX53hVfJc07leVLF+1Kk8 wjUuyJk4VA6KIe5Q1qcsmbgfPl6mCeojf3zAOvpyZUbX8OHhuWouzfl2VjtJapvYZDto NuXJ8m5jZISpfNRtBmh4YCvSIcggQIPN20Yg0tFzUBCYbaK2jpvfI/UUDo1yMWiDh2d9 2w8HXj5iJICTJ8qbEEX6+eiB53LlBrvXuweLBzUA08O9ExHnFbYzpJc+pjpVBJloeeEt 8p4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=DdDr7ZYx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n11-20020a05640205cb00b0046cb58e978csi19213516edx.264.2023.01.04.06.03.07; Wed, 04 Jan 2023 06:03:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=DdDr7ZYx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239418AbjADOAp (ORCPT + 99 others); Wed, 4 Jan 2023 09:00:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239375AbjADOAi (ORCPT ); Wed, 4 Jan 2023 09:00:38 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95D1F1AD9D; Wed, 4 Jan 2023 06:00:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1672840838; x=1704376838; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3kQKpLUbS1RfUFcGB0PQY8ZweNB1fOUnLTFsFkiF8Qs=; b=DdDr7ZYxGoQCnNYOA0bdFvg8w7ilzuZ7ttrH4T85CDgCr7ojv0iSTaSa KXQajC/GFRUHvwLVT/ZZHEftlAgssdtOweoE+0xfS8VnVnYXNoyB1H8Cm X5Rk40weT1omWubStKV7xchvWl4cjQi3v33iJId8RxvfvlPm0cO+xf+sF heLrcH2gTsiN8MLNkJr+qMhtS4vjAL5T9pIZAhrzqGG/W6iqZuOVZZuC2 N32GTAQruLP2SvAuJUqWScbMaDMmGYeGlRnTOjf4iZUjE86C3nsIBpOF8 5x+oBl5TuqfNAwjXKFPDqe7UvSo/60GecV16etPjs40ahwPSIt8p088+S Q==; From: Jiri Valek - 2N To: CC: , , , , , , Subject: [PATCH v2 2/2] Input: cap11xx - add support for cap1203, cap1293 and cap1298 Date: Wed, 4 Jan 2023 14:59:51 +0100 Message-ID: <20230104135951.930783-3-jiriv@axis.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230104135951.930783-1-jiriv@axis.com> References: <20230103134105.736346-3-jiriv@axis.com> <20230104135951.930783-1-jiriv@axis.com> MIME-Version: 1.0 X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail05w.axis.com (10.20.40.11) To se-mail03w.axis.com (10.20.40.9) X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754009164726009829?= X-GMAIL-MSGID: =?utf-8?q?1754100936459012150?= Add basic support for more CAP1xxx sensors. All models from CAP1xxx family are register-compatible. Some advanced features are not used and disabled by default. Reported-by: kernel test robot Signed-off-by: Jiri Valek - 2N --- Changes in v2: - Fixed if statement. drivers/input/keyboard/cap11xx.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 79afd0386e3f..eb469ef4075e 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -99,6 +99,9 @@ enum { CAP1126, CAP1188, CAP1206, + CAP1203, + CAP1293, + CAP1298 }; static const struct cap11xx_hw_model cap11xx_devices[] = { @@ -106,6 +109,9 @@ static const struct cap11xx_hw_model cap11xx_devices[] = { [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2, .no_gain = false }, [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8, .no_gain = false }, [CAP1206] = { .product_id = 0x67, .num_channels = 6, .num_leds = 0, .no_gain = true }, + [CAP1203] = { .product_id = 0x6d, .num_channels = 3, .num_leds = 0, .no_gain = true }, + [CAP1293] = { .product_id = 0x6f, .num_channels = 3, .num_leds = 0, .no_gain = false }, + [CAP1298] = { .product_id = 0x71, .num_channels = 8, .num_leds = 0, .no_gain = false }, }; static const struct reg_default cap11xx_reg_defaults[] = { @@ -377,7 +383,8 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client) if (error < 0) return error; - dev_info(dev, "CAP11XX detected, revision 0x%02x\n", rev); + dev_info(dev, "CAP11XX detected, model %s, revision 0x%02x\n", + id->name, rev); node = dev->of_node; if (!of_property_read_u32(node, "microchip,sensor-gain", &gain32)) { @@ -390,7 +397,9 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client) dev_err(dev, "Invalid sensor-gain value %d\n", gain32); } - if (id->driver_data != CAP1206) { + if ((id->driver_data == CAP1106) || + (id->driver_data == CAP1126) || + (id->driver_data == CAP1188)) { if (of_property_read_bool(node, "microchip,irq-active-high")) { error = regmap_update_bits(priv->regmap, CAP11XX_REG_CONFIG2, @@ -484,6 +493,9 @@ static const struct of_device_id cap11xx_dt_ids[] = { { .compatible = "microchip,cap1126", }, { .compatible = "microchip,cap1188", }, { .compatible = "microchip,cap1206", }, + { .compatible = "microchip,cap1203", }, + { .compatible = "microchip,cap1293", }, + { .compatible = "microchip,cap1298", }, {} }; MODULE_DEVICE_TABLE(of, cap11xx_dt_ids); @@ -493,6 +505,9 @@ static const struct i2c_device_id cap11xx_i2c_ids[] = { { "cap1126", CAP1126 }, { "cap1188", CAP1188 }, { "cap1206", CAP1206 }, + { "cap1203", CAP1203 }, + { "cap1293", CAP1293 }, + { "cap1298", CAP1298 }, {} }; MODULE_DEVICE_TABLE(i2c, cap11xx_i2c_ids);