From patchwork Mon Feb 6 15:13:31 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: 53346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2298075wrn; Mon, 6 Feb 2023 07:30:41 -0800 (PST) X-Google-Smtp-Source: AK7set+PIDkdqKPMw8G3eXirYn7OqSCcocSy3RzcwsRj1wcj0cJPe9jwEfZKMUaMRFkDoMwRZGGw X-Received: by 2002:a17:906:f07:b0:86c:a3ed:1442 with SMTP id z7-20020a1709060f0700b0086ca3ed1442mr19000713eji.4.1675697440894; Mon, 06 Feb 2023 07:30:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675697440; cv=none; d=google.com; s=arc-20160816; b=eN2nrWLnyjGUYpP9Scxq+Inmg1jJFc1m90i/846ErY+KVJDf0cL1qA7/9nU0F4RIBQ TniKFiBYIUUxAfbvItiItT3haTo7o9ZGEWKpw1fiyeD8qqJsTY/wIORplRZFUoz4thQM jeGo4kTkUSvkeapeHBe7qb3Hg/ldFZXAUUy14SVfCmKQ7FOvApM2PDlxgXresNY3tINh RIw8xNzcQd9yyHWN8MLn8QB8dyhoX6pSoGLo18s3zLlyvIgwGiEzEbckt+p4SH2E4Fy5 nq4M6dC2M00hL7NzjYMveS8r1UAUsb4txr+aLPUBok5SB5hEf8UCO70qLz5o0uaOXDmJ xgQQ== 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=JS7h8g3ctjeRZPbI69EcSH0Wy8aIzGJjjvYaYMytls0=; b=aJZU20WZ84HeoTaPYnF5F/EBN8AntRFIomx69Vql7THef0Pht6saZpAQVhwyKZH8Dp teQ2NyJYqLMJQa4YPuwD5uc/W7zsw5j5Cx9ocC3gMlVM9KOUgRYak0keZW8lpTildv2X /CA7wJqk3o6qQFa+7JBIHH0qxXY+AtX9h6vrLvHh/izqZvxKT7e2wefaXcFQtB6BaogO kK6qVLDf0T1UE+n23EXRd1TOM5qjTEL3SvQtGC+p+r7J/nwjeAFVc2iUsYsjYPW1+zTF Jj7DOpU6ALd9cPGv7kBoX6XpJn3563lEfkEx8g/UNjAlAp7tKbKH04YmUuTT0bqPXNW+ zJQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=mZ0YByfY; 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 vf22-20020a170907239600b00878568f22a6si8321114ejb.133.2023.02.06.07.30.17; Mon, 06 Feb 2023 07:30:40 -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=mZ0YByfY; 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 S230202AbjBFPPN (ORCPT + 99 others); Mon, 6 Feb 2023 10:15:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbjBFPPL (ORCPT ); Mon, 6 Feb 2023 10:15:11 -0500 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2455C1EBCE; Mon, 6 Feb 2023 07:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1675696510; x=1707232510; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JS7h8g3ctjeRZPbI69EcSH0Wy8aIzGJjjvYaYMytls0=; b=mZ0YByfYI5jQxwprZoFbnevdmRmdXo96fTnwoVpuFYufMoKKQJacgGCt LhxfFmQcQWcHOnbjL20qqobGpEErVh6yDWtanmj3Q6HueD6d/NKutSPf7 Q3RSMKHMLN0RwGbFheDjjNnkj58MBslI3izbpFgtl3g+/QZa12ZMzlmOB OVcCNHlzV0ew0/ngq7CAANjGeueA1bjT8R34PA8s/njc1G1fyAWNkZp59 dZWqgBLPFKFd1Lu3tGG4nLQi+J49fZBY4gAhbw5FuOCausnBvsFsHUXo3 sdiZ66SglQwBonIePtac1wNVodpo24JU5oQmimvk2li4Yiuuij53fz6tm A==; From: Jiri Valek - 2N To: CC: , , , , , , , Subject: [PATCH v5 2/2] Input: cap11xx - add support for cap1203, cap1293 and cap1298 Date: Mon, 6 Feb 2023 16:13:31 +0100 Message-ID: <20230206151331.184634-3-jiriv@axis.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206151331.184634-1-jiriv@axis.com> References: <20230206151331.184634-1-jiriv@axis.com> MIME-Version: 1.0 X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: se-mail04w.axis.com (10.20.40.10) To se-mail01w.axis.com (10.20.40.7) 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?1757096119911727286?= X-GMAIL-MSGID: =?utf-8?q?1757096119911727286?= 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. Reviewed-by: Mattijs Korpershoek Reported-by: kernel test robot Signed-off-by: Jiri Valek - 2N --- Changes in v2: - Fixed if statement. Changes in v3: - Model names sorted alphabetically. Changes in v4 - No changes. Changes in v5: - Fix indentation. 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..040696d0e49c 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -98,14 +98,20 @@ enum { CAP1106, CAP1126, CAP1188, + CAP1203, CAP1206, + CAP1293, + CAP1298 }; static const struct cap11xx_hw_model cap11xx_devices[] = { [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0, .no_gain = false }, [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 }, + [CAP1203] = { .product_id = 0x6d, .num_channels = 3, .num_leds = 0, .no_gain = true }, [CAP1206] = { .product_id = 0x67, .num_channels = 6, .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, @@ -483,7 +492,10 @@ static const struct of_device_id cap11xx_dt_ids[] = { { .compatible = "microchip,cap1106", }, { .compatible = "microchip,cap1126", }, { .compatible = "microchip,cap1188", }, + { .compatible = "microchip,cap1203", }, { .compatible = "microchip,cap1206", }, + { .compatible = "microchip,cap1293", }, + { .compatible = "microchip,cap1298", }, {} }; MODULE_DEVICE_TABLE(of, cap11xx_dt_ids); @@ -492,7 +504,10 @@ static const struct i2c_device_id cap11xx_i2c_ids[] = { { "cap1106", CAP1106 }, { "cap1126", CAP1126 }, { "cap1188", CAP1188 }, + { "cap1203", CAP1203 }, { "cap1206", CAP1206 }, + { "cap1293", CAP1293 }, + { "cap1298", CAP1298 }, {} }; MODULE_DEVICE_TABLE(i2c, cap11xx_i2c_ids);