From 6c9a8b5d7f6a7d5d46d58707f1aa9c16db4a14b1 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 3 Aug 2016 16:14:55 +0200 Subject: mfd: da9063: added of_device_id information Signed-off-by: Enrico Scholz Tested-by: Stefan Christ Signed-off-by: Christian Hemp --- drivers/mfd/da9063.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/mfd/da9063.c b/drivers/mfd/da9063.c index a1c748610a..00a61279f3 100644 --- a/drivers/mfd/da9063.c +++ b/drivers/mfd/da9063.c @@ -27,6 +27,8 @@ struct da9063 { struct restart_handler restart; struct watchdog wd; struct i2c_client *client; + /* dummy client for accessing bank #1 */ + struct i2c_client *client1; struct device_d *dev; unsigned int timeout; }; @@ -40,6 +42,9 @@ struct da9063 { #define DA9063_REG_CONTROL_D 0x11 #define DA9063_REG_CONTROL_F 0x13 +/* bank1: control register I */ +#define DA9063_REG1_CONFIG_I 0x10e + /* DA9063_REG_FAULT_LOG (addr=0x05) */ #define DA9063_TWD_ERROR 0x01 #define DA9063_POR 0x02 @@ -52,6 +57,9 @@ struct da9063 { #define DA9063_WATCHDOG 0x01 #define DA9063_SHUTDOWN 0x02 +/* DA9063_REG_CONTROL_I (addr=0x10e) */ +#define DA9062_WATCHDOG_SD BIT(3) + struct da906x_device_data { int (*init)(struct da9063 *priv); }; @@ -65,6 +73,8 @@ static int da906x_reg_update(struct da9063 *priv, unsigned int reg, if (reg < 0x100) client = priv->client; + else if (reg < 0x200) + client = priv->client1; else /* this should/can not happen because function is usually * called with a static register number; warn about it @@ -183,6 +193,30 @@ static void da9063_restart(struct restart_handler *rst) i2c_write_reg(priv->client, DA9063_REG_CONTROL_F, &val, 1); } +static int da9062_device_init(struct da9063 *priv) +{ + int ret; + + priv->client1 = i2c_new_dummy(priv->client->adapter, + priv->client->addr + 1); + if (!priv) { + dev_warn(priv->dev, "failed to create bank 1 device\n"); + /* TODO: return -EINVAL; i2c api does not return more + * details */ + return -EINVAL; + } + + /* clear CONFIG_I[WATCHDOG_SD] */ + ret = da906x_reg_update(priv, DA9063_REG1_CONFIG_I, + DA9062_WATCHDOG_SD, DA9062_WATCHDOG_SD); + + return ret; +} + +static struct da906x_device_data const da9062_device_data = { + .init = da9062_device_init, +}; + static int da9063_probe(struct device_d *dev) { struct da9063 *priv = NULL; @@ -229,13 +263,26 @@ on_error: static struct platform_device_id da9063_id[] = { { "da9063", (uintptr_t)(NULL) }, + { "da9062", (uintptr_t)(&da9062_device_data) }, { } }; +static struct of_device_id const da906x_dt_ids[] = { + { + .compatible = "dlg,da9063", + .data = NULL, + }, { + .compatible = "dlg,da9062", + .data = &da9062_device_data, + }, { + } +}; + static struct driver_d da9063_driver = { .name = "da9063", .probe = da9063_probe, .id_table = da9063_id, + .of_compatible = DRV_OF_COMPAT(da906x_dt_ids), }; static int da9063_init(void) -- cgit v1.2.3