diff options
Diffstat (limited to 'drivers/rtc/rtc-ab-b5ze-s3.c')
| -rw-r--r-- | drivers/rtc/rtc-ab-b5ze-s3.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c index 8dc451932446..2233601761ac 100644 --- a/drivers/rtc/rtc-ab-b5ze-s3.c +++ b/drivers/rtc/rtc-ab-b5ze-s3.c @@ -265,15 +265,6 @@ static int abb5zes3_rtc_set_time(struct device *dev, struct rtc_time *tm) u8 regs[ABB5ZES3_REG_RTC_SC + ABB5ZES3_RTC_SEC_LEN]; int ret; - /* - * Year register is 8-bit wide and bcd-coded, i.e records values - * between 0 and 99. tm_year is an offset from 1900 and we are - * interested in the 2000-2099 range, so any value less than 100 - * is invalid. - */ - if (tm->tm_year < 100) - return -EINVAL; - regs[ABB5ZES3_REG_RTC_SC] = bin2bcd(tm->tm_sec); /* MSB=0 clears OSC */ regs[ABB5ZES3_REG_RTC_MN] = bin2bcd(tm->tm_min); regs[ABB5ZES3_REG_RTC_HR] = bin2bcd(tm->tm_hour); /* 24-hour format */ @@ -925,6 +916,14 @@ static int abb5zes3_probe(struct i2c_client *client, if (ret) goto err; + data->rtc = devm_rtc_allocate_device(dev); + ret = PTR_ERR_OR_ZERO(data->rtc); + if (ret) { + dev_err(dev, "%s: unable to allocate RTC device (%d)\n", + __func__, ret); + goto err; + } + if (client->irq > 0) { ret = devm_request_threaded_irq(dev, client->irq, NULL, _abb5zes3_rtc_interrupt, @@ -942,14 +941,9 @@ static int abb5zes3_probe(struct i2c_client *client, } } - data->rtc = devm_rtc_device_register(dev, DRV_NAME, &rtc_ops, - THIS_MODULE); - ret = PTR_ERR_OR_ZERO(data->rtc); - if (ret) { - dev_err(dev, "%s: unable to register RTC device (%d)\n", - __func__, ret); - goto err; - } + data->rtc->ops = &rtc_ops; + data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; + data->rtc->range_max = RTC_TIMESTAMP_END_2099; /* Enable battery low detection interrupt if battery not already low */ if (!data->battery_low && data->irq) { @@ -961,6 +955,8 @@ static int abb5zes3_probe(struct i2c_client *client, } } + ret = rtc_register_device(data->rtc); + err: if (ret && data && data->irq) device_init_wakeup(dev, false); |