@@ -88,8 +88,6 @@
#define PCF2127_WD_VAL_MAX 255
#define PCF2127_WD_VAL_DEFAULT 60
-static int pcf2127_wdt_active_ping(struct watchdog_device *wdd);
-
struct pcf2127 {
struct rtc_device *rtc;
struct watchdog_device wdd;
@@ -195,140 +193,6 @@ static int pcf2127_rtc_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
-static int pcf2127_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-{
- struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
- unsigned int buf[5], ctrl2;
- int ret;
-
- ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2);
- if (ret) {
- dev_err(dev, "%s: ctrl2 read error\n", __func__);
- return ret;
- }
-
- ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
- if (ret)
- return ret;
-
- ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_ALARM_SC, buf,
- sizeof(buf));
- if (ret) {
- dev_err(dev, "%s: alarm read error\n", __func__);
- return ret;
- }
-
- alrm->enabled = ctrl2 & PCF2127_BIT_CTRL2_AIE;
- alrm->pending = ctrl2 & PCF2127_BIT_CTRL2_AF;
-
- alrm->time.tm_sec = bcd2bin(buf[0] & 0x7F);
- alrm->time.tm_min = bcd2bin(buf[1] & 0x7F);
- alrm->time.tm_hour = bcd2bin(buf[2] & 0x3F);
- alrm->time.tm_mday = bcd2bin(buf[3] & 0x3F);
- alrm->time.tm_wday = buf[4] & 0x07;
-
- dev_dbg(dev, "%s: alarm is %d:%d:%d, mday=%d, wday=%d\n", __func__,
- alrm->time.tm_hour, alrm->time.tm_min, alrm->time.tm_sec,
- alrm->time.tm_mday, alrm->time.tm_wday);
-
- return 0;
-}
-
-static int pcf2127_rtc_alarm_irq_enable(struct device *dev, u32 enable)
-{
- struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
- int ret;
-
- ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
- PCF2127_BIT_CTRL2_AIE,
- enable ? PCF2127_BIT_CTRL2_AIE : 0);
- if (ret) {
- dev_err(dev, "%s: failed to %s alarm (%d)\n", __func__,
- enable ? "enable" : "disable",
- ret);
- return ret;
- }
-
- ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
- if (ret)
- return ret;
-
- return 0;
-}
-
-static int pcf2127_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-{
- struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
- uint8_t buf[5];
- int ret;
-
- ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
- PCF2127_BIT_CTRL2_AF, 0);
- if (ret) {
- dev_err(dev, "%s: failed to clear alarm interrupt flag (%d)",
- __func__, ret);
- return ret;
- }
-
- ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
- if (ret)
- return ret;
-
- buf[0] = bin2bcd(alrm->time.tm_sec);
- buf[1] = bin2bcd(alrm->time.tm_min);
- buf[2] = bin2bcd(alrm->time.tm_hour);
- buf[3] = bin2bcd(alrm->time.tm_mday);
- buf[4] = (alrm->time.tm_wday & 0x07);
-
- dev_dbg(dev, "%s: alarm set for: %d:%d:%d, mday=%d, wday=%d\n",
- __func__, alrm->time.tm_hour, alrm->time.tm_min,
- alrm->time.tm_sec, alrm->time.tm_mday, alrm->time.tm_wday);
-
- ret = regmap_bulk_write(pcf2127->regmap, PCF2127_REG_ALARM_SC, buf,
- sizeof(buf));
- if (ret) {
- dev_err(dev, "%s: failed to write alarm registers (%d)",
- __func__, ret);
- return ret;
- }
-
- pcf2127_rtc_alarm_irq_enable(dev, alrm->enabled);
-
- return 0;
-}
-
-static irqreturn_t pcf2127_rtc_irq(int irq, void *dev)
-{
- struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
- unsigned int ctrl2 = 0;
- int ret = 0;
-
- ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2);
- if (ret) {
- dev_err(dev, "%s: ctrl2 read error (%d)\n", __func__, ret);
- goto irq_err;
- }
-
- ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
- if (ret)
- goto irq_err;
-
- if (ctrl2 & PCF2127_BIT_CTRL2_AF) {
- regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
- PCF2127_BIT_CTRL2_AF, 0);
-
- ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
- if (ret)
- goto irq_err;
-
- rtc_update_irq(pcf2127->rtc, 1, RTC_IRQF | RTC_AF);
- }
-
- return IRQ_HANDLED;
-irq_err:
- return IRQ_NONE;
-}
-
static int pcf2127_rtc_ioctl(struct device *dev,
unsigned int cmd, unsigned long arg)
{
@@ -360,12 +224,9 @@ static int pcf2127_rtc_ioctl(struct device *dev,
}
static const struct rtc_class_ops pcf2127_rtc_ops = {
- .ioctl = pcf2127_rtc_ioctl,
- .read_time = pcf2127_rtc_read_time,
- .set_time = pcf2127_rtc_set_time,
- .read_alarm = pcf2127_rtc_read_alarm,
- .set_alarm = pcf2127_rtc_set_alarm,
- .alarm_irq_enable = pcf2127_rtc_alarm_irq_enable,
+ .ioctl = pcf2127_rtc_ioctl,
+ .read_time = pcf2127_rtc_read_time,
+ .set_time = pcf2127_rtc_set_time,
};
static int pcf2127_nvmem_read(void *priv, unsigned int offset,
@@ -472,6 +333,116 @@ static const struct watchdog_ops pcf2127_watchdog_ops = {
.set_timeout = pcf2127_wdt_set_timeout,
};
+/* Alarm */
+static int pcf2127_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+ struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
+ unsigned int buf[5], ctrl2;
+ int ret;
+
+ ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2);
+ if (ret)
+ return ret;
+
+ ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
+ if (ret)
+ return ret;
+
+ ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_ALARM_SC, buf,
+ sizeof(buf));
+ if (ret)
+ return ret;
+
+ alrm->enabled = ctrl2 & PCF2127_BIT_CTRL2_AIE;
+ alrm->pending = ctrl2 & PCF2127_BIT_CTRL2_AF;
+
+ alrm->time.tm_sec = bcd2bin(buf[0] & 0x7F);
+ alrm->time.tm_min = bcd2bin(buf[1] & 0x7F);
+ alrm->time.tm_hour = bcd2bin(buf[2] & 0x3F);
+ alrm->time.tm_mday = bcd2bin(buf[3] & 0x3F);
+ alrm->time.tm_wday = buf[4] & 0x07;
+
+ return 0;
+}
+
+static int pcf2127_rtc_alarm_irq_enable(struct device *dev, u32 enable)
+{
+ struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
+ int ret;
+
+ ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
+ PCF2127_BIT_CTRL2_AIE,
+ enable ? PCF2127_BIT_CTRL2_AIE : 0);
+ if (ret)
+ return ret;
+
+ return pcf2127_wdt_active_ping(&pcf2127->wdd);
+}
+
+static int pcf2127_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+ struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
+ uint8_t buf[5];
+ int ret;
+
+ ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
+ PCF2127_BIT_CTRL2_AF, 0);
+ if (ret)
+ return ret;
+
+ ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
+ if (ret)
+ return ret;
+
+ buf[0] = bin2bcd(alrm->time.tm_sec);
+ buf[1] = bin2bcd(alrm->time.tm_min);
+ buf[2] = bin2bcd(alrm->time.tm_hour);
+ buf[3] = bin2bcd(alrm->time.tm_mday);
+ buf[4] = (alrm->time.tm_wday & 0x07);
+
+ ret = regmap_bulk_write(pcf2127->regmap, PCF2127_REG_ALARM_SC, buf,
+ sizeof(buf));
+ if (ret)
+ return ret;
+
+ return pcf2127_rtc_alarm_irq_enable(dev, alrm->enabled);
+}
+
+static irqreturn_t pcf2127_rtc_irq(int irq, void *dev)
+{
+ struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
+ unsigned int ctrl2 = 0;
+ int ret = 0;
+
+ ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2);
+ if (ret)
+ goto irq_err;
+
+ if (ctrl2 & PCF2127_BIT_CTRL2_AF) {
+ regmap_write(pcf2127->regmap, PCF2127_REG_CTRL2,
+ ctrl2 & ~PCF2127_BIT_CTRL2_AF);
+
+ rtc_update_irq(pcf2127->rtc, 1, RTC_IRQF | RTC_AF);
+ }
+
+ ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
+ if (ret)
+ goto irq_err;
+
+ return IRQ_HANDLED;
+irq_err:
+ return IRQ_NONE;
+}
+
+static const struct rtc_class_ops pcf2127_rtc_alrm_ops = {
+ .ioctl = pcf2127_rtc_ioctl,
+ .read_time = pcf2127_rtc_read_time,
+ .set_time = pcf2127_rtc_set_time,
+ .read_alarm = pcf2127_rtc_read_alarm,
+ .set_alarm = pcf2127_rtc_set_alarm,
+ .alarm_irq_enable = pcf2127_rtc_alarm_irq_enable,
+};
+
/* sysfs interface */
static ssize_t timestamp0_store(struct device *dev,
@@ -601,8 +572,10 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
}
}
- if (alarm_irq >= 0 || device_property_read_bool(dev, "wakeup-source"))
+ if (alarm_irq >= 0 || device_property_read_bool(dev, "wakeup-source")) {
device_init_wakeup(dev, true);
+ pcf2127->rtc->ops = &pcf2127_rtc_alrm_ops;
+ }
pcf2127->wdd.parent = dev;
pcf2127->wdd.info = &pcf2127_wdt_info;