| Message ID | 20230103134105.736346-3-jiriv@axis.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Input: cap11xx add support for cap1203, cap1293 and cap1298 | expand |
Hi Jiri,
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jiri-Valek-2N/dt-bindings-input-microchip-cap11xx-add-cap1203-cap1293-and-cap1298/20230103-214328
base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next
patch link: https://lore.kernel.org/r/20230103134105.736346-3-jiriv%40axis.com
patch subject: [PATCH 2/2] Input: cap11xx - add support for cap1203, cap1293 and cap1298
config: loongarch-randconfig-m031-20230101
compiler: loongarch64-linux-gcc (GCC) 12.1.0
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
smatch warnings:
drivers/input/keyboard/cap11xx.c:400 cap11xx_i2c_probe() warn: was && intended here instead of ||?
vim +400 drivers/input/keyboard/cap11xx.c
c77fd0a42b24ac Matt Ranostay 2014-10-31 390 if (!of_property_read_u32(node, "microchip,sensor-gain", &gain32)) {
322a552e195508 Jesse Taube 2021-11-02 391 if (cap->no_gain)
322a552e195508 Jesse Taube 2021-11-02 392 dev_warn(dev,
322a552e195508 Jesse Taube 2021-11-02 393 "This version doesn't support sensor gain\n");
322a552e195508 Jesse Taube 2021-11-02 394 else if (is_power_of_2(gain32) && gain32 <= 8)
c77fd0a42b24ac Matt Ranostay 2014-10-31 395 gain = ilog2(gain32);
c77fd0a42b24ac Matt Ranostay 2014-10-31 396 else
c77fd0a42b24ac Matt Ranostay 2014-10-31 397 dev_err(dev, "Invalid sensor-gain value %d\n", gain32);
c77fd0a42b24ac Matt Ranostay 2014-10-31 398 }
c77fd0a42b24ac Matt Ranostay 2014-10-31 399
e3f771deec5bca Jiri Valek - 2N 2023-01-03 @400 if ((id->driver_data != CAP1206) ||
e3f771deec5bca Jiri Valek - 2N 2023-01-03 401 (id->driver_data != CAP1203) ||
e3f771deec5bca Jiri Valek - 2N 2023-01-03 402 (id->driver_data != CAP1293) ||
e3f771deec5bca Jiri Valek - 2N 2023-01-03 403 (id->driver_data != CAP1298)) {
Yep. && isntead of ||. ->driver_data can't be equal to *all* of
those at the same time.
6bdd2fd1ed6f66 Matt Ranostay 2014-10-31 404 if (of_property_read_bool(node, "microchip,irq-active-high")) {
322a552e195508 Jesse Taube 2021-11-02 405 error = regmap_update_bits(priv->regmap,
322a552e195508 Jesse Taube 2021-11-02 406 CAP11XX_REG_CONFIG2,
322a552e195508 Jesse Taube 2021-11-02 407 CAP11XX_REG_CONFIG2_ALT_POL,
322a552e195508 Jesse Taube 2021-11-02 408 0);
6bdd2fd1ed6f66 Matt Ranostay 2014-10-31 409 if (error)
6bdd2fd1ed6f66 Matt Ranostay 2014-10-31 410 return error;
6bdd2fd1ed6f66 Matt Ranostay 2014-10-31 411 }
322a552e195508 Jesse Taube 2021-11-02 412 }
6bdd2fd1ed6f66 Matt Ranostay 2014-10-31 413
c77fd0a42b24ac Matt Ranostay 2014-10-31 414 /* Provide some useful defaults */
7609a5e973c43a Matt Ranostay 2014-10-31 415 for (i = 0; i < cap->num_channels; i++)
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);
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 <jiriv@axis.com> --- drivers/input/keyboard/cap11xx.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)