Skip to content

L
linux
Commit 4aa90c03 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files
Options

rtc: pcf8523: rename register and bit defines 

arch/arm/mach-ixp4xx/include/mach/platform.h now gets included indirectly
and defines REG_OFFSET. Rename the register and bit definition to something
specific to the driver.

Fixes: 7fd70c65 ("ARM: irqstat: Get rid of duplicated declaration")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210710211431.1393589-1-alexandre.belloni@bootlin.com
parent 2f861984
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
drivers/rtc/rtc-pcf8523.c
View file @ 4aa90c03
...@@ -10,41 +10,41 @@ ...@@ -10,41 +10,41 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/pm_wakeirq.h> #include <linux/pm_wakeirq.h>
#define REG_CONTROL1 0x00 #define PCF8523_REG_CONTROL1 0x00
#define REG_CONTROL1_CAP_SEL BIT(7) #define PCF8523_CONTROL1_CAP_SEL BIT(7)
#define REG_CONTROL1_STOP BIT(5) #define PCF8523_CONTROL1_STOP BIT(5)
#define REG_CONTROL1_AIE BIT(1) #define PCF8523_CONTROL1_AIE BIT(1)
#define REG_CONTROL2 0x01 #define PCF8523_REG_CONTROL2 0x01
#define REG_CONTROL2_AF BIT(3) #define PCF8523_CONTROL2_AF BIT(3)
#define REG_CONTROL3 0x02 #define PCF8523_REG_CONTROL3 0x02
#define REG_CONTROL3_PM_BLD BIT(7) /* battery low detection disabled */ #define PCF8523_CONTROL3_PM_BLD BIT(7) /* battery low detection disabled */
#define REG_CONTROL3_PM_VDD BIT(6) /* switch-over disabled */ #define PCF8523_CONTROL3_PM_VDD BIT(6) /* switch-over disabled */
#define REG_CONTROL3_PM_DSM BIT(5) /* direct switching mode */ #define PCF8523_CONTROL3_PM_DSM BIT(5) /* direct switching mode */
#define REG_CONTROL3_PM_MASK 0xe0 #define PCF8523_CONTROL3_PM_MASK 0xe0
#define REG_CONTROL3_BLF BIT(2) /* battery low bit, read-only */ #define PCF8523_CONTROL3_BLF BIT(2) /* battery low bit, read-only */
#define REG_SECONDS 0x03 #define PCF8523_REG_SECONDS 0x03
#define REG_SECONDS_OS BIT(7) #define PCF8523_SECONDS_OS BIT(7)
#define REG_MINUTES 0x04 #define PCF8523_REG_MINUTES 0x04
#define REG_HOURS 0x05 #define PCF8523_REG_HOURS 0x05
#define REG_DAYS 0x06 #define PCF8523_REG_DAYS 0x06
#define REG_WEEKDAYS 0x07 #define PCF8523_REG_WEEKDAYS 0x07
#define REG_MONTHS 0x08 #define PCF8523_REG_MONTHS 0x08
#define REG_YEARS 0x09 #define PCF8523_REG_YEARS 0x09
#define REG_MINUTE_ALARM 0x0a #define PCF8523_REG_MINUTE_ALARM 0x0a
#define REG_HOUR_ALARM 0x0b #define PCF8523_REG_HOUR_ALARM 0x0b
#define REG_DAY_ALARM 0x0c #define PCF8523_REG_DAY_ALARM 0x0c
#define REG_WEEKDAY_ALARM 0x0d #define PCF8523_REG_WEEKDAY_ALARM 0x0d
#define ALARM_DIS BIT(7) #define ALARM_DIS BIT(7)
#define REG_OFFSET 0x0e #define PCF8523_REG_OFFSET 0x0e
#define REG_OFFSET_MODE BIT(7) #define PCF8523_OFFSET_MODE BIT(7)
#define REG_TMR_CLKOUT_CTRL 0x0f #define PCF8523_TMR_CLKOUT_CTRL 0x0f
struct pcf8523 { struct pcf8523 {
struct rtc_device *rtc; struct rtc_device *rtc;
...@@ -99,11 +99,11 @@ static int pcf8523_voltage_low(struct i2c_client *client) ...@@ -99,11 +99,11 @@ static int pcf8523_voltage_low(struct i2c_client *client)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL3, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL3, &value);
if (err < 0) if (err < 0)
return err; return err;
return !!(value & REG_CONTROL3_BLF); return !!(value & PCF8523_CONTROL3_BLF);
} }
static int pcf8523_load_capacitance(struct i2c_client *client) static int pcf8523_load_capacitance(struct i2c_client *client)
...@@ -112,7 +112,7 @@ static int pcf8523_load_capacitance(struct i2c_client *client) ...@@ -112,7 +112,7 @@ static int pcf8523_load_capacitance(struct i2c_client *client)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL1, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL1, &value);
if (err < 0) if (err < 0)
return err; return err;
...@@ -126,14 +126,14 @@ static int pcf8523_load_capacitance(struct i2c_client *client) ...@@ -126,14 +126,14 @@ static int pcf8523_load_capacitance(struct i2c_client *client)
load); load);
fallthrough; fallthrough;
case 12500: case 12500:
value |= REG_CONTROL1_CAP_SEL; value |= PCF8523_CONTROL1_CAP_SEL;
break; break;
case 7000: case 7000:
value &= ~REG_CONTROL1_CAP_SEL; value &= ~PCF8523_CONTROL1_CAP_SEL;
break; break;
} }
err = pcf8523_write(client, REG_CONTROL1, value); err = pcf8523_write(client, PCF8523_REG_CONTROL1, value);
return err; return err;
} }
...@@ -143,13 +143,13 @@ static int pcf8523_set_pm(struct i2c_client *client, u8 pm) ...@@ -143,13 +143,13 @@ static int pcf8523_set_pm(struct i2c_client *client, u8 pm)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL3, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL3, &value);
if (err < 0) if (err < 0)
return err; return err;
value = (value & ~REG_CONTROL3_PM_MASK) | pm; value = (value & ~PCF8523_CONTROL3_PM_MASK) | pm;
err = pcf8523_write(client, REG_CONTROL3, value); err = pcf8523_write(client, PCF8523_REG_CONTROL3, value);
if (err < 0) if (err < 0)
return err; return err;
...@@ -162,13 +162,13 @@ static irqreturn_t pcf8523_irq(int irq, void *dev_id) ...@@ -162,13 +162,13 @@ static irqreturn_t pcf8523_irq(int irq, void *dev_id)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(pcf8523->client, REG_CONTROL2, &value); err = pcf8523_read(pcf8523->client, PCF8523_REG_CONTROL2, &value);
if (err < 0) if (err < 0)
return IRQ_HANDLED; return IRQ_HANDLED;
if (value & REG_CONTROL2_AF) { if (value & PCF8523_CONTROL2_AF) {
value &= ~REG_CONTROL2_AF; value &= ~PCF8523_CONTROL2_AF;
pcf8523_write(pcf8523->client, REG_CONTROL2, value); pcf8523_write(pcf8523->client, PCF8523_REG_CONTROL2, value);
rtc_update_irq(pcf8523->rtc, 1, RTC_IRQF | RTC_AF); rtc_update_irq(pcf8523->rtc, 1, RTC_IRQF | RTC_AF);
return IRQ_HANDLED; return IRQ_HANDLED;
...@@ -182,13 +182,13 @@ static int pcf8523_stop_rtc(struct i2c_client *client) ...@@ -182,13 +182,13 @@ static int pcf8523_stop_rtc(struct i2c_client *client)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL1, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL1, &value);
if (err < 0) if (err < 0)
return err; return err;
value |= REG_CONTROL1_STOP; value |= PCF8523_CONTROL1_STOP;
err = pcf8523_write(client, REG_CONTROL1, value); err = pcf8523_write(client, PCF8523_REG_CONTROL1, value);
if (err < 0) if (err < 0)
return err; return err;
...@@ -200,13 +200,13 @@ static int pcf8523_start_rtc(struct i2c_client *client) ...@@ -200,13 +200,13 @@ static int pcf8523_start_rtc(struct i2c_client *client)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL1, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL1, &value);
if (err < 0) if (err < 0)
return err; return err;
value &= ~REG_CONTROL1_STOP; value &= ~PCF8523_CONTROL1_STOP;
err = pcf8523_write(client, REG_CONTROL1, value); err = pcf8523_write(client, PCF8523_REG_CONTROL1, value);
if (err < 0) if (err < 0)
return err; return err;
...@@ -216,7 +216,7 @@ static int pcf8523_start_rtc(struct i2c_client *client) ...@@ -216,7 +216,7 @@ static int pcf8523_start_rtc(struct i2c_client *client)
static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm) static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
u8 start = REG_SECONDS, regs[7]; u8 start = PCF8523_REG_SECONDS, regs[7];
struct i2c_msg msgs[2]; struct i2c_msg msgs[2];
int err; int err;
...@@ -242,7 +242,7 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm) ...@@ -242,7 +242,7 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
if (err < 0) if (err < 0)
return err; return err;
if (regs[0] & REG_SECONDS_OS) if (regs[0] & PCF8523_SECONDS_OS)
return -EINVAL; return -EINVAL;
tm->tm_sec = bcd2bin(regs[0] & 0x7f); tm->tm_sec = bcd2bin(regs[0] & 0x7f);
...@@ -267,8 +267,8 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -267,8 +267,8 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm)
if (err < 0) if (err < 0)
return err; return err;
regs[0] = REG_SECONDS; regs[0] = PCF8523_REG_SECONDS;
/* This will purposely overwrite REG_SECONDS_OS */ /* This will purposely overwrite PCF8523_SECONDS_OS */
regs[1] = bin2bcd(tm->tm_sec); regs[1] = bin2bcd(tm->tm_sec);
regs[2] = bin2bcd(tm->tm_min); regs[2] = bin2bcd(tm->tm_min);
regs[3] = bin2bcd(tm->tm_hour); regs[3] = bin2bcd(tm->tm_hour);
...@@ -299,7 +299,7 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -299,7 +299,7 @@ static int pcf8523_rtc_set_time(struct device *dev, struct rtc_time *tm)
static int pcf8523_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *tm) static int pcf8523_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *tm)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
u8 start = REG_MINUTE_ALARM, regs[4]; u8 start = PCF8523_REG_MINUTE_ALARM, regs[4];
struct i2c_msg msgs[2]; struct i2c_msg msgs[2];
u8 value; u8 value;
int err; int err;
...@@ -324,15 +324,15 @@ static int pcf8523_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *tm) ...@@ -324,15 +324,15 @@ static int pcf8523_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *tm)
tm->time.tm_mday = bcd2bin(regs[2] & 0x3F); tm->time.tm_mday = bcd2bin(regs[2] & 0x3F);
tm->time.tm_wday = bcd2bin(regs[3] & 0x7); tm->time.tm_wday = bcd2bin(regs[3] & 0x7);
err = pcf8523_read(client, REG_CONTROL1, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL1, &value);
if (err < 0) if (err < 0)
return err; return err;
tm->enabled = !!(value & REG_CONTROL1_AIE); tm->enabled = !!(value & PCF8523_CONTROL1_AIE);
err = pcf8523_read(client, REG_CONTROL2, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL2, &value);
if (err < 0) if (err < 0)
return err; return err;
tm->pending = !!(value & REG_CONTROL2_AF); tm->pending = !!(value & PCF8523_CONTROL2_AF);
return 0; return 0;
} }
...@@ -343,16 +343,16 @@ static int pcf8523_irq_enable(struct device *dev, unsigned int enabled) ...@@ -343,16 +343,16 @@ static int pcf8523_irq_enable(struct device *dev, unsigned int enabled)
u8 value; u8 value;
int err; int err;
err = pcf8523_read(client, REG_CONTROL1, &value); err = pcf8523_read(client, PCF8523_REG_CONTROL1, &value);
if (err < 0) if (err < 0)
return err; return err;
value &= REG_CONTROL1_AIE; value &= PCF8523_CONTROL1_AIE;
if (enabled) if (enabled)
value |= REG_CONTROL1_AIE; value |= PCF8523_CONTROL1_AIE;
err = pcf8523_write(client, REG_CONTROL1, value); err = pcf8523_write(client, PCF8523_REG_CONTROL1, value);
if (err < 0) if (err < 0)
return err; return err;
...@@ -370,7 +370,7 @@ static int pcf8523_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm) ...@@ -370,7 +370,7 @@ static int pcf8523_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm)
if (err) if (err)
return err; return err;
err = pcf8523_write(client, REG_CONTROL2, 0); err = pcf8523_write(client, PCF8523_REG_CONTROL2, 0);
if (err < 0) if (err < 0)
return err; return err;
...@@ -382,7 +382,7 @@ static int pcf8523_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm) ...@@ -382,7 +382,7 @@ static int pcf8523_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm)
rtc_time64_to_tm(alarm_time, &tm->time); rtc_time64_to_tm(alarm_time, &tm->time);
} }
regs[0] = REG_MINUTE_ALARM; regs[0] = PCF8523_REG_MINUTE_ALARM;
regs[1] = bin2bcd(tm->time.tm_min); regs[1] = bin2bcd(tm->time.tm_min);
regs[2] = bin2bcd(tm->time.tm_hour); regs[2] = bin2bcd(tm->time.tm_hour);
regs[3] = bin2bcd(tm->time.tm_mday); regs[3] = bin2bcd(tm->time.tm_mday);
...@@ -418,11 +418,11 @@ static int pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd, ...@@ -418,11 +418,11 @@ static int pcf8523_rtc_ioctl(struct device *dev, unsigned int cmd,
if (ret) if (ret)
flags |= RTC_VL_BACKUP_LOW; flags |= RTC_VL_BACKUP_LOW;
ret = pcf8523_read(client, REG_SECONDS, &value); ret = pcf8523_read(client, PCF8523_REG_SECONDS, &value);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (value & REG_SECONDS_OS) if (value & PCF8523_SECONDS_OS)
flags |= RTC_VL_DATA_INVALID; flags |= RTC_VL_DATA_INVALID;
return put_user(flags, (unsigned int __user *)arg); return put_user(flags, (unsigned int __user *)arg);
...@@ -442,13 +442,13 @@ static int pcf8523_rtc_read_offset(struct device *dev, long *offset) ...@@ -442,13 +442,13 @@ static int pcf8523_rtc_read_offset(struct device *dev, long *offset)
u8 value; u8 value;
s8 val; s8 val;
err = pcf8523_read(client, REG_OFFSET, &value); err = pcf8523_read(client, PCF8523_REG_OFFSET, &value);
if (err < 0) if (err < 0)
return err; return err;
/* sign extend the 7-bit offset value */ /* sign extend the 7-bit offset value */
val = value << 1; val = value << 1;
*offset = (value & REG_OFFSET_MODE ? 4069 : 4340) * (val >> 1); *offset = (value & PCF8523_OFFSET_MODE ? 4069 : 4340) * (val >> 1);
return 0; return 0;
} }
...@@ -465,9 +465,9 @@ static int pcf8523_rtc_set_offset(struct device *dev, long offset) ...@@ -465,9 +465,9 @@ static int pcf8523_rtc_set_offset(struct device *dev, long offset)
if (abs(reg_m0 * 4340 - offset) < abs(reg_m1 * 4069 - offset)) if (abs(reg_m0 * 4340 - offset) < abs(reg_m1 * 4069 - offset))
value = reg_m0 & 0x7f; value = reg_m0 & 0x7f;
else else
value = (reg_m1 & 0x7f) | REG_OFFSET_MODE; value = (reg_m1 & 0x7f) | PCF8523_OFFSET_MODE;
return pcf8523_write(client, REG_OFFSET, value); return pcf8523_write(client, PCF8523_REG_OFFSET, value);
} }
static const struct rtc_class_ops pcf8523_rtc_ops = { static const struct rtc_class_ops pcf8523_rtc_ops = {
...@@ -519,7 +519,7 @@ static int pcf8523_probe(struct i2c_client *client, ...@@ -519,7 +519,7 @@ static int pcf8523_probe(struct i2c_client *client,
rtc->uie_unsupported = 1; rtc->uie_unsupported = 1;
if (client->irq > 0) { if (client->irq > 0) {
err = pcf8523_write(client, REG_TMR_CLKOUT_CTRL, 0x38); err = pcf8523_write(client, PCF8523_TMR_CLKOUT_CTRL, 0x38);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7