Skip to content

Commit 6c84239

Browse files
torvaldstorvalds
committed
Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "RTC for 4.8 Cleanups: - huge cleanup of rtc-generic and char/genrtc this allowed to cleanup rtc-cmos, rtc-sh, rtc-m68k, rtc-powerpc and rtc-parisc - move mn10300 to rtc-cmos Subsystem: - fix wakealarms after hibernate - multiples fixes for rctest - simplify implementations of .read_alarm New drivers: - Maxim MAX6916 Drivers: - ds1307: fix weekday - m41t80: add wakeup support - pcf85063: add support for PCF85063A variant - rv8803: extend i2c fix and other fixes - s35390a: fix alarm reading, this fixes instant reboot after shutdown for QNAP TS-41x - s3c: clock fixes" * tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (65 commits) rtc: rv8803: Clear V1F when setting the time rtc: rv8803: Stop the clock while setting the time rtc: rv8803: Always apply the I²C workaround rtc: rv8803: Fix read day of week rtc: rv8803: Remove the check for valid time rtc: rv8803: Kconfig: Indicate rx8900 support rtc: asm9260: remove .owner field for driver rtc: at91sam9: Fix missing spin_lock_init() rtc: m41t80: add suspend handlers for alarm IRQ rtc: m41t80: make it a real error message rtc: pcf85063: Add support for the PCF85063A device rtc: pcf85063: fix year range rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy rtc: explicitly set tm_sec = 0 for drivers with minute accurancy rtc: s3c: Add s3c_rtc_{enable/disable}_clk in s3c_rtc_setfreq() rtc: s3c: Remove unnecessary call to disable already disabled clock rtc: abx80x: use devm_add_action_or_reset() rtc: m41t80: use devm_add_action_or_reset() rtc: fix a typo and reduce three empty lines to one rtc: s35390a: improve two comments in .set_alarm ...
2 parents d4c06c7 + 6f36778 commit 6c84239

File tree

105 files changed

+850
-1582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+850
-1582
lines changed

‎MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9828,10 +9828,14 @@ L: rtc-linux@googlegroups.com
98289828
Q: http://patchwork.ozlabs.org/project/rtc-linux/list/
98299829
T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
98309830
S: Maintained
9831+
F: Documentation/devicetree/bindings/rtc/
98319832
F: Documentation/rtc.txt
98329833
F: drivers/rtc/
98339834
F: include/linux/rtc.h
98349835
F: include/uapi/linux/rtc.h
9836+
F: include/linux/rtc/
9837+
F: include/linux/platform_data/rtc-*
9838+
F: tools/testing/selftests/timers/rtctest.c
98359839

98369840
REALTEK AUDIO CODECS
98379841
M: Bard Liao <bardliao@realtek.com>

‎arch/alpha/include/asm/rtc.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎arch/alpha/kernel/core_marvel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <asm/gct.h>
2525
#include <asm/pgalloc.h>
2626
#include <asm/tlbflush.h>
27-
#include <asm/rtc.h>
2827
#include <asm/vga.h>
2928

3029
#include "proto.h"

‎arch/alpha/kernel/rtc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include <linux/rtc.h>
1616
#include <linux/platform_device.h>
1717

18-
#include <asm/rtc.h>
19-
2018
#include "proto.h"
2119

2220

@@ -81,7 +79,7 @@ init_rtc_epoch(void)
8179
static int
8280
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
8381
{
84-
__get_rtc_time(tm);
82+
mc146818_get_time(tm);
8583

8684
/* Adjust for non-default epochs. It's easier to depend on the
8785
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
112110
tm = &xtm;
113111
}
114112

115-
return __set_rtc_time(tm);
113+
return mc146818_set_time(tm);
116114
}
117115

118116
static int

‎arch/arm/mach-ep93xx/ts72xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/init.h>
1717
#include <linux/platform_device.h>
1818
#include <linux/io.h>
19-
#include <linux/m48t86.h>
19+
#include <linux/platform_data/rtc-m48t86.h>
2020
#include <linux/mtd/nand.h>
2121
#include <linux/mtd/partitions.h>
2222

‎arch/arm/mach-orion5x/ts78xx-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/platform_device.h>
1717
#include <linux/mv643xx_eth.h>
1818
#include <linux/ata_platform.h>
19-
#include <linux/m48t86.h>
19+
#include <linux/platform_data/rtc-m48t86.h>
2020
#include <linux/mtd/nand.h>
2121
#include <linux/mtd/partitions.h>
2222
#include <linux/timeriomem-rng.h>

‎arch/arm/mach-pxa/cm-x270.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/gpio.h>
1515
#include <linux/delay.h>
1616

17-
#include <linux/rtc-v3020.h>
17+
#include <linux/platform_data/rtc-v3020.h>
1818
#include <video/mbxfb.h>
1919

2020
#include <linux/spi/spi.h>

‎arch/arm/mach-pxa/cm-x300.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/gpio.h>
2626
#include <linux/dm9000.h>
2727
#include <linux/leds.h>
28-
#include <linux/rtc-v3020.h>
28+
#include <linux/platform_data/rtc-v3020.h>
2929
#include <linux/pwm.h>
3030
#include <linux/pwm_backlight.h>
3131

‎arch/arm/mach-pxa/em-x270.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/delay.h>
1515

1616
#include <linux/dm9000.h>
17-
#include <linux/rtc-v3020.h>
17+
#include <linux/platform_data/rtc-v3020.h>
1818
#include <linux/mtd/nand.h>
1919
#include <linux/mtd/partitions.h>
2020
#include <linux/mtd/physmap.h>

‎arch/frv/include/asm/mc146818rtc.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)