rtc: s5m: Add separate field for storing auto-cleared mask in register config

Some devices from S2M/S5M family use different register update masks for
different operations (alarm and register update). Now the driver uses
common register configuration and a lot of exceptions per device in code.

Before eliminating the exceptions and using specific register
configuration for given device, make the auto-cleared mask a separate
field. This is merely a refactoring.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 85649861a6b03c6b67f55c2918d1c36b694d628b..559db8f72117de0007e58e4b3359b2d9ec1cdefe 100644 (file)
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -56,6 +56,8 @@ struct s5m_rtc_reg_config {
         * auto-cleared after successful update.
         */
        unsigned int udr_update;
+       /* Auto-cleared mask in UDR field for writing time and alarm */
+       unsigned int autoclear_udr_mask;
        /* Mask for UDR field in 'udr_update' register */
        unsigned int udr_mask;
 };
@@ -68,6 +70,7 @@ static const struct s5m_rtc_reg_config s5m_rtc_regs = {
        .alarm0                 = S5M_ALARM0_SEC,
        .alarm1                 = S5M_ALARM1_SEC,
        .udr_update             = S5M_RTC_UDR_CON,
+       .autoclear_udr_mask     = S5M_RTC_UDR_MASK,
        .udr_mask               = S5M_RTC_UDR_MASK,
 };
 
@@ -82,6 +85,7 @@ static const struct s5m_rtc_reg_config s2mps_rtc_regs = {
        .alarm0                 = S2MPS_ALARM0_SEC,
        .alarm1                 = S2MPS_ALARM1_SEC,
        .udr_update             = S2MPS_RTC_UDR_CON,
+       .autoclear_udr_mask     = S2MPS_RTC_WUDR_MASK,
        .udr_mask               = S2MPS_RTC_WUDR_MASK,
 };
 
@@ -167,7 +171,7 @@ static inline int s5m8767_wait_for_udr_update(struct s5m_rtc_info *info)
 
        do {
                ret = regmap_read(info->regmap, info->regs->udr_update, &data);
-       } while (--retry && (data & info->regs->udr_mask) && !ret);
+       } while (--retry && (data & info->regs->autoclear_udr_mask) && !ret);
 
        if (!retry)
                dev_err(info->dev, "waiting for UDR update, reached max number of retries\n");