rtc: rx8025: check time validity when necessary

[mirror_ubuntu-bionic-kernel.git] / drivers / rtc / rtc-rx8025.c

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index bf96f40fd200f3e8324de5f0127c2c6bd738d286..24c3d69ce1b97887485a2d668716a439c0a7625a 100644 (file)
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -104,6 +104,44 @@ static s32 rx8025_write_regs(const struct i2c_client *client,
                                              length, values);
 }
 
+static int rx8025_check_validity(struct device *dev)
+{
+       struct rx8025_data *rx8025 = dev_get_drvdata(dev);
+       int ctrl2;
+
+       ctrl2 = rx8025_read_reg(rx8025->client, RX8025_REG_CTRL2);
+       if (ctrl2 < 0)
+               return ctrl2;
+
+       if (ctrl2 & RX8025_BIT_CTRL2_VDET)
+               dev_warn(dev, "power voltage drop detected\n");
+
+       if (ctrl2 & RX8025_BIT_CTRL2_PON) {
+               dev_warn(dev, "power-on reset detected, date is invalid\n");
+               return -EINVAL;
+       }
+
+       if (!(ctrl2 & RX8025_BIT_CTRL2_XST)) {
+               dev_warn(dev, "crystal stopped, date is invalid\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int rx8025_reset_validity(struct i2c_client *client)
+{
+       int ctrl2 = rx8025_read_reg(client, RX8025_REG_CTRL2);
+
+       if (ctrl2 < 0)
+               return ctrl2;
+
+       ctrl2 &= ~(RX8025_BIT_CTRL2_PON | RX8025_BIT_CTRL2_VDET);
+
+       return rx8025_write_reg(client, RX8025_REG_CTRL2,
+                               ctrl2 | RX8025_BIT_CTRL2_XST);
+}
+
 static irqreturn_t rx8025_handle_irq(int irq, void *dev_id)
 {
        struct i2c_client *client = dev_id;
@@ -133,10 +171,6 @@ static irqreturn_t rx8025_handle_irq(int irq, void *dev_id)
                rtc_update_irq(rx8025->rtc, 1, RTC_AF | RTC_IRQF);
        }
 
-       /* acknowledge IRQ */
-       rx8025_write_reg(client, RX8025_REG_CTRL2,
-                        status | RX8025_BIT_CTRL2_XST);
-
 out:
        return IRQ_HANDLED;
 }
@@ -145,21 +179,11 @@ static int rx8025_get_time(struct device *dev, struct rtc_time *dt)
 {
        struct rx8025_data *rx8025 = dev_get_drvdata(dev);
        u8 date[7];
-       int ctrl, err;
-
-       ctrl = rx8025_read_reg(rx8025->client, RX8025_REG_CTRL2);
-       if (ctrl < 0)
-               return ctrl;
-
-       if (ctrl & RX8025_BIT_CTRL2_PON) {
-               dev_warn(dev, "power-on reset detected, date is invalid\n");
-               return -EINVAL;
-       }
+       int err;
 
-       if (!(ctrl & RX8025_BIT_CTRL2_XST)) {
-               dev_warn(dev, "crystal stopped, date is invalid\n");
-               return -EINVAL;
-       }
+       err = rx8025_check_validity(dev);
+       if (err)
+               return err;
 
        err = rx8025_read_regs(rx8025->client, RX8025_REG_SEC, 7, date);
        if (err)
@@ -193,6 +217,7 @@ static int rx8025_set_time(struct device *dev, struct rtc_time *dt)
 {
        struct rx8025_data *rx8025 = dev_get_drvdata(dev);
        u8 date[7];
+       int ret;
 
        if ((dt->tm_year < 100) || (dt->tm_year > 199))
                return -EINVAL;
@@ -219,7 +244,11 @@ static int rx8025_set_time(struct device *dev, struct rtc_time *dt)
                __func__,
                date[0], date[1], date[2], date[3], date[4], date[5], date[6]);
 
-       return rx8025_write_regs(rx8025->client, RX8025_REG_SEC, 7, date);
+       ret = rx8025_write_regs(rx8025->client, RX8025_REG_SEC, 7, date);
+       if (ret < 0)
+               return ret;
+
+       return rx8025_reset_validity(rx8025->client);
 }
 
 static int rx8025_init_client(struct i2c_client *client)
@@ -236,38 +265,18 @@ static int rx8025_init_client(struct i2c_client *client)
        /* Keep test bit zero ! */
        rx8025->ctrl1 = ctrl[0] & ~RX8025_BIT_CTRL1_TEST;
 
-       if (ctrl[1] & RX8025_BIT_CTRL2_PON) {
-               dev_warn(&client->dev, "power-on reset was detected, "
-                        "you may have to readjust the clock\n");
-               need_clear = 1;
-       }
-
-       if (ctrl[1] & RX8025_BIT_CTRL2_VDET) {
-               dev_warn(&client->dev, "a power voltage drop was detected, "
-                        "you may have to readjust the clock\n");
-               need_clear = 1;
-       }
-
-       if (!(ctrl[1] & RX8025_BIT_CTRL2_XST)) {
-               dev_warn(&client->dev, "Oscillation stop was detected,"
-                        "you may have to readjust the clock\n");
-               need_clear = 1;
-       }
-
        if (ctrl[1] & (RX8025_BIT_CTRL2_DAFG | RX8025_BIT_CTRL2_WAFG)) {
                dev_warn(&client->dev, "Alarm was detected\n");
                need_clear = 1;
        }
 
-       if (!(ctrl[1] & RX8025_BIT_CTRL2_CTFG))
+       if (ctrl[1] & RX8025_BIT_CTRL2_CTFG)
                need_clear = 1;
 
        if (need_clear) {
-               ctrl2 = ctrl[0];
-               ctrl2 &= ~(RX8025_BIT_CTRL2_PON | RX8025_BIT_CTRL2_VDET |
-                          RX8025_BIT_CTRL2_CTFG | RX8025_BIT_CTRL2_WAFG |
+               ctrl2 = ctrl[1];
+               ctrl2 &= ~(RX8025_BIT_CTRL2_CTFG | RX8025_BIT_CTRL2_WAFG |
                           RX8025_BIT_CTRL2_DAFG);
-               ctrl2 |= RX8025_BIT_CTRL2_XST;
 
                err = rx8025_write_reg(client, RX8025_REG_CTRL2, ctrl2);
        }
@@ -533,12 +542,11 @@ static int rx8025_probe(struct i2c_client *client,
                                                rx8025_handle_irq, 0, "rx8025",
                                                client);
                if (err) {
-                       dev_err(&client->dev, "unable to request IRQ\n");
-                       return err;
+                       dev_err(&client->dev, "unable to request IRQ, alarms disabled\n");
+                       client->irq = 0;
                }
        }
 
-       rx8025->rtc->irq_freq = 1;
        rx8025->rtc->max_user_freq = 1;
 
        err = rx8025_sysfs_register(&client->dev);