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

Commit 7d884710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "Core:
   - Fix rtctest error path

  New drivers:
   - Microcrystal RV8803

  Subsystem wide cleanups:
   - remove misuse of IRQF_NO_SUSPEND flag

  Drivers:
   - at91rm9200: clear RTC alarm status flag prior to suspending
   - davinci: remove incorrect reference to probe function
   - ds1307: Fix alarm programming for mcp794xx
   - ds1390: trickle charger support, fix ds1390_get_reg
   - isl1208: Pass the IRQF_ONESHOT flag
   - opal: fix type of token
   - pcf2127: fix RTC_READ_VL, remove useless driver version
   - pcf85063: return an error when date is invalid
   - pcf8563: add CLKOUT to common clock framework
   - rx8025: remove unnecessary braces
   - s3c: Set year, month, day value for setting alarm
   - stmp3xxx: unify register access macros
   - License fixes: pcf2127, da9063
   - wakeup-source support for isl12057 and opal"

* tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (23 commits)
  rtc: Add a driver for Micro Crystal RV8803
  rtc: s3c: Set year, month, day value for setting alarm
  rtc: ds1307: Fix alarm programming for mcp794xx
  rtc: isl12057: enable support for the standard "wakeup-source" property
  rtc: opal: enable support for the stardard "wakeup-source" property
  rtc: isl1208: Pass the IRQF_ONESHOT flag
  rtc: pcf8563: add CLKOUT to common clock framework
  rtc: davinci: remove incorrect reference to probe function
  rtc: at91rm9200: clear RTC alarm status flag prior to suspending
  rtc: pcf2127: remove useless driver version
  rtc: pcf2127: fix reading uninitialized value on RTC_READ_VL ioctl
  rtc: stmp3xxx: unify register access macros
  rtc: da9063: GPL copyright inconsistency fix
  rtc: pcf85063: return an error when date is invalid
  rtc: rx8025: remove unnecessary braces
  rtc: ds1343: remove misuse of IRQF_NO_SUSPEND flag
  rtc: ab8500: remove misuse of IRQF_NO_SUSPEND flag
  rtc: pl031: remove misuse of IRQF_NO_SUSPEND flag
  rtc: opal: fix type of token
  rtc: ds1390: Add trickle charger device tree binding
  ...
parents 3b138668 1e3929ef

Documentation/devicetree/bindings/rtc/dallas,ds1390.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* Dallas DS1390		SPI Serial Real-Time Clock



Required properties:

- compatible: Should contain "dallas,ds1390".

- reg: SPI address for chip



Optional properties:

- trickle-resistor-ohms : Selected resistor for trickle charger

	Values usable for ds1390 are 250, 2000, 4000

	Should be given if trickle charger should be enabled

- trickle-diode-disable : Do not use internal trickle charger diode

	Should be given if internal trickle charger diode should be disabled

Example:

	ds1390: rtc@68 {

		compatible = "dallas,ds1390";

		trickle-resistor-ohms = <250>;

		reg = <0>;

	};

Documentation/devicetree/bindings/rtc/pcf8563.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Philips PCF8563/Epson RTC8564 Real Time Clock



Philips PCF8563/Epson RTC8564 Real Time Clock



Required properties:

see: Documentation/devicetree/bindings/i2c/trivial-devices.txt



Optional property:

- #clock-cells: Should be 0.

- clock-output-names:

  overwrite the default clock name "pcf8563-clkout"



Example:



pcf8563: pcf8563@51 {

	compatible = "nxp,pcf8563";

	reg = <0x51>;

	#clock-cells = <0>;

};



device {

...

	clocks = <&pcf8563>;

...

};

drivers/rtc/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -593,6 +593,15 @@ config RTC_DRV_RV3029C2 
	  This driver can also be built as a module. If so, the module

	  will be called rtc-rv3029c2.



config RTC_DRV_RV8803

	tristate "Micro Crystal RV8803"

	help

	  If you say yes here you get support for the Micro Crystal

	  RV8803 RTC chips.



	  This driver can also be built as a module. If so, the module

	  will be called rtc-rv8803.



config RTC_DRV_S5M

	tristate "Samsung S2M/S5M series"

	depends on MFD_SEC_CORE
@@ -666,8 +675,8 @@ config RTC_DRV_DS1390 
	  If you say yes here you get support for the

	  Dallas/Maxim DS1390/93/94 chips.



	  This driver only supports the RTC feature, and not other chip

	  features such as alarms and trickle charging.

	  This driver supports the RTC feature and trickle charging but not

	  other chip features such as alarms.



	  This driver can also be built as a module. If so, the module

	  will be called rtc-ds1390.

drivers/rtc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o 
obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o

obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o

obj-$(CONFIG_RTC_DRV_RV3029C2)	+= rtc-rv3029c2.o

obj-$(CONFIG_RTC_DRV_RV8803)	+= rtc-rv8803.o

obj-$(CONFIG_RTC_DRV_RX4581)	+= rtc-rx4581.o

obj-$(CONFIG_RTC_DRV_RX8025)	+= rtc-rx8025.o

obj-$(CONFIG_RTC_DRV_RX8581)	+= rtc-rx8581.o

drivers/rtc/rtc-ab8500.c

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/mfd/abx500/ab8500.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/pm_wakeirq.h>



#define AB8500_RTC_SOFF_STAT_REG	0x00

#define AB8500_RTC_CC_CONF_REG		0x01
@@ -493,11 +494,12 @@ static int ab8500_rtc_probe(struct platform_device *pdev) 
	}



	err = devm_request_threaded_irq(&pdev->dev, irq, NULL,

			rtc_alarm_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT,

			rtc_alarm_handler, IRQF_ONESHOT,

			"ab8500-rtc", rtc);

	if (err < 0)

		return err;



	dev_pm_set_wake_irq(&pdev->dev, irq);

	platform_set_drvdata(pdev, rtc);



	err = ab8500_sysfs_rtc_register(&pdev->dev);
@@ -513,6 +515,8 @@ static int ab8500_rtc_probe(struct platform_device *pdev) 


static int ab8500_rtc_remove(struct platform_device *pdev)

{

	dev_pm_clear_wake_irq(&pdev->dev);

	device_init_wakeup(&pdev->dev, false);

	ab8500_sysfs_rtc_unregister(&pdev->dev);



	return 0;