Commit 63a52f63 authored by Thierry Reding's avatar Thierry Reding Committed by Alexandre Belloni

rtc: max77686: Use single-byte writes on MAX77620

The MAX77620 doesn't support bulk writes, so make sure the regmap code
breaks bulk writes into multiple single-byte writes.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarJon Hunter <jonathanh@nvidia.com>
Tested-by: default avatarJon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20200417170825.2551367-3-thierry.reding@gmail.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 7d65cf8c
...@@ -78,6 +78,8 @@ struct max77686_rtc_driver_data { ...@@ -78,6 +78,8 @@ struct max77686_rtc_driver_data {
int alarm_pending_status_reg; int alarm_pending_status_reg;
/* RTC IRQ CHIP for regmap */ /* RTC IRQ CHIP for regmap */
const struct regmap_irq_chip *rtc_irq_chip; const struct regmap_irq_chip *rtc_irq_chip;
/* regmap configuration for the chip */
const struct regmap_config *regmap_config;
}; };
struct max77686_rtc_info { struct max77686_rtc_info {
...@@ -182,6 +184,11 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = { ...@@ -182,6 +184,11 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = {
.num_irqs = ARRAY_SIZE(max77686_rtc_irqs), .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 = { static const struct max77686_rtc_driver_data max77686_drv_data = {
.delay = 16000, .delay = 16000,
.mask = 0x7f, .mask = 0x7f,
...@@ -191,6 +198,13 @@ static const struct max77686_rtc_driver_data max77686_drv_data = { ...@@ -191,6 +198,13 @@ static const struct max77686_rtc_driver_data max77686_drv_data = {
.alarm_pending_status_reg = MAX77686_REG_STATUS2, .alarm_pending_status_reg = MAX77686_REG_STATUS2,
.rtc_i2c_addr = MAX77686_I2C_ADDR_RTC, .rtc_i2c_addr = MAX77686_I2C_ADDR_RTC,
.rtc_irq_chip = &max77686_rtc_irq_chip, .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 = { static const struct max77686_rtc_driver_data max77620_drv_data = {
...@@ -202,6 +216,7 @@ 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, .alarm_pending_status_reg = MAX77686_INVALID_REG,
.rtc_i2c_addr = MAX77620_I2C_ADDR_RTC, .rtc_i2c_addr = MAX77620_I2C_ADDR_RTC,
.rtc_irq_chip = &max77686_rtc_irq_chip, .rtc_irq_chip = &max77686_rtc_irq_chip,
.regmap_config = &max77620_rtc_regmap_config,
}; };
static const unsigned int max77802_map[REG_RTC_END] = { static const unsigned int max77802_map[REG_RTC_END] = {
...@@ -658,11 +673,6 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info) ...@@ -658,11 +673,6 @@ static int max77686_rtc_init_reg(struct max77686_rtc_info *info)
return ret; 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) static int max77686_init_rtc_regmap(struct max77686_rtc_info *info)
{ {
struct device *parent = info->dev->parent; struct device *parent = info->dev->parent;
...@@ -698,7 +708,7 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info) ...@@ -698,7 +708,7 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info)
} }
info->rtc_regmap = devm_regmap_init_i2c(info->rtc, info->rtc_regmap = devm_regmap_init_i2c(info->rtc,
&max77686_rtc_regmap_config); info->drv_data->regmap_config);
if (IS_ERR(info->rtc_regmap)) { if (IS_ERR(info->rtc_regmap)) {
ret = PTR_ERR(info->rtc_regmap); ret = PTR_ERR(info->rtc_regmap);
dev_err(info->dev, "Failed to allocate RTC regmap: %d\n", ret); dev_err(info->dev, "Failed to allocate RTC regmap: %d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment