From: Lars-Peter Clausen <lars@xxxxxxxxxx>
Add very basic devicetree suppport to the adp5589 allowing the device to be
registered from devicetree and ACPI via PRP0001.
Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx>
---
drivers/input/keyboard/adp5589-keys.c | 30 ++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index daa6d3cdbac5..4321bad10269 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -985,9 +985,25 @@ static void adp5589_clear_config(void *data)
adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
}
+static const struct adp5589_chip_info *adp5589_get_chip_info(struct device *dev,
+ const struct i2c_device_id *id)
+{
+ const struct adp5589_chip_info *info;
+
+ info = device_get_match_data(dev);
+ if (info)
+ return info;
+
+ if (id)
+ return &adp5589_chip_info_tbl[id->driver_data];
+
+ return NULL;
+}
+
static int adp5589_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
+ const struct adp5589_chip_info *info;
struct adp5589_kpad *kpad;
const struct adp5589_kpad_platform_data *pdata =
adp5589_kpad_pdata_get(&client->dev);
@@ -1000,13 +1016,17 @@ static int adp5589_probe(struct i2c_client *client,
return -EIO;
}
+ info = adp5589_get_chip_info(&client->dev, id);
+ if (!info)
+ return -ENODEV;
+
kpad = devm_kzalloc(&client->dev, sizeof(*kpad), GFP_KERNEL);
if (!kpad)
return -ENOMEM;
kpad->client = client;
- kpad->info = &adp5589_chip_info_tbl[id->driver_data];
+ kpad->info = info;
kpad->var = kpad->info->constants;
error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
@@ -1079,6 +1099,13 @@ static int adp5589_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(adp5589_dev_pm_ops, adp5589_suspend, adp5589_resume);
+static const struct of_device_id adp5589_of_match[] = {
+ { .compatible = "adi,adp5585", .data = &adp5589_chip_info_tbl[ADP5585_01] },
+ { .compatible = "adi,adp5585-02", .data = &adp5589_chip_info_tbl[ADP5585_02] },
+ { .compatible = "adi,adp5589", .data = &adp5589_chip_info_tbl[ADP5589] },
+ {}
+};
+
static const struct i2c_device_id adp5589_id[] = {
{"adp5589-keys", ADP5589},
{"adp5585-keys", ADP5585_01},
@@ -1092,6 +1119,7 @@ static struct i2c_driver adp5589_driver = {
.driver = {
.name = KBUILD_MODNAME,
.pm = &adp5589_dev_pm_ops,
+ .of_match_table = adp5589_of_match,
},
.probe = adp5589_probe,
.id_table = adp5589_id,
--
2.17.1
