From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 A5AF63D75BC for ; Fri, 12 Jun 2026 07:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781249048; cv=none; b=JMio0V6kFR48cdq0A4KaEoxVK8+6rW7cimPEgmAnuv0ds1NSsXa8rDeLlEgguU92rQIrC92Tc23r+EM2SLbCTt2VuWpZspnGR2snprij44c7jQtYXTWT94Dy592SOrHV75yZYLj6+8bXZuuz2sGyx/xijvBVUEQsc18yBUIZyCI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781249048; c=relaxed/simple; bh=brLuaCz4tG7g5I266nNqxm6IPkKRFu5uQhdh2hXzmqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O/t5wFLDozgkM8PwkG2acUs7ja0a+/GwYcFuASQOoacaOWaw8tY5s28fhjIjxarNbjS0w4H388IvAT5LghAYmqBHzv7SWArwyHXZmiplPupIEVMxEZKOc2kIcCx6jbbbquOQ8PdvbHK16WzwPnwy5yL7/ZlbJrUJZwnrHs882b4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FlL4KU0/; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FlL4KU0/" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490b3e03939so5412055e9.1 for ; Fri, 12 Jun 2026 00:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781249045; x=1781853845; darn=vger.kernel.org; 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=p9lcTv4TvBeGoSmX2RK3FsqdY9z50fC+LqdPWC8A3lg=; b=FlL4KU0/rjn5rOLvZd/mq5QvuDEgYgw1nhcE14ltUPptokPufAYsIqo61ddGU9oOEp 8T66GDUSc1gtBCssqwMQvX36Mso7/miZ4N+0WRrNN0Y/zDoTAW5UtQA2jBKx9LESYCyU XZEMfJ0JaSr7NXUENVIpLI1iLjl4v8b5uTgLo0myVfzoQ7pDsZjfMxelrzPEwSxQ/Ahp hkjrQB6GI35ex1CxprfxptKGa7ccgUOYqHLKUjw+/b35syXkbEtHtdEM5jzUI9Okqzbz REJJ7Yq9JF03AbMLUYlfXtjXTEKNECd7uDNyMxt1umtFDP+nUqnW/Vpti+rRy6HPS4pq q1dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781249045; x=1781853845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p9lcTv4TvBeGoSmX2RK3FsqdY9z50fC+LqdPWC8A3lg=; b=gUuLC26P+PnwwV+eILizHGzr0uesjfCxRdCxJJ6AYTuo2UNHjZoy2Ui6pEHd5Xbqro RfXHUshCQYjpB9KSyPzXIP4R9y0PnYKw0iCkbi0nXC/SWGMi8NJIwyRcjtTWdZ6PC0mp j1484C0Op2MILdAXa6qpGFjQtNphQqTSvOgJWt+7+SAa/IMRQ4iyMkuV46fLTFDNvG25 CKvnH+gs6Oaj3p4jQWBhTz5MRIVU5/K1ByRdsqkFD3ePiuJ6fGwg9I/pL3ePlWyj0+Tq fIjeJa9yiE5onD3YnMys+R7YA4LAjOcdm9vyNGrLaxVzmBmDNf2RD2F4Ty0UcvSlWJlM oILQ== X-Forwarded-Encrypted: i=1; AFNElJ/CoWzTT/y4Cl4Su52+HOvrr+QSYulI4TB0+V1tGAqw/8I9y1wdOyNZHhUlO52k6rBIqbD0WGYAueEwmdA=@vger.kernel.org X-Gm-Message-State: AOJu0YzH4WRpBFKygeMBu32eVEcogueSDtaiByNFM2gY2nluHtzNrFHn JsWVONu4dOmBDctJngmYIOfQuzDk7Jl/GLbIVLcOHZIohs0fMMKegpsP X-Gm-Gg: Acq92OHmLHMMQBSkvI1D31iZpH9c4bJZZVq+FjuQmZZNNR8uaHFfdPqm6/Z+tRX5e2o hk9G6H0l0pppAgBlpUmat6Y79O3LnCMY+5Rwh3Fero0ee3HyiuZqY62Z4ousgWkaOzYFkrKsubE a2ziJ+iYXZ+648mlH3YaxwnOCR8dVWWHuJdsXjx6fhWrjExtFX5FVLYZS/95eKc+9xtSnCpSPZH V3OdQTyGS9RcuD1p3oV3DVBty16YrNfYlIb6GPx6fFRoUJVnlafktfoticblcY8c5Sst3bsVeGT v9/c/YeLs4k1uwoEt9PjCFfR+YPJ2sDCn0iqM8cfF3oHDb3EvRNLGU1ic9L5XmQw6dfNmAtuvB1 1OXZ6pOS0xvJE+IeXIhyUGxUvC12qBLRUQKqhsUGzPb3UOy8m8IJ46LjX1fjH2VkmBVjOojtE/n 39tAlFE20rg24JXUel6QVC425HAPY5hoZNj6zqVdk= X-Received: by 2002:a05:600c:698c:b0:48f:e230:29f5 with SMTP id 5b1f17b1804b1-490ec4e9147mr12990265e9.16.1781249045047; Fri, 12 Jun 2026 00:24:05 -0700 (PDT) Received: from arch.localdomain ([2409:8a28:a54:e741:3a5a:3245:d3dc:4b5d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490ea963cf8sm28715245e9.2.2026.06.12.00.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 00:24:04 -0700 (PDT) From: Jun Yan To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jun Yan , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 9/9] Input: cap11xx - add support for CAP1114 Date: Fri, 12 Jun 2026 15:22:15 +0800 Message-ID: <20260612072237.1177304-10-jerrysteve1101@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612072237.1177304-1-jerrysteve1101@gmail.com> References: <20260612072237.1177304-1-jerrysteve1101@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit CAP1114 is a 14-channel capacitive touch sensor with 11 LED outputs and hardware reset support. The CAP1114 uses two control registers for LED output management and requires two button status registers for touch input state reporting. By default, channels CS8~CS14 operate as a single grouped block. Set the corresponding register enable bit to enable these channels as independent touch inputs. Note these channels share the input threshold of the eighth entry, causing num_sensor_thresholds to differ from num_channels. Signed-off-by: Jun Yan --- drivers/input/keyboard/cap11xx.c | 74 ++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index d45bb231d7a1..e4da0e26c34a 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -18,6 +18,12 @@ #include #include +#define CAP1114_REG_BUTTON_STATUS1 0x03 +#define CAP1114_REG_BUTTON_STATUS2 0x04 +#define CAP1114_REG_CONFIG2 0x40 +#define CAP1114_REG_CONFIG2_VOL_UP_DOWN BIT(1) +#define CAP1114_REG_LED_OUTPUT_CONTROL1 0x73 + #define CAP11XX_REG_MAIN_CONTROL 0x00 #define CAP11XX_REG_MAIN_CONTROL_GAIN_SHIFT (6) #define CAP11XX_REG_MAIN_CONTROL_GAIN_MASK (0xc0) @@ -82,6 +88,7 @@ struct cap11xx_hw_model { unsigned int num_leds; unsigned int num_sensor_thresholds; bool has_gain; + bool has_grouped_sensors; bool has_irq_config; bool has_repeat_en; bool has_sensitivity_control; @@ -98,6 +105,9 @@ static const struct reg_default cap11xx_reg_defaults[] = { { CAP11XX_REG_SENSOR_THRESH(3), 0x40 }, { CAP11XX_REG_SENSOR_THRESH(4), 0x40 }, { CAP11XX_REG_SENSOR_THRESH(5), 0x40 }, + { CAP11XX_REG_SENSOR_THRESH(6), 0x40 }, + { CAP11XX_REG_SENSOR_THRESH(7), 0x40 }, + { CAP11XX_REG_SENSOR_THRESH(8), 0x40 }, { CAP11XX_REG_CONFIG2, 0x40 }, }; @@ -106,6 +116,12 @@ static bool cap11xx_volatile_reg(struct device *dev, unsigned int reg) switch (reg) { case CAP11XX_REG_MAIN_CONTROL: case CAP11XX_REG_SENSOR_INPUT: + /* + * CAP1114_REG_BUTTON_STATUS1 (CAP11XX_REG_SENSOR_INPUT) and + * CAP1114_REG_BUTTON_STATUS2 is volatile for the CAP1114, + * which supports more than 8 touch channels. + */ + case CAP1114_REG_BUTTON_STATUS2: return true; } @@ -283,6 +299,17 @@ static int cap11xx_init_keys(struct cap11xx_priv *priv) of_property_read_u32_array(node, "linux,keycodes", priv->keycodes, priv->model->num_channels); + /* + * CAP1114 needs dedicated configuration to split + * grouped sensors into independent inputs. + */ + if (priv->model->has_grouped_sensors) { + error = regmap_set_bits(priv->regmap, CAP1114_REG_CONFIG2, + CAP1114_REG_CONFIG2_VOL_UP_DOWN); + if (error) + return error; + } + if (priv->model->has_repeat_en) { /* Disable autorepeat. The Linux input system has its own handling. */ error = regmap_write(priv->regmap, CAP11XX_REG_REPEAT_RATE, 0); @@ -311,6 +338,21 @@ static irqreturn_t cap11xx_thread_func(int irq_num, void *data) if (ret < 0) goto out; + if (priv->model->num_channels > 8) { + unsigned int status2; + + ret = regmap_read(priv->regmap, priv->model->sensor_input_reg_base + 1, &status2); + if (ret < 0) + goto out; + + /* + * CAP1114 STATUS1 register only contains data for the first 6 channels. + * the remaining channels is stored in STATUS2. + */ + status &= GENMASK(5, 0); + status |= FIELD_PREP(GENMASK(13, 6), status2); + } + for (i = 0; i < priv->idev->keycodemax; i++) input_report_key(priv->idev, priv->keycodes[i], status & (1 << i)); @@ -360,10 +402,16 @@ static int cap11xx_led_set(struct led_classdev *cdev, * limitation. Brightness levels per LED are either * 0 (OFF) and 1 (ON). */ - return regmap_update_bits(priv->regmap, - priv->model->led_output_control_reg_base, - BIT(led->reg), - value ? BIT(led->reg) : 0); + if (led->reg >= 8) + return regmap_update_bits(priv->regmap, + priv->model->led_output_control_reg_base + 1, + BIT(led->reg - 8), + value ? BIT(led->reg - 8) : 0); + else + return regmap_update_bits(priv->regmap, + priv->model->led_output_control_reg_base, + BIT(led->reg), + value ? BIT(led->reg) : 0); } static int cap11xx_init_leds(struct device *dev, @@ -394,6 +442,14 @@ static int cap11xx_init_leds(struct device *dev, if (error) return error; + if (num_leds > 8) { + error = regmap_update_bits(priv->regmap, + priv->model->led_output_control_reg_base + 1, + GENMASK(num_leds - 8 - 1, 0), 0); + if (error) + return error; + } + duty_val = FIELD_PREP(CAP11XX_REG_LED_DUTY_MAX_MASK, CAP11XX_REG_LED_DUTY_MAX_VALUE); @@ -572,6 +628,14 @@ static const struct cap11xx_hw_model cap1106_model = { .has_repeat_en = true, }; +static const struct cap11xx_hw_model cap1114_model = { + .product_id = 0x3a, + .num_channels = 14, .num_leds = 11, .num_sensor_thresholds = 8, + .led_output_control_reg_base = CAP1114_REG_LED_OUTPUT_CONTROL1, + .sensor_input_reg_base = CAP1114_REG_BUTTON_STATUS1, + .has_grouped_sensors = true, +}; + static const struct cap11xx_hw_model cap1126_model = { .product_id = 0x53, .num_channels = 6, .num_leds = 2, .num_sensor_thresholds = 6, @@ -628,6 +692,7 @@ static const struct cap11xx_hw_model cap1298_model = { static const struct of_device_id cap11xx_dt_ids[] = { { .compatible = "microchip,cap1106", .data = &cap1106_model }, + { .compatible = "microchip,cap1114", .data = &cap1114_model }, { .compatible = "microchip,cap1126", .data = &cap1126_model }, { .compatible = "microchip,cap1188", .data = &cap1188_model }, { .compatible = "microchip,cap1203", .data = &cap1203_model }, @@ -640,6 +705,7 @@ MODULE_DEVICE_TABLE(of, cap11xx_dt_ids); static const struct i2c_device_id cap11xx_i2c_ids[] = { { .name = "cap1106", .driver_data = (kernel_ulong_t)&cap1106_model }, + { .name = "cap1114", .driver_data = (kernel_ulong_t)&cap1114_model }, { .name = "cap1126", .driver_data = (kernel_ulong_t)&cap1126_model }, { .name = "cap1188", .driver_data = (kernel_ulong_t)&cap1188_model }, { .name = "cap1203", .driver_data = (kernel_ulong_t)&cap1203_model }, -- 2.54.0