| Message ID | 20121219153432.GC14217@axis.com |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Dec 19, 2012 at 04:34:32PM +0100, Jesper Nilsson wrote: > This patch implements reading of the battery voltage low signal for > rtc-pcf8523. > > The bit is read-only and cannot be cleared by software, so no > clear-function is implemented. > > Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> > --- > diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c > index be05a64..62905fb 100644 > --- a/drivers/rtc/rtc-pcf8523.c > +++ b/drivers/rtc/rtc-pcf8523.c > @@ -23,6 +23,7 @@ > #define REG_CONTROL3_PM_VDD (1 << 6) /* switch-over disabled */ > #define REG_CONTROL3_PM_DSM (1 << 5) /* direct switching mode */ > #define REG_CONTROL3_PM_MASK 0xe0 > +#define REG_CONTROL3_BLF (1 << 2) /* battery low bit, read-only */ > > #define REG_SECONDS 0x03 > #define REG_SECONDS_OS (1 << 7) > @@ -250,9 +252,36 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm) > return pcf8523_start_rtc(client); > } > > +static int > +pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) You should keep the modifier and return type on the same line as the function name and wrap the arguments instead. That is: static int pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) { ... } > +{ > + struct i2c_client *client = to_i2c_client(dev); > + u8 value; > + int err; > + int ret = 0; You can probably collapse the two integers in one line, like so: int ret = 0, err; Other than that, looks good: Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c index be05a64..62905fb 100644 --- a/drivers/rtc/rtc-pcf8523.c +++ b/drivers/rtc/rtc-pcf8523.c @@ -23,6 +23,7 @@ #define REG_CONTROL3_PM_VDD (1 << 6) /* switch-over disabled */ #define REG_CONTROL3_PM_DSM (1 << 5) /* direct switching mode */ #define REG_CONTROL3_PM_MASK 0xe0 +#define REG_CONTROL3_BLF (1 << 2) /* battery low bit, read-only */ #define REG_SECONDS 0x03 #define REG_SECONDS_OS (1 << 7) @@ -250,9 +252,36 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm) return pcf8523_start_rtc(client); } +static int +pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) +{ + struct i2c_client *client = to_i2c_client(dev); + u8 value; + int err; + int ret = 0; + + switch (cmd) { + case RTC_VL_READ: + err = pcf8523_read(client, REG_CONTROL3, &value); + if (err < 0) + return err; + + if (value & REG_CONTROL3_BLF) + ret = 1; + + if (copy_to_user((void __user *)arg, &ret, sizeof(int))) + return -EFAULT; + + return 0; + default: + return -ENOIOCTLCMD; + } +} + static const struct rtc_class_ops pcf8523_rtc_ops = { .read_time = pcf8523_rtc_read_time, .set_time = pcf8523_rtc_set_time, + .ioctl = pcf8523_rtc_ioctl, }; static int pcf8523_probe(struct i2c_client *client,
This patch implements reading of the battery voltage low signal for rtc-pcf8523. The bit is read-only and cannot be cleared by software, so no clear-function is implemented. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> --- /^JN - Jesper Nilsson