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

Commit c13c8100 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "Core:
   - Coding style and whitespace fixes (interface, Makefile and Kconfig)
   - New rtc_tm_sub() helper
   - New CONFIG_RTC_SYSTOHC_DEVICE option
   - Removed rtc_set_mmss()

  New drivers:
   - Mediatek MT6397
   - Cortina Gemini

  Drivers:
   - Year 2106 fixes for isl1208, pcf8563 and sunxi
   - update author email for at32ap700x and efi
   - ds1307: alarm fix
   - efi: use correct EFI 'epoch'
   - hym8563: make irq optional
   - imxdi: cleanups and better handling of the security/tamper monitoring
   - snvs: fix wakealarm
   - Compilation fixes or warning removal for gemini, mt6397, palmas, pfc8563
   - Trivial cleanups for ab8500, ds1216, ds1286, ds1672, ep93xx,
     hid-sensor-time, max6900, max8998, max77686, max77802, mc13xxx, mv,
     mxc, s3c, spear, v3020
   - Kconfig fixes for stmp3xxx and xgene"

* tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (48 commits)
  rtc: remove useless I2C dependencies
  rtc: whitespace fixes
  rtc: Properly sort Makefile
  MAINTAINERS: Add RTC subsystem repository
  rtc: pfc8563: fix uninitialized variable warning
  rtc: ds1307: Enable the mcp794xx alarm after programming time
  rtc: hym8563: make the irq optional
  rtc: gemini: fix cocci warnings
  rtc: mv: correct 24 hour error message
  rtc: mv: use BIT()
  rtc: efi: use correct EFI 'epoch'
  rtc: interface: Remove rtc_set_mmss()
  sparc: time: Replace update_persistent_clock() with CONFIG_RTC_SYSTOHC
  rtc: NTP: Add CONFIG_RTC_SYSTOHC_DEVICE for NTP synchronization
  rtc: sunxi: Replace deprecated rtc_tm_to_time()
  rtc: isl1208: Replace deprecated rtc_tm_to_time()
  rtc: Introduce rtc_tm_sub() helper function
  rtc: pcf8563: Replace deprecated rtc_time_to_tm() and rtc_tm_to_time()
  rtc: palmas: Initialise bb_charging flag before using it
  rtc: simplify use of devm_ioremap_resource
  ...
parents 24867481 3783055e

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ as well as a clock output of up to 32kHz. 
Required properties:

- compatible: should be: "haoyu,hym8563"

- reg: i2c address

- interrupts: rtc alarm/event interrupt

- #clock-cells: the value should be 0



Optional properties:

- clock-output-names: From common clock binding

- interrupts: rtc alarm/event interrupt



Example:

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://github.com/ulli-kroll/linux.git

S:	Maintained

F:	arch/arm/mach-gemini/

F:	drivers/rtc/rtc-gemini.c



ARM/CSR SIRFPRIMA2 MACHINE SUPPORT

M:	Barry Song <baohua@kernel.org>
@@ -1243,6 +1244,13 @@ W: http://www.digriz.org.uk/ts78xx/kernel 
S:	Maintained

F:	arch/arm/mach-orion5x/ts78xx-*



ARM/Mediatek RTC DRIVER

M:	Eddie Huang <eddie.huang@mediatek.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/rtc/rtc-mt6397.c



ARM/Mediatek SoC support

M:	Matthias Brugger <matthias.bgg@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -8380,6 +8388,7 @@ M: Alessandro Zummo <a.zummo@towertech.it> 
M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

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/rtc.txt

F:	drivers/rtc/

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config SPARC 
	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select RTC_CLASS

	select RTC_DRV_M48T59

	select RTC_SYSTOHC

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select HAVE_ARCH_JUMP_LABEL if SPARC64
@@ -35,7 +36,6 @@ config SPARC 
	select HAVE_BPF_JIT

	select HAVE_DEBUG_BUGVERBOSE

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CMOS_UPDATE

	select GENERIC_CLOCKEVENTS

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

arch/sparc/kernel/time_32.c

+0 −21
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/mm.h>

#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/rtc.h>

#include <linux/rtc/m48t59.h>

#include <linux/timex.h>

#include <linux/clocksource.h>
@@ -65,8 +64,6 @@ DEFINE_PER_CPU(struct clock_event_device, sparc32_clockevent); 
DEFINE_SPINLOCK(rtc_lock);

EXPORT_SYMBOL(rtc_lock);



static int set_rtc_mmss(unsigned long);



unsigned long profile_pc(struct pt_regs *regs)

{

	extern char __copy_user_begin[], __copy_user_end[];
@@ -87,11 +84,6 @@ EXPORT_SYMBOL(profile_pc); 


volatile u32 __iomem *master_l10_counter;



int update_persistent_clock(struct timespec now)

{

	return set_rtc_mmss(now.tv_sec);

}



irqreturn_t notrace timer_interrupt(int dummy, void *dev_id)

{

	if (timer_cs_enabled) {
@@ -362,16 +354,3 @@ void __init time_init(void) 
		sbus_time_init();

}



static int set_rtc_mmss(unsigned long secs)

{

	struct rtc_device *rtc = rtc_class_open("rtc0");

	int err = -1;



	if (rtc) {

		err = rtc_set_mmss(rtc, secs);

		rtc_class_close(rtc);

	}



	return err;

}

arch/sparc/kernel/time_64.c

+0 −14
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/cpufreq.h>

#include <linux/percpu.h>

#include <linux/miscdevice.h>

#include <linux/rtc.h>

#include <linux/rtc/m48t59.h>

#include <linux/kernel_stat.h>

#include <linux/clockchips.h>
@@ -394,19 +393,6 @@ static struct sparc64_tick_ops hbtick_operations __read_mostly = { 


static unsigned long timer_ticks_per_nsec_quotient __read_mostly;



int update_persistent_clock(struct timespec now)

{

	struct rtc_device *rtc = rtc_class_open("rtc0");

	int err = -1;



	if (rtc) {

		err = rtc_set_mmss(rtc, now.tv_sec);

		rtc_class_close(rtc);

	}



	return err;

}



unsigned long cmos_regs;

EXPORT_SYMBOL(cmos_regs);