Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c84239d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents d4c06c70 6f367788

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -9828,10 +9828,14 @@ L: rtc-linux@googlegroups.com 
Q:	http://patchwork.ozlabs.org/project/rtc-linux/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git

S:	Maintained

F:	Documentation/devicetree/bindings/rtc/

F:	Documentation/rtc.txt

F:	drivers/rtc/

F:	include/linux/rtc.h

F:	include/uapi/linux/rtc.h

F:	include/linux/rtc/

F:	include/linux/platform_data/rtc-*

F:	tools/testing/selftests/timers/rtctest.c



REALTEK AUDIO CODECS

M:	Bard Liao <bardliao@realtek.com>

arch/alpha/include/asm/rtc.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/rtc.h>

arch/alpha/kernel/core_marvel.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/gct.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>

#include <asm/rtc.h>

#include <asm/vga.h>



#include "proto.h"

arch/alpha/kernel/rtc.c

+2 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/rtc.h>

#include <linux/platform_device.h>



#include <asm/rtc.h>



#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void) 
static int

alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	__get_rtc_time(tm);

	mc146818_get_time(tm);



	/* Adjust for non-default epochs.  It's easier to depend on the

	   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) 
		tm = &xtm;

	}



	return __set_rtc_time(tm);

	return mc146818_set_time(tm);

}



static int

arch/arm/mach-ep93xx/ts72xx.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/m48t86.h>

#include <linux/platform_data/rtc-m48t86.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>