From patchwork Tue Jan 3 13:41:04 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: 13087471 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 51135C3DA7D for ; Tue, 3 Jan 2023 13:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233183AbjACNms (ORCPT ); Tue, 3 Jan 2023 08:42:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbjACNmr (ORCPT ); Tue, 3 Jan 2023 08:42:47 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2315110FF3; Tue, 3 Jan 2023 05:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1672753367; x=1704289367; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l5bZsXUcGNYMik0vfIYtBBpU340uhdhRP1oUa6rsGbs=; b=CUyijV7zsBn2WjZ08Gz6ltr0WBfbK6SKNc0YfwzBp+eIXqFrmlhaiayV 8ASy3W2LgyJzgV0tmvqJ512yLkBHHZxWOmqqDYNcXeXXmQM6D1EeQIeZD cVjRkEVro4075YHqOHtDT5Nn1uxvsaDVMXuhEAvHBgDMWE8D/XJLhr5zV eeIuT7/HE39cWV3wArsUsHquAQWMYR6IpbZzD0oMadTEhl2euYZ5zVk9v uNiJmLnAOPmdGrEVMChBR/+GAFiQ/8m4dVHhp7xtIRjS+jplz+IZpYauh 1Qfu0E9eWE+IVZJq9icArguSZhRgIqEC7+8NPDP8GuVeO7LnGB/By65nP Q==; From: Jiri Valek - 2N To: Dmitry Torokhov , Krzysztof Kozlowski CC: Jiri Valek - 2N , Rob Herring , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)..." , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list Subject: [PATCH 1/2] dt-bindings: input: microchip,cap11xx: add cap1203, cap1293 and cap1298 Date: Tue, 3 Jan 2023 14:41:04 +0100 Message-ID: <20230103134105.736346-2-jiriv@axis.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103134105.736346-1-jiriv@axis.com> References: <20230103134105.736346-1-jiriv@axis.com> MIME-Version: 1.0 X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail03w.axis.com (10.20.40.9) Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 Tue Jan 3 13:41:05 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: 13087472 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 A5A1FC54EBC for ; Tue, 3 Jan 2023 13:42:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233410AbjACNmz (ORCPT ); Tue, 3 Jan 2023 08:42:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjACNmv (ORCPT ); Tue, 3 Jan 2023 08:42:51 -0500 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1AD610FF3; Tue, 3 Jan 2023 05:42:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1672753370; x=1704289370; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SRMK9ZFIllFl+4lflyBvei6idrkhW9/rumwBK8/9S3g=; b=SCi+DDptFfzcA4cNYTK6sWeLOHUJ91fi5AaCBafUv9BCIU+qXNZ6lyj6 fAegqXgZnrNup0YYgSckbvYpCCdNJmm4mqi7MZCe0iLZeWhJcGgBmy959 bG0BelxJFbf+MHUf6uUKKKcLk1iSkA0A5CWjGA1vpMl1kXntP0FwAZHDS e+FF1UF8rGDhsLkK5z6u9hCMo+03byLNUOMQavdF/aBTgoqigh4x/KYGZ oLlC9ltmbqBhAlMXTJnDVDSmWzjJ+bheoi+DEJsR1qPknRcAwOid9Iux8 CMcckam+aT1qchH28DPHCCd0sBHnd+soGAppJqhZcxM/4Lv/DXYrptTM7 A==; From: Jiri Valek - 2N To: Dmitry Torokhov , Krzysztof Kozlowski CC: Jiri Valek - 2N , Rob Herring , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)..." , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list Subject: [PATCH 2/2] Input: cap11xx - add support for cap1203, cap1293 and cap1298 Date: Tue, 3 Jan 2023 14:41:05 +0100 Message-ID: <20230103134105.736346-3-jiriv@axis.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103134105.736346-1-jiriv@axis.com> References: <20230103134105.736346-1-jiriv@axis.com> MIME-Version: 1.0 X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail03w.axis.com (10.20.40.9) Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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. Signed-off-by: Jiri Valek - 2N --- drivers/input/keyboard/cap11xx.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 79afd0386e3f..ae226fb4fabd 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,10 @@ 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 != CAP1206) || + (id->driver_data != CAP1203) || + (id->driver_data != CAP1293) || + (id->driver_data != CAP1298)) { if (of_property_read_bool(node, "microchip,irq-active-high")) { error = regmap_update_bits(priv->regmap, CAP11XX_REG_CONFIG2, @@ -484,6 +494,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 +506,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);