rtc: max77686: Use single-byte writes on MAX77620
authorThierry Reding <treding@nvidia.com>
Fri, 17 Apr 2020 17:08:25 +0000 (19:08 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 11 May 2020 14:21:47 +0000 (16:21 +0200)
The MAX77620 doesn't support bulk writes, so make sure the regmap code
breaks bulk writes into multiple single-byte writes.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20200417170825.2551367-3-thierry.reding@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-max77686.c

index d5a0e27dd0a08e57331efb9cb860a145185bf56d..03ebcf1c0f3dfe8fc965a699a5debe12682cf3ec 100644 (file)
@@ -78,6 +78,8 @@ struct max77686_rtc_driver_data {
        int                     alarm_pending_status_reg;
        /* RTC IRQ CHIP for regmap */
        const struct regmap_irq_chip *rtc_irq_chip;
+       /* regmap configuration for the chip */
+       const struct regmap_config *regmap_config;
 };
 
 struct max77686_rtc_info {
@@ -182,6 +184,11 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = {
        .num_irqs       = ARRAY_SIZE(max77686_rtc_irqs),
 };
 
+static const struct regmap_config max77686_rtc_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+};
+
 static const struct max77686_rtc_driver_data max77686_drv_data = {
        .delay = 16000,
        .mask  = 0x7f,
@@ -191,6 +198,13 @@ static const struct max77686_rtc_driver_data max77686_drv_data = {
        .alarm_pending_status_reg = MAX77686_REG_STATUS2,
        .rtc_i2c_addr = MAX77686_I2C_ADDR_RTC,
        .rtc_irq_chip = &max77686_rtc_irq_chip,
+       .regmap_config = &max77686_rtc_regmap_config,
+};
+
+static const struct regmap_config max77620_rtc_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .use_single_write = true,
 };
 
 static const struct max77686_rtc_driver_data max77620_drv_data = {
@@ -202,6 +216,7 @@ static const struct max77686_rtc_driver_data max77620_drv_data = {
        .alarm_pending_status_reg = MAX77686_INVALID_REG,
        .rtc_i2c_addr = MAX77620_I2C_ADDR_RTC,
        .rtc_irq_chip = &max77686_rtc_irq_chip,
+       .regmap_config = &max77620_rtc_regmap_config,
 };
 
 static const unsigned int max77802_map[REG_RTC_END] = {
@@ -658,11 +673,6 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info)
        return ret;
 }
 
-static const struct regmap_config max77686_rtc_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-};
-
 static int max77686_init_rtc_regmap(struct max77686_rtc_info *info)
 {
        struct device *parent = info->dev->parent;
@@ -698,7 +708,7 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info)
        }
 
        info->rtc_regmap = devm_regmap_init_i2c(info->rtc,
-                                               &max77686_rtc_regmap_config);
+                                               info->drv_data->regmap_config);
        if (IS_ERR(info->rtc_regmap)) {
                ret = PTR_ERR(info->rtc_regmap);
                dev_err(info->dev, "Failed to allocate RTC regmap: %d\n", ret);