Commit 63d222b9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'rtc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

Pull RTC updates from Alexandre Belloni:
 "Subsystem wide cleanups:
   - Use IS_ENABLED() instead of checking for built-in or module
   - remove useless DRV_VERSION
   - remove CLK_IS_ROOT
   - remove UIE signaling

  Drivers:
   - ds1302: rewritten to be a proper SPI device driver
   - m41t80: huge cleanup, alarm, wakelarm ans oscialltor failure
     detection support
   - rv3029: switch to regmap to handle rv3049, alarm support, fixes
   - zynqmp: enable switching to battery power, fixes
   - small fixes for at91sam9, da9053, ds1307, ds1685, ds3232, r2025,
     sa1100, snvs, stmp3xxx, tps6586x"

* tag 'rtc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (40 commits)
  rtc: tps6586x: rename so module can be autoloaded
  rtc: rv3029: hide unused i2c device table
  rtc: rs5c372: r2025: fix check for 'oscillator halted' condition
  rtc: rv3029: add alarm IRQ
  rtc: rv3029: fix set_time function
  rtc: rv3029: fix alarm support
  rtc: rv3029: Remove some checks and warnings
  rtc: rv3029: Add support of RV3049
  rtc: rv3029: convert to use regmap
  rtc: rv3029: remove 'i2c' in functions names
  rtc: stmp3xxx: print message on error
  rtc: Use IS_ENABLED() instead of checking for built-in or module
  rtc: ds3232: fix call trace when rtc->ops_lock is used as NULL
  rtc: snvs: return error in case enable_irq_wake fails
  rtc: zynqmp: Update seconds time programming logic
  rtc: sa1100: DT spelling s/interrupt-name/interrupt-names/
  rtc: mc13xxx: remove UIE signaling
  rtc: mxc: remove UIE signaling
  rtc: ds1307: Remove CLK_IS_ROOT
  rtc: hym8563: Remove CLK_IS_ROOT
  ...
