summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2016-02-09 22:56:31 +0530
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-03-14 17:08:11 +0100
commit69be249ab4bcfe3dae61866835f102632cdbe9d9 (patch)
treeaa93f90d9674b6cab581e67fe1e606a995c5ce91
parent0b4f8b085b5dc2567e5cfb6417df9f79df9cb39e (diff)
downloadop-kernel-dev-69be249ab4bcfe3dae61866835f102632cdbe9d9.zip
op-kernel-dev-69be249ab4bcfe3dae61866835f102632cdbe9d9.tar.gz
rtc: max77686: use rtc regmap to access RTC registers
rtc_regmap should be used to access all RTC registers instead of parent regmap regardless of what chip or property have it. This makes the register access uniform and extendible for other chips. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
-rw-r--r--drivers/rtc/rtc-max77686.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 7f1ca10..28330e8 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -370,7 +370,7 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
goto out;
}
- ret = regmap_read(info->max77686->regmap,
+ ret = regmap_read(info->max77686->rtc_regmap,
map[REG_RTC_AE1], &val);
if (ret < 0) {
dev_err(info->dev,
@@ -426,7 +426,8 @@ static int max77686_rtc_stop_alarm(struct max77686_rtc_info *info)
goto out;
}
- ret = regmap_write(info->max77686->regmap, map[REG_RTC_AE1], 0);
+ ret = regmap_write(info->max77686->rtc_regmap,
+ map[REG_RTC_AE1], 0);
} else {
ret = regmap_bulk_read(info->max77686->rtc_regmap,
map[REG_ALARM1_SEC], data,
@@ -471,7 +472,7 @@ static int max77686_rtc_start_alarm(struct max77686_rtc_info *info)
goto out;
if (info->drv_data->alarm_enable_reg) {
- ret = regmap_write(info->max77686->regmap, map[REG_RTC_AE1],
+ ret = regmap_write(info->max77686->rtc_regmap, map[REG_RTC_AE1],
MAX77802_ALARM_ENABLE_VALUE);
} else {
ret = regmap_bulk_read(info->max77686->rtc_regmap,
OpenPOWER on IntegriCloud