Merge tag 'v5.10-rc1' into spi-5.10
[linux-2.6-microblaze.git] / drivers / mfd / da9063-i2c.c
index 455de74..b8217ad 100644 (file)
 #include <linux/of.h>
 #include <linux/regulator/of_regulator.h>
 
+/*
+ * Raw I2C access required for just accessing chip and variant info before we
+ * know which device is present. The info read from the device using this
+ * approach is then used to select the correct regmap tables.
+ */
+
+#define DA9063_REG_PAGE_SIZE           0x100
+#define DA9063_REG_PAGED_ADDR_MASK     0xFF
+
+enum da9063_page_sel_buf_fmt {
+       DA9063_PAGE_SEL_BUF_PAGE_REG = 0,
+       DA9063_PAGE_SEL_BUF_PAGE_VAL,
+       DA9063_PAGE_SEL_BUF_SIZE,
+};
+
+enum da9063_paged_read_msgs {
+       DA9063_PAGED_READ_MSG_PAGE_SEL = 0,
+       DA9063_PAGED_READ_MSG_REG_SEL,
+       DA9063_PAGED_READ_MSG_DATA,
+       DA9063_PAGED_READ_MSG_CNT,
+};
+
+static int da9063_i2c_blockreg_read(struct i2c_client *client, u16 addr,
+                                   u8 *buf, int count)
+{
+       struct i2c_msg xfer[DA9063_PAGED_READ_MSG_CNT];
+       u8 page_sel_buf[DA9063_PAGE_SEL_BUF_SIZE];
+       u8 page_num, paged_addr;
+       int ret;
+
+       /* Determine page info based on register address */
+       page_num = (addr / DA9063_REG_PAGE_SIZE);
+       if (page_num > 1) {
+               dev_err(&client->dev, "Invalid register address provided\n");
+               return -EINVAL;
+       }
+
+       paged_addr = (addr % DA9063_REG_PAGE_SIZE) & DA9063_REG_PAGED_ADDR_MASK;
+       page_sel_buf[DA9063_PAGE_SEL_BUF_PAGE_REG] = DA9063_REG_PAGE_CON;
+       page_sel_buf[DA9063_PAGE_SEL_BUF_PAGE_VAL] =
+               (page_num << DA9063_I2C_PAGE_SEL_SHIFT) & DA9063_REG_PAGE_MASK;
+
+       /* Write reg address, page selection */
+       xfer[DA9063_PAGED_READ_MSG_PAGE_SEL].addr = client->addr;
+       xfer[DA9063_PAGED_READ_MSG_PAGE_SEL].flags = 0;
+       xfer[DA9063_PAGED_READ_MSG_PAGE_SEL].len = DA9063_PAGE_SEL_BUF_SIZE;
+       xfer[DA9063_PAGED_READ_MSG_PAGE_SEL].buf = page_sel_buf;
+
+       /* Select register address */
+       xfer[DA9063_PAGED_READ_MSG_REG_SEL].addr = client->addr;
+       xfer[DA9063_PAGED_READ_MSG_REG_SEL].flags = 0;
+       xfer[DA9063_PAGED_READ_MSG_REG_SEL].len = sizeof(paged_addr);
+       xfer[DA9063_PAGED_READ_MSG_REG_SEL].buf = &paged_addr;
+
+       /* Read data */
+       xfer[DA9063_PAGED_READ_MSG_DATA].addr = client->addr;
+       xfer[DA9063_PAGED_READ_MSG_DATA].flags = I2C_M_RD;
+       xfer[DA9063_PAGED_READ_MSG_DATA].len = count;
+       xfer[DA9063_PAGED_READ_MSG_DATA].buf = buf;
+
+       ret = i2c_transfer(client->adapter, xfer, DA9063_PAGED_READ_MSG_CNT);
+       if (ret < 0) {
+               dev_err(&client->dev, "Paged block read failed: %d\n", ret);
+               return ret;
+       }
+
+       if (ret != DA9063_PAGED_READ_MSG_CNT) {
+               dev_err(&client->dev, "Paged block read failed to complete\n");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+enum {
+       DA9063_DEV_ID_REG = 0,
+       DA9063_VAR_ID_REG,
+       DA9063_CHIP_ID_REGS,
+};
+
+static int da9063_get_device_type(struct i2c_client *i2c, struct da9063 *da9063)
+{
+       u8 buf[DA9063_CHIP_ID_REGS];
+       int ret;
+
+       ret = da9063_i2c_blockreg_read(i2c, DA9063_REG_DEVICE_ID, buf,
+                                      DA9063_CHIP_ID_REGS);
+       if (ret)
+               return ret;
+
+       if (buf[DA9063_DEV_ID_REG] != PMIC_CHIP_ID_DA9063) {
+               dev_err(da9063->dev,
+                       "Invalid chip device ID: 0x%02x\n",
+                       buf[DA9063_DEV_ID_REG]);
+               return -ENODEV;
+       }
+
+       dev_info(da9063->dev,
+                "Device detected (chip-ID: 0x%02X, var-ID: 0x%02X)\n",
+                buf[DA9063_DEV_ID_REG], buf[DA9063_VAR_ID_REG]);
+
+       da9063->variant_code =
+               (buf[DA9063_VAR_ID_REG] & DA9063_VARIANT_ID_MRC_MASK)
+               >> DA9063_VARIANT_ID_MRC_SHIFT;
+
+       return 0;
+}
+
+/*
+ * Variant specific regmap configs
+ */
+
 static const struct regmap_range da9063_ad_readable_ranges[] = {
        regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_AD_REG_SECOND_D),
        regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
        regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
        regmap_reg_range(DA9063_REG_T_OFFSET, DA9063_AD_REG_GP_ID_19),
-       regmap_reg_range(DA9063_REG_CHIP_ID, DA9063_REG_CHIP_VARIANT),
+       regmap_reg_range(DA9063_REG_DEVICE_ID, DA9063_REG_VARIANT_ID),
 };
 
 static const struct regmap_range da9063_ad_writeable_ranges[] = {
@@ -72,7 +184,7 @@ static const struct regmap_range da9063_bb_readable_ranges[] = {
        regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
        regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
        regmap_reg_range(DA9063_REG_T_OFFSET, DA9063_BB_REG_GP_ID_19),
-       regmap_reg_range(DA9063_REG_CHIP_ID, DA9063_REG_CHIP_VARIANT),
+       regmap_reg_range(DA9063_REG_DEVICE_ID, DA9063_REG_VARIANT_ID),
 };
 
 static const struct regmap_range da9063_bb_writeable_ranges[] = {
@@ -85,7 +197,7 @@ static const struct regmap_range da9063_bb_writeable_ranges[] = {
        regmap_reg_range(DA9063_BB_REG_GP_ID_0, DA9063_BB_REG_GP_ID_19),
 };
 
-static const struct regmap_range da9063_bb_volatile_ranges[] = {
+static const struct regmap_range da9063_bb_da_volatile_ranges[] = {
        regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_REG_EVENT_D),
        regmap_reg_range(DA9063_REG_CONTROL_A, DA9063_REG_CONTROL_B),
        regmap_reg_range(DA9063_REG_CONTROL_E, DA9063_REG_CONTROL_F),
@@ -107,9 +219,9 @@ static const struct regmap_access_table da9063_bb_writeable_table = {
        .n_yes_ranges = ARRAY_SIZE(da9063_bb_writeable_ranges),
 };
 
-static const struct regmap_access_table da9063_bb_volatile_table = {
-       .yes_ranges = da9063_bb_volatile_ranges,
-       .n_yes_ranges = ARRAY_SIZE(da9063_bb_volatile_ranges),
+static const struct regmap_access_table da9063_bb_da_volatile_table = {
+       .yes_ranges = da9063_bb_da_volatile_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063_bb_da_volatile_ranges),
 };
 
 static const struct regmap_range da9063l_bb_readable_ranges[] = {
@@ -117,7 +229,7 @@ static const struct regmap_range da9063l_bb_readable_ranges[] = {
        regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
        regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
        regmap_reg_range(DA9063_REG_T_OFFSET, DA9063_BB_REG_GP_ID_19),
-       regmap_reg_range(DA9063_REG_CHIP_ID, DA9063_REG_CHIP_VARIANT),
+       regmap_reg_range(DA9063_REG_DEVICE_ID, DA9063_REG_VARIANT_ID),
 };
 
 static const struct regmap_range da9063l_bb_writeable_ranges[] = {
@@ -129,7 +241,7 @@ static const struct regmap_range da9063l_bb_writeable_ranges[] = {
        regmap_reg_range(DA9063_BB_REG_GP_ID_0, DA9063_BB_REG_GP_ID_19),
 };
 
-static const struct regmap_range da9063l_bb_volatile_ranges[] = {
+static const struct regmap_range da9063l_bb_da_volatile_ranges[] = {
        regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_REG_EVENT_D),
        regmap_reg_range(DA9063_REG_CONTROL_A, DA9063_REG_CONTROL_B),
        regmap_reg_range(DA9063_REG_CONTROL_E, DA9063_REG_CONTROL_F),
@@ -151,15 +263,70 @@ static const struct regmap_access_table da9063l_bb_writeable_table = {
        .n_yes_ranges = ARRAY_SIZE(da9063l_bb_writeable_ranges),
 };
 
-static const struct regmap_access_table da9063l_bb_volatile_table = {
-       .yes_ranges = da9063l_bb_volatile_ranges,
-       .n_yes_ranges = ARRAY_SIZE(da9063l_bb_volatile_ranges),
+static const struct regmap_access_table da9063l_bb_da_volatile_table = {
+       .yes_ranges = da9063l_bb_da_volatile_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063l_bb_da_volatile_ranges),
+};
+
+static const struct regmap_range da9063_da_readable_ranges[] = {
+       regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_BB_REG_SECOND_D),
+       regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
+       regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
+       regmap_reg_range(DA9063_REG_T_OFFSET, DA9063_BB_REG_GP_ID_11),
+       regmap_reg_range(DA9063_REG_DEVICE_ID, DA9063_REG_VARIANT_ID),
+};
+
+static const struct regmap_range da9063_da_writeable_ranges[] = {
+       regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_REG_PAGE_CON),
+       regmap_reg_range(DA9063_REG_FAULT_LOG, DA9063_REG_VSYS_MON),
+       regmap_reg_range(DA9063_REG_COUNT_S, DA9063_BB_REG_ALARM_Y),
+       regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
+       regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
+       regmap_reg_range(DA9063_REG_CONFIG_I, DA9063_BB_REG_MON_REG_4),
+       regmap_reg_range(DA9063_BB_REG_GP_ID_0, DA9063_BB_REG_GP_ID_11),
+};
+
+static const struct regmap_access_table da9063_da_readable_table = {
+       .yes_ranges = da9063_da_readable_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063_da_readable_ranges),
+};
+
+static const struct regmap_access_table da9063_da_writeable_table = {
+       .yes_ranges = da9063_da_writeable_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063_da_writeable_ranges),
+};
+
+static const struct regmap_range da9063l_da_readable_ranges[] = {
+       regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_REG_MON_A10_RES),
+       regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
+       regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
+       regmap_reg_range(DA9063_REG_T_OFFSET, DA9063_BB_REG_GP_ID_11),
+       regmap_reg_range(DA9063_REG_DEVICE_ID, DA9063_REG_VARIANT_ID),
+};
+
+static const struct regmap_range da9063l_da_writeable_ranges[] = {
+       regmap_reg_range(DA9063_REG_PAGE_CON, DA9063_REG_PAGE_CON),
+       regmap_reg_range(DA9063_REG_FAULT_LOG, DA9063_REG_VSYS_MON),
+       regmap_reg_range(DA9063_REG_SEQ, DA9063_REG_ID_32_31),
+       regmap_reg_range(DA9063_REG_SEQ_A, DA9063_REG_AUTO3_LOW),
+       regmap_reg_range(DA9063_REG_CONFIG_I, DA9063_BB_REG_MON_REG_4),
+       regmap_reg_range(DA9063_BB_REG_GP_ID_0, DA9063_BB_REG_GP_ID_11),
+};
+
+static const struct regmap_access_table da9063l_da_readable_table = {
+       .yes_ranges = da9063l_da_readable_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063l_da_readable_ranges),
+};
+
+static const struct regmap_access_table da9063l_da_writeable_table = {
+       .yes_ranges = da9063l_da_writeable_ranges,
+       .n_yes_ranges = ARRAY_SIZE(da9063l_da_writeable_ranges),
 };
 
 static const struct regmap_range_cfg da9063_range_cfg[] = {
        {
                .range_min = DA9063_REG_PAGE_CON,
-               .range_max = DA9063_REG_CHIP_VARIANT,
+               .range_max = DA9063_REG_CONFIG_ID,
                .selector_reg = DA9063_REG_PAGE_CON,
                .selector_mask = 1 << DA9063_I2C_PAGE_SEL_SHIFT,
                .selector_shift = DA9063_I2C_PAGE_SEL_SHIFT,
@@ -173,7 +340,7 @@ static struct regmap_config da9063_regmap_config = {
        .val_bits = 8,
        .ranges = da9063_range_cfg,
        .num_ranges = ARRAY_SIZE(da9063_range_cfg),
-       .max_register = DA9063_REG_CHIP_VARIANT,
+       .max_register = DA9063_REG_CONFIG_ID,
 
        .cache_type = REGCACHE_RBTREE,
 };
@@ -199,18 +366,72 @@ static int da9063_i2c_probe(struct i2c_client *i2c,
        da9063->chip_irq = i2c->irq;
        da9063->type = id->driver_data;
 
-       if (da9063->variant_code == PMIC_DA9063_AD) {
-               da9063_regmap_config.rd_table = &da9063_ad_readable_table;
-               da9063_regmap_config.wr_table = &da9063_ad_writeable_table;
-               da9063_regmap_config.volatile_table = &da9063_ad_volatile_table;
-       } else if (da9063->type == PMIC_TYPE_DA9063L) {
-               da9063_regmap_config.rd_table = &da9063l_bb_readable_table;
-               da9063_regmap_config.wr_table = &da9063l_bb_writeable_table;
-               da9063_regmap_config.volatile_table = &da9063l_bb_volatile_table;
-       } else {
-               da9063_regmap_config.rd_table = &da9063_bb_readable_table;
-               da9063_regmap_config.wr_table = &da9063_bb_writeable_table;
-               da9063_regmap_config.volatile_table = &da9063_bb_volatile_table;
+       ret = da9063_get_device_type(i2c, da9063);
+       if (ret)
+               return ret;
+
+       switch (da9063->type) {
+       case PMIC_TYPE_DA9063:
+               switch (da9063->variant_code) {
+               case PMIC_DA9063_AD:
+                       da9063_regmap_config.rd_table =
+                               &da9063_ad_readable_table;
+                       da9063_regmap_config.wr_table =
+                               &da9063_ad_writeable_table;
+                       da9063_regmap_config.volatile_table =
+                               &da9063_ad_volatile_table;
+                       break;
+               case PMIC_DA9063_BB:
+               case PMIC_DA9063_CA:
+                       da9063_regmap_config.rd_table =
+                               &da9063_bb_readable_table;
+                       da9063_regmap_config.wr_table =
+                               &da9063_bb_writeable_table;
+                       da9063_regmap_config.volatile_table =
+                               &da9063_bb_da_volatile_table;
+                       break;
+               case PMIC_DA9063_DA:
+                       da9063_regmap_config.rd_table =
+                               &da9063_da_readable_table;
+                       da9063_regmap_config.wr_table =
+                               &da9063_da_writeable_table;
+                       da9063_regmap_config.volatile_table =
+                               &da9063_bb_da_volatile_table;
+                       break;
+               default:
+                       dev_err(da9063->dev,
+                               "Chip variant not supported for DA9063\n");
+                       return -ENODEV;
+               }
+               break;
+       case PMIC_TYPE_DA9063L:
+               switch (da9063->variant_code) {
+               case PMIC_DA9063_BB:
+               case PMIC_DA9063_CA:
+                       da9063_regmap_config.rd_table =
+                               &da9063l_bb_readable_table;
+                       da9063_regmap_config.wr_table =
+                               &da9063l_bb_writeable_table;
+                       da9063_regmap_config.volatile_table =
+                               &da9063l_bb_da_volatile_table;
+                       break;
+               case PMIC_DA9063_DA:
+                       da9063_regmap_config.rd_table =
+                               &da9063l_da_readable_table;
+                       da9063_regmap_config.wr_table =
+                               &da9063l_da_writeable_table;
+                       da9063_regmap_config.volatile_table =
+                               &da9063l_bb_da_volatile_table;
+                       break;
+               default:
+                       dev_err(da9063->dev,
+                               "Chip variant not supported for DA9063L\n");
+                       return -ENODEV;
+               }
+               break;
+       default:
+               dev_err(da9063->dev, "Chip type not supported\n");
+               return -ENODEV;
        }
 
        da9063->regmap = devm_regmap_init_i2c(i2c, &da9063_regmap_config);