| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20201127111420.96500-2-alexandru.ardelean@analog.com>
Date: Fri, 27 Nov 2020 13:14:18 +0200
From: Alexandru Ardelean <alexandru.ardelean@...log.com>
To: <linux-input@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<devicetree@...r.kernel.org>
CC: <lars@...afoo.de>, <dmitry.torokhov@...il.com>,
<robh+dt@...nel.org>,
Alexandru Ardelean <alexandru.ardelean@...log.com>
Subject: [PATCH v3 2/4] Input: adp5589-keys - wrap device probing into chip info struct
This change wraps the devices supported by the adp5589 driver into a chip
info struct. With this, a device table can be created, and the probed
device can be selected based on the enum value provided by the i2c driver
data.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@...log.com>
---
drivers/input/keyboard/adp5589-keys.c | 60 ++++++++++++++++-----------
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 742bf4b97dbb..6cb93ee3b97c 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -227,16 +227,17 @@ struct adp_constants {
u8 (*reg) (u8 reg);
};
+struct adp5589_chip_info;
+
struct adp5589_kpad {
struct i2c_client *client;
struct input_dev *input;
const struct adp_constants *var;
+ const struct adp5589_chip_info *info;
unsigned short keycode[ADP5589_KEYMAPSIZE];
const struct adp5589_gpi_map *gpimap;
unsigned short gpimapsize;
unsigned extend_cfg;
- bool is_adp5585;
- bool support_row5;
#ifdef CONFIG_GPIOLIB
unsigned char gpiomap[ADP5589_MAXGPIO];
struct gpio_chip gc;
@@ -377,6 +378,28 @@ static const struct adp5589_kpad_platform_data adp5589_default_pdata = {
.gpio_data = &adp5589_default_gpio_pdata,
};
+struct adp5589_chip_info {
+ const struct adp_constants *constants;
+ bool support_row5;
+ bool is_adp5585;
+};
+
+static const struct adp5589_chip_info adp5589_chip_info_tbl[] = {
+ [ADP5589] = {
+ .constants = &const_adp5589,
+ .support_row5 = true,
+ },
+ [ADP5585_01] = {
+ .constants = &const_adp5585,
+ .is_adp5585 = true,
+ },
+ [ADP5585_02] = {
+ .constants = &const_adp5585,
+ .is_adp5585 = true,
+ .support_row5 = true,
+ },
+};
+
static const struct adp5589_kpad_platform_data *adp5589_kpad_pdata_get(
struct device *dev)
{
@@ -504,7 +527,7 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad,
if (kpad->extend_cfg & C4_EXTEND_CFG)
pin_used[kpad->var->c4_extend_cfg] = true;
- if (!kpad->support_row5)
+ if (!kpad->info->support_row5)
pin_used[5] = true;
for (i = 0; i < kpad->var->maxgpio; i++)
@@ -651,11 +674,11 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
(pdata->keypad_en_mask >> kpad->var->col_shift) &
kpad->var->col_mask);
- if (!kpad->is_adp5585)
+ if (!kpad->info->is_adp5585)
ret |= adp5589_write(client, ADP5589_PIN_CONFIG_C,
(pdata->keypad_en_mask >> 16) & 0xFF);
- if (!kpad->is_adp5585 && pdata->en_keylock) {
+ if (!kpad->info->is_adp5585 && pdata->en_keylock) {
ret |= adp5589_write(client, ADP5589_UNLOCK1,
pdata->unlock_key1);
ret |= adp5589_write(client, ADP5589_UNLOCK2,
@@ -676,7 +699,7 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
} else {
evt_mode2 |=
BIT(pin - kpad->var->gpi_pin_col_base) & 0xFF;
- if (!kpad->is_adp5585)
+ if (!kpad->info->is_adp5585)
evt_mode3 |=
BIT(pin - kpad->var->gpi_pin_col_base) >> 8;
}
@@ -687,7 +710,7 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
evt_mode1);
ret |= adp5589_write(client, reg(ADP5589_GPI_EVENT_EN_B),
evt_mode2);
- if (!kpad->is_adp5585)
+ if (!kpad->info->is_adp5585)
ret |= adp5589_write(client,
reg(ADP5589_GPI_EVENT_EN_C),
evt_mode3);
@@ -775,16 +798,16 @@ static int adp5589_setup(struct adp5589_kpad *kpad)
(pdata->debounce_dis_mask >> kpad->var->col_shift)
& kpad->var->col_mask);
- if (!kpad->is_adp5585)
+ if (!kpad->info->is_adp5585)
ret |= adp5589_write(client, reg(ADP5589_DEBOUNCE_DIS_C),
(pdata->debounce_dis_mask >> 16) & 0xFF);
ret |= adp5589_write(client, reg(ADP5589_POLL_PTIME_CFG),
pdata->scan_cycle_time & PTIME_MASK);
ret |= adp5589_write(client, ADP5589_5_INT_STATUS,
- (kpad->is_adp5585 ? 0 : LOGIC2_INT) |
+ (kpad->info->is_adp5585 ? 0 : LOGIC2_INT) |
LOGIC1_INT | OVRFLOW_INT |
- (kpad->is_adp5585 ? 0 : LOCK_INT) |
+ (kpad->info->is_adp5585 ? 0 : LOCK_INT) |
GPI_INT | EVENT_INT); /* Status is W1C */
ret |= adp5589_write(client, reg(ADP5589_GENERAL_CFG),
@@ -808,7 +831,7 @@ static void adp5589_report_switch_state(struct adp5589_kpad *kpad)
kpad->var->reg(ADP5589_GPI_STATUS_A));
int gpi_stat2 = adp5589_read(kpad->client,
kpad->var->reg(ADP5589_GPI_STATUS_B));
- int gpi_stat3 = !kpad->is_adp5585 ?
+ int gpi_stat3 = !kpad->info->is_adp5585 ?
adp5589_read(kpad->client, ADP5589_GPI_STATUS_C) : 0;
for (i = 0; i < kpad->gpimapsize; i++) {
@@ -984,19 +1007,8 @@ static int adp5589_probe(struct i2c_client *client,
kpad->client = client;
- switch (id->driver_data) {
- case ADP5585_02:
- kpad->support_row5 = true;
- fallthrough;
- case ADP5585_01:
- kpad->is_adp5585 = true;
- kpad->var = &const_adp5585;
- break;
- case ADP5589:
- kpad->support_row5 = true;
- kpad->var = &const_adp5589;
- break;
- }
+ kpad->info = &adp5589_chip_info_tbl[id->driver_data];
+ kpad->var = kpad->info->constants;
error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
client);
--
2.27.0
Powered by blists - more mailing lists