parents 10cd7158 b9ba1eb0
* Maxim/Dallas Semiconductor DS-1302 RTC
Simple device which could be used to store date/time between reboots.
The device uses the standard MicroWire half-duplex transfer timing.
Master output is set on low clock and sensed by the RTC on the rising
edge. Master input is set by the RTC on the trailing edge and is sensed
by the master on low clock.
Required properties:
- compatible : Should be "maxim,ds1302"
Required SPI properties:
- reg : Should be address of the device chip select within
the controller.
- spi-max-frequency : DS-1302 has 500 kHz if powered at 2.2V,
and 2MHz if powered at 5V.
- spi-3wire : The device has a shared signal IN/OUT line.
- spi-lsb-first : DS-1302 requires least significant bit first
transfers.
- spi-cs-high: DS-1302 has active high chip select line. This is
required unless inverted in hardware.
Example:
spi@901c {
#address-cells = <1>;
#size-cells = <0>;
compatible = "icpdas,lp8841-spi-rtc";
reg = <0x901c 0x1>;
rtc@0 {
compatible = "maxim,ds1302";
reg = <0>;
spi-max-frequency = <500000>;
spi-3wire;
spi-lsb-first;
spi-cs-high;
};
};
...@@ -13,5 +13,5 @@ Example: ...@@ -13,5 +13,5 @@ Example:
compatible = "mrvl,mmp-rtc"; compatible = "mrvl,mmp-rtc";
reg = <0xd4010000 0x1000>; reg = <0xd4010000 0x1000>;
interrupts = <5>, <6>; interrupts = <5>, <6>;
interrupt-name = "rtc 1Hz", "rtc alarm"; interrupt-names = "rtc 1Hz", "rtc alarm";
}; };
...@@ -573,24 +573,6 @@ config RTC_DRV_EM3027 ...@@ -573,24 +573,6 @@ config RTC_DRV_EM3027
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called rtc-em3027. will be called rtc-em3027.
config RTC_DRV_RV3029C2
tristate "Micro Crystal RV3029"
help
If you say yes here you get support for the Micro Crystal
RV3029 RTC chips.
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
config RTC_DRV_RV3029_HWMON
bool "HWMON support for RV3029"
depends on RTC_DRV_RV3029C2 && HWMON
depends on !(RTC_DRV_RV3029C2=y && HWMON=m)
default y
help
Say Y here if you want to expose temperature sensor data on
rtc-rv3029.
config RTC_DRV_RV8803 config RTC_DRV_RV8803
tristate "Micro Crystal RV8803" tristate "Micro Crystal RV8803"
help help
...@@ -634,6 +616,15 @@ config RTC_DRV_M41T94 ...@@ -634,6 +616,15 @@ config RTC_DRV_M41T94
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called rtc-m41t94. will be called rtc-m41t94.
config RTC_DRV_DS1302
tristate "Dallas/Maxim DS1302"
depends on SPI
help
If you say yes here you get support for the Dallas DS1302 RTC chips.
This driver can also be built as a module. If so, the module
will be called rtc-ds1302.
config RTC_DRV_DS1305 config RTC_DRV_DS1305
tristate "Dallas/Maxim DS1305/DS1306" tristate "Dallas/Maxim DS1305/DS1306"
help help
...@@ -777,6 +768,25 @@ config RTC_DRV_PCF2127 ...@@ -777,6 +768,25 @@ config RTC_DRV_PCF2127
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called rtc-pcf2127. will be called rtc-pcf2127.
config RTC_DRV_RV3029C2
tristate "Micro Crystal RV3029/3049"
depends on RTC_I2C_AND_SPI
help
If you say yes here you get support for the Micro Crystal
RV3029 and RV3049 RTC chips.
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
config RTC_DRV_RV3029_HWMON
bool "HWMON support for RV3029/3049"
depends on RTC_DRV_RV3029C2 && HWMON
depends on !(RTC_DRV_RV3029C2=y && HWMON=m)
default y
help
Say Y here if you want to expose temperature sensor data on
rtc-rv3029.
comment "Platform RTC drivers" comment "Platform RTC drivers"
# this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h> # this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
...@@ -834,12 +844,6 @@ config RTC_DRV_DS1286 ...@@ -834,12 +844,6 @@ config RTC_DRV_DS1286
help help
If you say yes here you get support for the Dallas DS1286 RTC chips. If you say yes here you get support for the Dallas DS1286 RTC chips.
config RTC_DRV_DS1302
tristate "Dallas DS1302"
depends on SH_SECUREEDGE5410
help
If you say yes here you get support for the Dallas DS1302 RTC chips.
config RTC_DRV_DS1511 config RTC_DRV_DS1511
tristate "Dallas DS1511" tristate "Dallas DS1511"
depends on HAS_IOMEM depends on HAS_IOMEM
......
...@@ -268,7 +268,7 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) ...@@ -268,7 +268,7 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
static int at91_rtc_proc(struct device *dev, struct seq_file *seq) static int at91_rtc_proc(struct device *dev, struct seq_file *seq)
{ {
struct sam9_rtc *rtc = dev_get_drvdata(dev); struct sam9_rtc *rtc = dev_get_drvdata(dev);
u32 mr = mr = rtt_readl(rtc, MR); u32 mr = rtt_readl(rtc, MR);
seq_printf(seq, "update_IRQ\t: %s\n", seq_printf(seq, "update_IRQ\t: %s\n",
(mr & AT91_RTT_RTTINCIEN) ? "yes" : "no"); (mr & AT91_RTT_RTTINCIEN) ? "yes" : "no");
......
...@@ -401,7 +401,7 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled) ...@@ -401,7 +401,7 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
return 0; return 0;
} }
#if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_PROC)
static int cmos_procfs(struct device *dev, struct seq_file *seq) static int cmos_procfs(struct device *dev, struct seq_file *seq)
{ {
......
...@@ -302,6 +302,13 @@ static int da9052_rtc_probe(struct platform_device *pdev) ...@@ -302,6 +302,13 @@ static int da9052_rtc_probe(struct platform_device *pdev)
if (ret != 0) if (ret != 0)
rtc_err(rtc, "Failed to disable TICKS: %d\n", ret); rtc_err(rtc, "Failed to disable TICKS: %d\n", ret);
device_init_wakeup(&pdev->dev, true);
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&da9052_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc))
return PTR_ERR(rtc->rtc);
ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM", ret = da9052_request_irq(rtc->da9052, DA9052_IRQ_ALARM, "ALM",
da9052_rtc_irq, rtc); da9052_rtc_irq, rtc);
if (ret != 0) { if (ret != 0) {
...@@ -309,11 +316,7 @@ static int da9052_rtc_probe(struct platform_device *pdev) ...@@ -309,11 +316,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
device_init_wakeup(&pdev->dev, true); return 0;
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&da9052_rtc_ops, THIS_MODULE);
return PTR_ERR_OR_ZERO(rtc->rtc);
} }
static struct platform_driver da9052_rtc_driver = { static struct platform_driver da9052_rtc_driver = {
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/slab.h> #include <linux/slab.h>
#define DRV_VERSION "0.2"
struct ds1216_regs { struct ds1216_regs {
u8 tsec; u8 tsec;
u8 sec; u8 sec;
...@@ -176,5 +174,4 @@ module_platform_driver_probe(ds1216_rtc_platform_driver, ds1216_rtc_probe); ...@@ -176,5 +174,4 @@ module_platform_driver_probe(ds1216_rtc_platform_driver, ds1216_rtc_probe);
MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>"); MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
MODULE_DESCRIPTION("DS1216 RTC driver"); MODULE_DESCRIPTION("DS1216 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-ds1216"); MODULE_ALIAS("platform:rtc-ds1216");
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/slab.h> #include <linux/slab.h>
#define DRV_VERSION "1.0"
struct ds1286_priv { struct ds1286_priv {
struct rtc_device *rtc; struct rtc_device *rtc;
u32 __iomem *rtcregs; u32 __iomem *rtcregs;
...@@ -363,5 +361,4 @@ module_platform_driver(ds1286_platform_driver); ...@@ -363,5 +361,4 @@ module_platform_driver(ds1286_platform_driver);
MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>"); MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
MODULE_DESCRIPTION("DS1286 RTC driver"); MODULE_DESCRIPTION("DS1286 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-ds1286"); MODULE_ALIAS("platform:rtc-ds1286");
This diff is collapsed.
...@@ -275,9 +275,13 @@ static s32 ds1307_native_smbus_write_block_data(const struct i2c_client *client, ...@@ -275,9 +275,13 @@ static s32 ds1307_native_smbus_write_block_data(const struct i2c_client *client,
{ {
u8 suboffset = 0; u8 suboffset = 0;
if (length <= I2C_SMBUS_BLOCK_MAX) if (length <= I2C_SMBUS_BLOCK_MAX) {
return i2c_smbus_write_i2c_block_data(client, s32 retval = i2c_smbus_write_i2c_block_data(client,
command, length, values); command, length, values);
if (retval < 0)
return retval;
return length;
}
while (suboffset < length) { while (suboffset < length) {
s32 retval = i2c_smbus_write_i2c_block_data(client, s32 retval = i2c_smbus_write_i2c_block_data(client,
...@@ -538,12 +542,8 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -538,12 +542,8 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
buf[5] = 0; buf[5] = 0;
buf[6] = 0; buf[6] = 0;
/* optionally enable ALARM1 */ /* disable alarms */
buf[7] = control & ~(DS1337_BIT_A1IE | DS1337_BIT_A2IE); buf[7] = control & ~(DS1337_BIT_A1IE | DS1337_BIT_A2IE);
if (t->enabled) {
dev_dbg(dev, "alarm IRQ armed\n");
buf[7] |= DS1337_BIT_A1IE; /* only ALARM1 is used */
}
buf[8] = status & ~(DS1337_BIT_A1I | DS1337_BIT_A2I); buf[8] = status & ~(DS1337_BIT_A1I | DS1337_BIT_A2I);
ret = ds1307->write_block_data(client, ret = ds1307->write_block_data(client,
...@@ -553,6 +553,13 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -553,6 +553,13 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
return ret; return ret;
} }
/* optionally enable ALARM1 */
if (t->enabled) {
dev_dbg(dev, "alarm IRQ armed\n");
buf[7] |= DS1337_BIT_A1IE; /* only ALARM1 is used */
i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL, buf[7]);
}
return 0; return 0;
} }
...@@ -1144,12 +1151,10 @@ static struct clk_init_data ds3231_clks_init[] = { ...@@ -1144,12 +1151,10 @@ static struct clk_init_data ds3231_clks_init[] = {
[DS3231_CLK_SQW] = { [DS3231_CLK_SQW] = {
.name = "ds3231_clk_sqw", .name = "ds3231_clk_sqw",
.ops = &ds3231_clk_sqw_ops, .ops = &ds3231_clk_sqw_ops,
.flags = CLK_IS_ROOT,
}, },
[DS3231_CLK_32KHZ] = { [DS3231_CLK_32KHZ] = {
.name = "ds3231_clk_32khz", .name = "ds3231_clk_32khz",
.ops = &ds3231_clk_32khz_ops, .ops = &ds3231_clk_32khz_ops,
.flags = CLK_IS_ROOT,
}, },
}; };
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <linux/pm_wakeirq.h> #include <linux/pm_wakeirq.h>
#include <linux/slab.h> #include <linux/slab.h>
#define DS1343_DRV_VERSION "01.00"
#define DALLAS_MAXIM_DS1343 0 #define DALLAS_MAXIM_DS1343 0
#define DALLAS_MAXIM_DS1344 1 #define DALLAS_MAXIM_DS1344 1
...@@ -747,4 +746,3 @@ MODULE_DESCRIPTION("DS1343 RTC SPI Driver"); ...@@ -747,4 +746,3 @@ MODULE_DESCRIPTION("DS1343 RTC SPI Driver");
MODULE_AUTHOR("Raghavendra Chandra Ganiga <ravi23ganiga@gmail.com>," MODULE_AUTHOR("Raghavendra Chandra Ganiga <ravi23ganiga@gmail.com>,"
"Ankur Srivastava <sankurece@gmail.com>"); "Ankur Srivastava <sankurece@gmail.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_VERSION(DS1343_DRV_VERSION);
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.6"
enum ds1511reg { enum ds1511reg {
DS1511_SEC = 0x0, DS1511_SEC = 0x0,
DS1511_MIN = 0x1, DS1511_MIN = 0x1,
...@@ -537,4 +535,3 @@ module_platform_driver(ds1511_rtc_driver); ...@@ -537,4 +535,3 @@ module_platform_driver(ds1511_rtc_driver);
MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>"); MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>");
MODULE_DESCRIPTION("Dallas DS1511 RTC driver"); MODULE_DESCRIPTION("Dallas DS1511 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.3"
#define RTC_REG_SIZE 0x2000 #define RTC_REG_SIZE 0x2000
#define RTC_OFFSET 0x1ff0 #define RTC_OFFSET 0x1ff0
...@@ -359,4 +357,3 @@ module_platform_driver(ds1553_rtc_driver); ...@@ -359,4 +357,3 @@ module_platform_driver(ds1553_rtc_driver);
MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
MODULE_DESCRIPTION("Dallas DS1553 RTC driver"); MODULE_DESCRIPTION("Dallas DS1553 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.4"
/* Registers */ /* Registers */
#define DS1672_REG_CNT_BASE 0 #define DS1672_REG_CNT_BASE 0
...@@ -165,8 +163,6 @@ static int ds1672_probe(struct i2c_client *client, ...@@ -165,8 +163,6 @@ static int ds1672_probe(struct i2c_client *client,
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
return -ENODEV; return -ENODEV;
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
rtc = devm_rtc_device_register(&client->dev, ds1672_driver.driver.name, rtc = devm_rtc_device_register(&client->dev, ds1672_driver.driver.name,
&ds1672_rtc_ops, THIS_MODULE); &ds1672_rtc_ops, THIS_MODULE);
...@@ -213,4 +209,3 @@ module_i2c_driver(ds1672_driver); ...@@ -213,4 +209,3 @@ module_i2c_driver(ds1672_driver);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("Dallas/Maxim DS1672 timekeeper driver"); MODULE_DESCRIPTION("Dallas/Maxim DS1672 timekeeper driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#endif #endif
#define DRV_VERSION "0.42.0"
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* Standard read/write functions if platform does not provide overrides */ /* Standard read/write functions if platform does not provide overrides */
...@@ -2213,6 +2211,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev) ...@@ -2213,6 +2211,7 @@ ds1685_rtc_poweroff(struct platform_device *pdev)
(ctrl4a | RTC_CTRL_4A_PAB)); (ctrl4a | RTC_CTRL_4A_PAB));
/* Spin ... we do not switch back to bank0. */ /* Spin ... we do not switch back to bank0. */
while(1);
unreachable(); unreachable();
} }
} }
...@@ -2224,5 +2223,4 @@ MODULE_AUTHOR("Joshua Kinard <kumba@gentoo.org>"); ...@@ -2224,5 +2223,4 @@ MODULE_AUTHOR("Joshua Kinard <kumba@gentoo.org>");
MODULE_AUTHOR("Matthias Fuchs <matthias.fuchs@esd-electronics.com>"); MODULE_AUTHOR("Matthias Fuchs <matthias.fuchs@esd-electronics.com>");
MODULE_DESCRIPTION("Dallas/Maxim DS1685/DS1687-series RTC driver"); MODULE_DESCRIPTION("Dallas/Maxim DS1685/DS1687-series RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-ds1685"); MODULE_ALIAS("platform:rtc-ds1685");
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.4"
#define RTC_SIZE 8 #define RTC_SIZE 8
#define RTC_CONTROL 0 #define RTC_CONTROL 0
...@@ -239,5 +237,4 @@ module_platform_driver(ds1742_rtc_driver); ...@@ -239,5 +237,4 @@ module_platform_driver(ds1742_rtc_driver);
MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
MODULE_DESCRIPTION("Dallas DS1742 RTC driver"); MODULE_DESCRIPTION("Dallas DS1742 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-ds1742"); MODULE_ALIAS("platform:rtc-ds1742");
...@@ -369,6 +369,11 @@ static int ds3232_probe(struct device *dev, struct regmap *regmap, int irq, ...@@ -369,6 +369,11 @@ static int ds3232_probe(struct device *dev, struct regmap *regmap, int irq,
if (ret) if (ret)
return ret; return ret;
ds3232->rtc = devm_rtc_device_register(dev, name, &ds3232_rtc_ops,
THIS_MODULE);
if (IS_ERR(ds3232->rtc))
return PTR_ERR(ds3232->rtc);
if (ds3232->irq > 0) { if (ds3232->irq > 0) {
ret = devm_request_threaded_irq(dev, ds3232->irq, NULL, ret = devm_request_threaded_irq(dev, ds3232->irq, NULL,
ds3232_irq, ds3232_irq,
...@@ -380,10 +385,8 @@ static int ds3232_probe(struct device *dev, struct regmap *regmap, int irq, ...@@ -380,10 +385,8 @@ static int ds3232_probe(struct device *dev, struct regmap *regmap, int irq,
} else } else
device_init_wakeup(dev, 1); device_init_wakeup(dev, 1);
} }
ds3232->rtc = devm_rtc_device_register(dev, name, &ds3232_rtc_ops,
THIS_MODULE);
return PTR_ERR_OR_ZERO(ds3232->rtc); return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
......
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#define EP93XX_RTC_SWCOMP_INT_MASK 0x0000ffff #define EP93XX_RTC_SWCOMP_INT_MASK 0x0000ffff
#define EP93XX_RTC_SWCOMP_INT_SHIFT 0 #define EP93XX_RTC_SWCOMP_INT_SHIFT 0
#define DRV_VERSION "0.3"
/* /*
* struct device dev.platform_data is used to store our private data * struct device dev.platform_data is used to store our private data
* because struct rtc_device does not have a variable to hold it. * because struct rtc_device does not have a variable to hold it.
...@@ -184,5 +182,4 @@ module_platform_driver(ep93xx_rtc_driver); ...@@ -184,5 +182,4 @@ module_platform_driver(ep93xx_rtc_driver);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("EP93XX RTC driver"); MODULE_DESCRIPTION("EP93XX RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:ep93xx-rtc"); MODULE_ALIAS("platform:ep93xx-rtc");
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/module.h> #include <linux/module.h>
#define DRV_NAME "rtc-gemini" #define DRV_NAME "rtc-gemini"
#define DRV_VERSION "0.2"
MODULE_AUTHOR("Hans Ulli Kroll <ulli.kroll@googlemail.com>"); MODULE_AUTHOR("Hans Ulli Kroll <ulli.kroll@googlemail.com>");
MODULE_DESCRIPTION("RTC driver for Gemini SoC"); MODULE_DESCRIPTION("RTC driver for Gemini SoC");
......
...@@ -413,7 +413,7 @@ static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563) ...@@ -413,7 +413,7 @@ static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563)
init.name = "hym8563-clkout"; init.name = "hym8563-clkout";
init.ops = &hym8563_clkout_ops; init.ops = &hym8563_clkout_ops;
init.flags = CLK_IS_ROOT; init.flags = 0;
init.parent_names = NULL; init.parent_names = NULL;
init.num_parents = 0; init.num_parents = 0;
hym8563->clkout_hw.init = &init; hym8563->clkout_hw.init = &init;
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#define DRV_VERSION "0.1"
/* ISL register offsets */ /* ISL register offsets */
#define ISL12022_REG_SC 0x00 #define ISL12022_REG_SC 0x00
#define ISL12022_REG_MN 0x01 #define ISL12022_REG_MN 0x01
...@@ -258,8 +256,6 @@ static int isl12022_probe(struct i2c_client *client, ...@@ -258,8 +256,6 @@ static int isl12022_probe(struct i2c_client *client,
if (!isl12022) if (!isl12022)
return -ENOMEM; return -ENOMEM;
dev_dbg(&client->dev, "chip found, driver version " DRV_VERSION "\n");
i2c_set_clientdata(client, isl12022); i2c_set_clientdata(client, isl12022);
isl12022->rtc = devm_rtc_device_register(&client->dev, isl12022->rtc = devm_rtc_device_register(&client->dev,
...@@ -299,4 +295,3 @@ module_i2c_driver(isl12022_driver); ...@@ -299,4 +295,3 @@ module_i2c_driver(isl12022_driver);
MODULE_AUTHOR("roman.fietze@telemotive.de"); MODULE_AUTHOR("roman.fietze@telemotive.de");
MODULE_DESCRIPTION("ISL 12022 RTC driver"); MODULE_DESCRIPTION("ISL 12022 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#define DRV_VERSION "0.3"
/* Register map */ /* Register map */
/* rtc section */ /* rtc section */
#define ISL1208_REG_SC 0x00 #define ISL1208_REG_SC 0x00
...@@ -632,9 +630,6 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -632,9 +630,6 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (isl1208_i2c_validate_client(client) < 0) if (isl1208_i2c_validate_client(client) < 0)
return -ENODEV; return -ENODEV;
dev_info(&client->dev,
"chip found, driver version " DRV_VERSION "\n");
if (client->irq > 0) { if (client->irq > 0) {
rc = devm_request_threaded_irq(&client->dev, client->irq, NULL, rc = devm_request_threaded_irq(&client->dev, client->irq, NULL,
isl1208_rtc_interrupt, isl1208_rtc_interrupt,
...@@ -706,4 +701,3 @@ module_i2c_driver(isl1208_driver); ...@@ -706,4 +701,3 @@ module_i2c_driver(isl1208_driver);
MODULE_AUTHOR("Herbert Valerio Riedel <hvr@gnu.org>"); MODULE_AUTHOR("Herbert Valerio Riedel <hvr@gnu.org>");
MODULE_DESCRIPTION("Intersil ISL1208 RTC driver"); MODULE_DESCRIPTION("Intersil ISL1208 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
This diff is collapsed.
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/err.h> #include <linux/err.h>
#define DRV_VERSION "1.0"
struct m48t35_rtc { struct m48t35_rtc {
u8 pad[0x7ff8]; /* starts at 0x7ff8 */ u8 pad[0x7ff8]; /* starts at 0x7ff8 */
u8 control; u8 control;
...@@ -190,5 +188,4 @@ module_platform_driver(m48t35_platform_driver); ...@@ -190,5 +188,4 @@ module_platform_driver(m48t35_platform_driver);
MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>"); MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
MODULE_DESCRIPTION("M48T35 RTC driver"); MODULE_DESCRIPTION("M48T35 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-m48t35"); MODULE_ALIAS("platform:rtc-m48t35");
...@@ -39,9 +39,6 @@ ...@@ -39,9 +39,6 @@
#define M48T86_REG_B_SET (1 << 7) #define M48T86_REG_B_SET (1 << 7)
#define M48T86_REG_D_VRT (1 << 7) #define M48T86_REG_D_VRT (1 << 7)
#define DRV_VERSION "0.1"
static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm) static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
unsigned char reg; unsigned char reg;
...@@ -178,5 +175,4 @@ module_platform_driver(m48t86_rtc_platform_driver); ...@@ -178,5 +175,4 @@ module_platform_driver(m48t86_rtc_platform_driver);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("M48T86 RTC driver"); MODULE_DESCRIPTION("M48T86 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-m48t86"); MODULE_ALIAS("platform:rtc-m48t86");
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/delay.h> #include <linux/delay.h>
#define DRV_VERSION "0.2"
/* /*
* register indices * register indices
*/ */
...@@ -218,8 +216,6 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -218,8 +216,6 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
return -ENODEV; return -ENODEV;
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
rtc = devm_rtc_device_register(&client->dev, max6900_driver.driver.name, rtc = devm_rtc_device_register(&client->dev, max6900_driver.driver.name,
&max6900_rtc_ops, THIS_MODULE); &max6900_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
...@@ -249,4 +245,3 @@ module_i2c_driver(max6900_driver); ...@@ -249,4 +245,3 @@ module_i2c_driver(max6900_driver);
MODULE_DESCRIPTION("Maxim MAX6900 RTC driver"); MODULE_DESCRIPTION("Maxim MAX6900 RTC driver");
MODULE_AUTHOR("Dale Farnsworth <dale@farnsworth.org>"); MODULE_AUTHOR("Dale Farnsworth <dale@farnsworth.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -250,18 +250,6 @@ static irqreturn_t mc13xxx_rtc_alarm_handler(int irq, void *dev) ...@@ -250,18 +250,6 @@ static irqreturn_t mc13xxx_rtc_alarm_handler(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t mc13xxx_rtc_update_handler(int irq, void *dev)
{
struct mc13xxx_rtc *priv = dev;
struct mc13xxx *mc13xxx = priv->mc13xxx;
rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
mc13xxx_irq_ack(mc13xxx, irq);
return IRQ_HANDLED;
}
static const struct rtc_class_ops mc13xxx_rtc_ops = { static const struct rtc_class_ops mc13xxx_rtc_ops = {
.read_time = mc13xxx_rtc_read_time, .read_time = mc13xxx_rtc_read_time,
.set_mmss64 = mc13xxx_rtc_set_mmss, .set_mmss64 = mc13xxx_rtc_set_mmss,
...@@ -307,11 +295,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) ...@@ -307,11 +295,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_irq_request; goto err_irq_request;
ret = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_1HZ,
mc13xxx_rtc_update_handler, DRIVER_NAME, priv);
if (ret)
goto err_irq_request;
ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_TODA, ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_TODA,
mc13xxx_rtc_alarm_handler, DRIVER_NAME, priv); mc13xxx_rtc_alarm_handler, DRIVER_NAME, priv);
if (ret) if (ret)
...@@ -326,7 +309,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) ...@@ -326,7 +309,6 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
err_irq_request: err_irq_request:
mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);
mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
mc13xxx_unlock(mc13xxx); mc13xxx_unlock(mc13xxx);
...@@ -341,7 +323,6 @@ static int mc13xxx_rtc_remove(struct platform_device *pdev) ...@@ -341,7 +323,6 @@ static int mc13xxx_rtc_remove(struct platform_device *pdev)
mc13xxx_lock(priv->mc13xxx); mc13xxx_lock(priv->mc13xxx);
mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv);
mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_1HZ, priv);
mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv);
mc13xxx_unlock(priv->mc13xxx); mc13xxx_unlock(priv->mc13xxx);
......
...@@ -266,7 +266,7 @@ static int mrst_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) ...@@ -266,7 +266,7 @@ static int mrst_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
} }
#if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_PROC)
static int mrst_procfs(struct device *dev, struct seq_file *seq) static int mrst_procfs(struct device *dev, struct seq_file *seq)
{ {
......
...@@ -240,9 +240,6 @@ static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id) ...@@ -240,9 +240,6 @@ static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id)
mxc_rtc_irq_enable(&pdev->dev, RTC_ALM_BIT, 0); mxc_rtc_irq_enable(&pdev->dev, RTC_ALM_BIT, 0);
} }
if (status & RTC_1HZ_BIT)
events |= (RTC_UF | RTC_IRQF);
if (status & PIT_ALL_ON) if (status & PIT_ALL_ON)
events |= (RTC_PF | RTC_IRQF); events |= (RTC_PF | RTC_IRQF);
......
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#define DRV_VERSION "0.6"
/* REGISTERS */ /* REGISTERS */
#define PCF2123_REG_CTRL1 (0x00) /* Control Register 1 */ #define PCF2123_REG_CTRL1 (0x00) /* Control Register 1 */
#define PCF2123_REG_CTRL2 (0x01) /* Control Register 2 */ #define PCF2123_REG_CTRL2 (0x01) /* Control Register 2 */
...@@ -395,7 +393,6 @@ static int pcf2123_probe(struct spi_device *spi) ...@@ -395,7 +393,6 @@ static int pcf2123_probe(struct spi_device *spi)
} }
} }
dev_info(&spi->dev, "chip found, driver version " DRV_VERSION "\n");
dev_info(&spi->dev, "spiclk %u KHz.\n", dev_info(&spi->dev, "spiclk %u KHz.\n",
(spi->max_speed_hz + 500) / 1000); (spi->max_speed_hz + 500) / 1000);
...@@ -474,4 +471,3 @@ module_spi_driver(pcf2123_driver); ...@@ -474,4 +471,3 @@ module_spi_driver(pcf2123_driver);
MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>"); MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>");
MODULE_DESCRIPTION("NXP PCF2123 RTC driver"); MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/err.h> #include <linux/err.h>
#define DRV_VERSION "0.4.4"
#define PCF8563_REG_ST1 0x00 /* status */ #define PCF8563_REG_ST1 0x00 /* status */
#define PCF8563_REG_ST2 0x01 #define PCF8563_REG_ST2 0x01
#define PCF8563_BIT_AIE (1 << 1) #define PCF8563_BIT_AIE (1 << 1)
...@@ -535,7 +533,7 @@ static struct clk *pcf8563_clkout_register_clk(struct pcf8563 *pcf8563) ...@@ -535,7 +533,7 @@ static struct clk *pcf8563_clkout_register_clk(struct pcf8563 *pcf8563)
init.name = "pcf8563-clkout"; init.name = "pcf8563-clkout";
init.ops = &pcf8563_clkout_ops; init.ops = &pcf8563_clkout_ops;
init.flags = CLK_IS_ROOT; init.flags = 0;
init.parent_names = NULL; init.parent_names = NULL;
init.num_parents = 0; init.num_parents = 0;
pcf8563->clkout_hw.init = &init; pcf8563->clkout_hw.init = &init;
...@@ -580,8 +578,6 @@ static int pcf8563_probe(struct i2c_client *client, ...@@ -580,8 +578,6 @@ static int pcf8563_probe(struct i2c_client *client,
if (!pcf8563) if (!pcf8563)
return -ENOMEM; return -ENOMEM;
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
i2c_set_clientdata(client, pcf8563); i2c_set_clientdata(client, pcf8563);
pcf8563->client = client; pcf8563->client = client;
device_set_wakeup_capable(&client->dev, 1); device_set_wakeup_capable(&client->dev, 1);
...@@ -662,4 +658,3 @@ module_i2c_driver(pcf8563_driver); ...@@ -662,4 +658,3 @@ module_i2c_driver(pcf8563_driver);
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("Philips PCF8563/Epson RTC8564 RTC driver"); MODULE_DESCRIPTION("Philips PCF8563/Epson RTC8564 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <linux/io.h> #include <linux/io.h>
#define DRV_NAME "rs5c313" #define DRV_NAME "rs5c313"
#define DRV_VERSION "1.13"
#ifdef CONFIG_SH_LANDISK #ifdef CONFIG_SH_LANDISK
/*****************************************************/ /*****************************************************/
...@@ -407,7 +406,6 @@ static void __exit rs5c313_rtc_exit(void) ...@@ -407,7 +406,6 @@ static void __exit rs5c313_rtc_exit(void)
module_init(rs5c313_rtc_init); module_init(rs5c313_rtc_init);
module_exit(rs5c313_rtc_exit); module_exit(rs5c313_rtc_exit);
MODULE_VERSION(DRV_VERSION);
MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>"); MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>");
MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver"); MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.2"
#define RS5C348_REG_SECS 0 #define RS5C348_REG_SECS 0
#define RS5C348_REG_MINS 1 #define RS5C348_REG_MINS 1
#define RS5C348_REG_HOURS 2 #define RS5C348_REG_HOURS 2
...@@ -171,7 +169,6 @@ static int rs5c348_probe(struct spi_device *spi) ...@@ -171,7 +169,6 @@ static int rs5c348_probe(struct spi_device *spi)
goto kfree_exit; goto kfree_exit;
} }
dev_info(&spi->dev, "chip found, driver version " DRV_VERSION "\n");
dev_info(&spi->dev, "spiclk %u KHz.\n", dev_info(&spi->dev, "spiclk %u KHz.\n",
(spi->max_speed_hz + 500) / 1000); (spi->max_speed_hz + 500) / 1000);
...@@ -230,5 +227,4 @@ module_spi_driver(rs5c348_driver); ...@@ -230,5 +227,4 @@ module_spi_driver(rs5c348_driver);
MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>"); MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver"); MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("spi:rtc-rs5c348"); MODULE_ALIAS("spi:rtc-rs5c348");
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.6"
/* /*
* Ricoh has a family of I2C based RTCs, which differ only slightly from * Ricoh has a family of I2C based RTCs, which differ only slightly from
* each other. Differences center on pinout (e.g. how many interrupts, * each other. Differences center on pinout (e.g. how many interrupts,
...@@ -240,11 +237,11 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm) ...@@ -240,11 +237,11 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
return 0; return 0;
} }
#if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_PROC)
#define NEED_TRIM #define NEED_TRIM
#endif #endif
#if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_SYSFS)
#define NEED_TRIM #define NEED_TRIM
#endif #endif
...@@ -412,7 +409,7 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -412,7 +409,7 @@ static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t)
return 0; return 0;
} }
#if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_PROC)
static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq) static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
{ {
...@@ -441,7 +438,7 @@ static const struct rtc_class_ops rs5c372_rtc_ops = { ...@@ -441,7 +438,7 @@ static const struct rtc_class_ops rs5c372_rtc_ops = {
.alarm_irq_enable = rs5c_rtc_alarm_irq_enable, .alarm_irq_enable = rs5c_rtc_alarm_irq_enable,
}; };
#if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE) #if IS_ENABLED(CONFIG_RTC_INTF_SYSFS)
static ssize_t rs5c372_sysfs_show_trim(struct device *dev, static ssize_t rs5c372_sysfs_show_trim(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
...@@ -509,9 +506,9 @@ static int rs5c_oscillator_setup(struct rs5c372 *rs5c372) ...@@ -509,9 +506,9 @@ static int rs5c_oscillator_setup(struct rs5c372 *rs5c372)
int addr, i, ret = 0; int addr, i, ret = 0;
if (rs5c372->type == rtc_r2025sd) { if (rs5c372->type == rtc_r2025sd) {
if (!(rs5c372->regs[RS5C_REG_CTRL2] & R2025_CTRL2_XST)) if (rs5c372->regs[RS5C_REG_CTRL2] & R2025_CTRL2_XST)
return ret; return ret;
rs5c372->regs[RS5C_REG_CTRL2] &= ~R2025_CTRL2_XST; rs5c372->regs[RS5C_REG_CTRL2] |= R2025_CTRL2_XST;
} else { } else {
if (!(rs5c372->regs[RS5C_REG_CTRL2] & RS5C_CTRL2_XSTP)) if (!(rs5c372->regs[RS5C_REG_CTRL2] & RS5C_CTRL2_XSTP))
return ret; return ret;
...@@ -640,7 +637,7 @@ static int rs5c372_probe(struct i2c_client *client, ...@@ -640,7 +637,7 @@ static int rs5c372_probe(struct i2c_client *client,
if (rs5c372_get_datetime(client, &tm) < 0) if (rs5c372_get_datetime(client, &tm) < 0)
dev_warn(&client->dev, "clock needs to be set\n"); dev_warn(&client->dev, "clock needs to be set\n");
dev_info(&client->dev, "%s found, %s, driver version " DRV_VERSION "\n", dev_info(&client->dev, "%s found, %s\n",
({ char *s; switch (rs5c372->type) { ({ char *s; switch (rs5c372->type) {
case rtc_r2025sd: s = "r2025sd"; break; case rtc_r2025sd: s = "r2025sd"; break;
case rtc_r2221tl: s = "r2221tl"; break; case rtc_r2221tl: s = "r2221tl"; break;
...@@ -696,4 +693,3 @@ MODULE_AUTHOR( ...@@ -696,4 +693,3 @@ MODULE_AUTHOR(
"Paul Mundt <lethal@linux-sh.org>"); "Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("Ricoh RS5C372 RTC driver"); MODULE_DESCRIPTION("Ricoh RS5C372 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
This diff is collapsed.
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/log2.h> #include <linux/log2.h>
#define DRV_VERSION "0.1"
#define RX8581_REG_SC 0x00 /* Second in BCD */ #define RX8581_REG_SC 0x00 /* Second in BCD */
#define RX8581_REG_MN 0x01 /* Minute in BCD */ #define RX8581_REG_MN 0x01 /* Minute in BCD */
#define RX8581_REG_HR 0x02 /* Hour in BCD */ #define RX8581_REG_HR 0x02 /* Hour in BCD */
...@@ -292,8 +290,6 @@ static int rx8581_probe(struct i2c_client *client, ...@@ -292,8 +290,6 @@ static int rx8581_probe(struct i2c_client *client,
rx8581->write_block_data = rx8581_write_block_data; rx8581->write_block_data = rx8581_write_block_data;
} }
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
rx8581->rtc = devm_rtc_device_register(&client->dev, rx8581->rtc = devm_rtc_device_register(&client->dev,
rx8581_driver.driver.name, &rx8581_rtc_ops, THIS_MODULE); rx8581_driver.driver.name, &rx8581_rtc_ops, THIS_MODULE);
...@@ -325,4 +321,3 @@ module_i2c_driver(rx8581_driver); ...@@ -325,4 +321,3 @@ module_i2c_driver(rx8581_driver);
MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>"); MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
MODULE_DESCRIPTION("Epson RX-8581 RTC driver"); MODULE_DESCRIPTION("Epson RX-8581 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <asm/rtc.h> #include <asm/rtc.h>
#define DRV_NAME "sh-rtc" #define DRV_NAME "sh-rtc"
#define DRV_VERSION "0.2.3"
#define RTC_REG(r) ((r) * rtc_reg_size) #define RTC_REG(r) ((r) * rtc_reg_size)
...@@ -790,7 +789,6 @@ static struct platform_driver sh_rtc_platform_driver = { ...@@ -790,7 +789,6 @@ static struct platform_driver sh_rtc_platform_driver = {
module_platform_driver_probe(sh_rtc_platform_driver, sh_rtc_probe); module_platform_driver_probe(sh_rtc_platform_driver, sh_rtc_probe);
MODULE_DESCRIPTION("SuperH on-chip RTC driver"); MODULE_DESCRIPTION("SuperH on-chip RTC driver");
MODULE_VERSION(DRV_VERSION);
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, " MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, "
"Jamie Lenehan <lenehan@twibble.org>, " "Jamie Lenehan <lenehan@twibble.org>, "
"Angelo Castello <angelo.castello@st.com>"); "Angelo Castello <angelo.castello@st.com>");
......
...@@ -322,7 +322,7 @@ static int snvs_rtc_suspend(struct device *dev) ...@@ -322,7 +322,7 @@ static int snvs_rtc_suspend(struct device *dev)
struct snvs_rtc_data *data = dev_get_drvdata(dev); struct snvs_rtc_data *data = dev_get_drvdata(dev);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
enable_irq_wake(data->irq); return enable_irq_wake(data->irq);
return 0; return 0;
} }
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#define DRV_VERSION "0.1"
#define RTC_REG_SIZE 0x20000 #define RTC_REG_SIZE 0x20000
#define RTC_OFFSET 0x1fff0 #define RTC_OFFSET 0x1fff0
...@@ -366,4 +364,3 @@ module_platform_driver(stk17ta8_rtc_driver); ...@@ -366,4 +364,3 @@ module_platform_driver(stk17ta8_rtc_driver);
MODULE_AUTHOR("Thomas Hommel <thomas.hommel@ge.com>"); MODULE_AUTHOR("Thomas Hommel <thomas.hommel@ge.com>");
MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver"); MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -107,14 +107,19 @@ static struct stmp3xxx_wdt_pdata wdt_pdata = { ...@@ -107,14 +107,19 @@ static struct stmp3xxx_wdt_pdata wdt_pdata = {
static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev) static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
{ {
int rc = -1;
struct platform_device *wdt_pdev = struct platform_device *wdt_pdev =
platform_device_alloc("stmp3xxx_rtc_wdt", rtc_pdev->id); platform_device_alloc("stmp3xxx_rtc_wdt", rtc_pdev->id);
if (wdt_pdev) { if (wdt_pdev) {
wdt_pdev->dev.parent = &rtc_pdev->dev; wdt_pdev->dev.parent = &rtc_pdev->dev;
wdt_pdev->dev.platform_data = &wdt_pdata; wdt_pdev->dev.platform_data = &wdt_pdata;
platform_device_add(wdt_pdev); rc = platform_device_add(wdt_pdev);
} }
if (rc)
dev_err(&rtc_pdev->dev,
"failed to register stmp3xxx_rtc_wdt\n");
} }
#else #else
static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev) static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
......
...@@ -344,7 +344,7 @@ static struct platform_driver tps6586x_rtc_driver = { ...@@ -344,7 +344,7 @@ static struct platform_driver tps6586x_rtc_driver = {
}; };
module_platform_driver(tps6586x_rtc_driver); module_platform_driver(tps6586x_rtc_driver);
MODULE_ALIAS("platform:rtc-tps6586x"); MODULE_ALIAS("platform:tps6586x-rtc");
MODULE_DESCRIPTION("TI TPS6586x RTC driver"); MODULE_DESCRIPTION("TI TPS6586x RTC driver");
MODULE_AUTHOR("Laxman dewangan <ldewangan@nvidia.com>"); MODULE_AUTHOR("Laxman dewangan <ldewangan@nvidia.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#define DRV_VERSION "1.0.8"
/* offsets into CCR area */ /* offsets into CCR area */
#define CCR_SEC 0 #define CCR_SEC 0
...@@ -634,8 +632,6 @@ static int x1205_probe(struct i2c_client *client, ...@@ -634,8 +632,6 @@ static int x1205_probe(struct i2c_client *client,
if (x1205_validate_client(client) < 0) if (x1205_validate_client(client) < 0)
return -ENODEV; return -ENODEV;
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
rtc = devm_rtc_device_register(&client->dev, x1205_driver.driver.name, rtc = devm_rtc_device_register(&client->dev, x1205_driver.driver.name,
&x1205_rtc_ops, THIS_MODULE); &x1205_rtc_ops, THIS_MODULE);
...@@ -693,4 +689,3 @@ MODULE_AUTHOR( ...@@ -693,4 +689,3 @@ MODULE_AUTHOR(
"Alessandro Zummo <a.zummo@towertech.it>"); "Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver"); MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#define RTC_INT_SEC BIT(0) #define RTC_INT_SEC BIT(0)
#define RTC_INT_ALRM BIT(1) #define RTC_INT_ALRM BIT(1)
#define RTC_OSC_EN BIT(24) #define RTC_OSC_EN BIT(24)
#define RTC_BATT_EN BIT(31)
#define RTC_CALIB_DEF 0x198233 #define RTC_CALIB_DEF 0x198233
#define RTC_CALIB_MASK 0x1FFFFF #define RTC_CALIB_MASK 0x1FFFFF
...@@ -55,6 +56,7 @@ struct xlnx_rtc_dev { ...@@ -55,6 +56,7 @@ struct xlnx_rtc_dev {
void __iomem *reg_base; void __iomem *reg_base;
int alarm_irq; int alarm_irq;
int sec_irq; int sec_irq;
int calibval;
}; };
static int xlnx_rtc_set_time(struct device *dev, struct rtc_time *tm) static int xlnx_rtc_set_time(struct device *dev, struct rtc_time *tm)
...@@ -62,21 +64,63 @@ static int xlnx_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -62,21 +64,63 @@ static int xlnx_rtc_set_time(struct device *dev, struct rtc_time *tm)
struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev); struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev);
unsigned long new_time; unsigned long new_time;
new_time = rtc_tm_to_time64(tm); /*
* The value written will be updated after 1 sec into the
* seconds read register, so we need to program time +1 sec
* to get the correct time on read.
*/
new_time = rtc_tm_to_time64(tm) + 1;
if (new_time > RTC_SEC_MAX_VAL) if (new_time > RTC_SEC_MAX_VAL)
return -EINVAL; return -EINVAL;
/*
* Writing into calibration register will clear the Tick Counter and
* force the next second to be signaled exactly in 1 second period
*/
xrtcdev->calibval &= RTC_CALIB_MASK;
writel(xrtcdev->calibval, (xrtcdev->reg_base + RTC_CALIB_WR));
writel(new_time, xrtcdev->reg_base + RTC_SET_TM_WR); writel(new_time, xrtcdev->reg_base + RTC_SET_TM_WR);
/*
* Clear the rtc interrupt status register after setting the
* time. During a read_time function, the code should read the
* RTC_INT_STATUS register and if bit 0 is still 0, it means
* that one second has not elapsed yet since RTC was set and
* the current time should be read from SET_TIME_READ register;
* otherwise, CURRENT_TIME register is read to report the time
*/
writel(RTC_INT_SEC, xrtcdev->reg_base + RTC_INT_STS);
return 0; return 0;
} }
static int xlnx_rtc_read_time(struct device *dev, struct rtc_time *tm) static int xlnx_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
u32 status;
unsigned long read_time;
struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev); struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev);
status = readl(xrtcdev->reg_base + RTC_INT_STS);
if (status & RTC_INT_SEC) {
/*
* RTC has updated the CURRENT_TIME with the time written into
* SET_TIME_WRITE register.
*/
rtc_time64_to_tm(readl(xrtcdev->reg_base + RTC_CUR_TM), tm); rtc_time64_to_tm(readl(xrtcdev->reg_base + RTC_CUR_TM), tm);
} else {
/*
* Time written in SET_TIME_WRITE has not yet updated into
* the seconds read register, so read the time from the
* SET_TIME_WRITE instead of CURRENT_TIME register.
* Since we add +1 sec while writing, we need to -1 sec while
* reading.
*/
read_time = readl(xrtcdev->reg_base + RTC_SET_TM_RD) - 1;
rtc_time64_to_tm(read_time, tm);
}
return rtc_valid_tm(tm); return rtc_valid_tm(tm);
} }
...@@ -120,16 +164,23 @@ static int xlnx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) ...@@ -120,16 +164,23 @@ static int xlnx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
return 0; return 0;
} }
static void xlnx_init_rtc(struct xlnx_rtc_dev *xrtcdev, u32 calibval) static void xlnx_init_rtc(struct xlnx_rtc_dev *xrtcdev)
{ {
u32 rtc_ctrl;
/* Enable RTC switch to battery when VCC_PSAUX is not available */
rtc_ctrl = readl(xrtcdev->reg_base + RTC_CTRL);
rtc_ctrl |= RTC_BATT_EN;
writel(rtc_ctrl, xrtcdev->reg_base + RTC_CTRL);
/* /*
* Based on crystal freq of 33.330 KHz * Based on crystal freq of 33.330 KHz
* set the seconds counter and enable, set fractions counter * set the seconds counter and enable, set fractions counter
* to default value suggested as per design spec * to default value suggested as per design spec
* to correct RTC delay in frequency over period of time. * to correct RTC delay in frequency over period of time.
*/ */
calibval &= RTC_CALIB_MASK; xrtcdev->calibval &= RTC_CALIB_MASK;
writel(calibval, (xrtcdev->reg_base + RTC_CALIB_WR)); writel(xrtcdev->calibval, (xrtcdev->reg_base + RTC_CALIB_WR));
} }
static const struct rtc_class_ops xlnx_rtc_ops = { static const struct rtc_class_ops xlnx_rtc_ops = {
...@@ -150,11 +201,9 @@ static irqreturn_t xlnx_rtc_interrupt(int irq, void *id) ...@@ -150,11 +201,9 @@ static irqreturn_t xlnx_rtc_interrupt(int irq, void *id)
if (!(status & (RTC_INT_SEC | RTC_INT_ALRM))) if (!(status & (RTC_INT_SEC | RTC_INT_ALRM)))
return IRQ_NONE; return IRQ_NONE;
/* Clear interrupt */ /* Clear RTC_INT_ALRM interrupt only */
writel(status, xrtcdev->reg_base + RTC_INT_STS); writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_STS);
if (status & RTC_INT_SEC)
rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_UF);
if (status & RTC_INT_ALRM) if (status & RTC_INT_ALRM)
rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_AF); rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_AF);
...@@ -166,7 +215,6 @@ static int xlnx_rtc_probe(struct platform_device *pdev) ...@@ -166,7 +215,6 @@ static int xlnx_rtc_probe(struct platform_device *pdev)
struct xlnx_rtc_dev *xrtcdev; struct xlnx_rtc_dev *xrtcdev;
struct resource *res; struct resource *res;
int ret; int ret;
unsigned int calibvalue;
xrtcdev = devm_kzalloc(&pdev->dev, sizeof(*xrtcdev), GFP_KERNEL); xrtcdev = devm_kzalloc(&pdev->dev, sizeof(*xrtcdev), GFP_KERNEL);
if (!xrtcdev) if (!xrtcdev)
...@@ -207,11 +255,11 @@ static int xlnx_rtc_probe(struct platform_device *pdev) ...@@ -207,11 +255,11 @@ static int xlnx_rtc_probe(struct platform_device *pdev)
} }
ret = of_property_read_u32(pdev->dev.of_node, "calibration", ret = of_property_read_u32(pdev->dev.of_node, "calibration",
&calibvalue); &xrtcdev->calibval);
if (ret) if (ret)
calibvalue = RTC_CALIB_DEF; xrtcdev->calibval = RTC_CALIB_DEF;
xlnx_init_rtc(xrtcdev, calibvalue); xlnx_init_rtc(xrtcdev);
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
......
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