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

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

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

Pull RTC updates from Alexandre Belloni:
  "Subsystem:
   - non-modular drivers are now explicitly non-modular

  New driver:
    - Epson Toyocom rtc-7301sf/dg

  Drivers:
   - cmos: reject unsupported alarm values wrt the RTC capabilities
   - ds1307: ACPI support
   - jz4740: DT support, jz4780 handling, can now be used as a system
     power controller
   - mcp795: many fixes, in particular proper month handling
   - twl: driver is now DT only"

* tag 'rtc-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (31 commits)
  rtc: mcp795: Fix whitespace and indentation.
  rtc: mcp795: Prefer using the BIT() macro.
  rtc: mcp795: fix month write resetting date to 1.
  rtc: mcp795: fix time range difference between linux and RTC chip.
  rtc: mcp795: fix bitmask value for leap year (LP).
  rtc: mcp795: use bcd2bin/bin2bcd.
  rtc: add support for EPSON TOYOCOM RTC-7301SF/DG
  rtc: ds1307: Add ACPI support
  rtc: imxdi: (trivial) fix a typo
  rtc: ds1374: Merge conditional + WARN_ON()
  rtc: twl: make driver DT only
  rtc: twl: kill static variables
  rtc: fix typos in Kconfig
  rtc: jz4740: make the driver builtin only
  rtc: jz4740: remove unused EXPORT_SYMBOL
  Documentation: bindings: fix twl-rtc documentation
  rtc: Enable compile testing for Maxim and Samsung drivers
  MIPS: jz4740: Remove obsolete code
  MIPS: qi_lb60: Probe RTC driver from DT and use it as power controller
  MIPS: jz4740: DTS: Probe the jz4740-rtc driver from devicetree
  ...
parents 3be134e5 d3e59259

Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration

+3 −2
Original line number Diff line number Diff line 
What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock

What:           /sys/class/rtc/rtc0/device/rtc_calibration

Date:           Oct 2011

KernelVersion:  3.0

Contact:        Mark Godfrey <mark.godfrey@stericsson.com>

Description:    The rtc_calibration attribute allows the userspace to

Description:    Attribute for calibrating ST-Ericsson AB8500 Real Time Clock

		The rtc_calibration attribute allows the userspace to

                calibrate the AB8500.s 32KHz Real Time Clock.

                Every 60 seconds the AB8500 will correct the RTC's value

                by adding to it the value of this attribute.

Documentation/devicetree/bindings/rtc/epson,rtc7301.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
EPSON TOYOCOM RTC-7301SF/DG



Required properties:



- compatible: Should be "epson,rtc7301sf" or "epson,rtc7301dg"

- reg: Specifies base physical address and size of the registers.

- interrupts: A single interrupt specifier.



Example:



rtc: rtc@44a00000 {

	compatible = "epson,rtc7301dg";

	reg = <0x44a00000 0x10000>;

	interrupt-parent = <&axi_intc_0>;

	interrupts = <3 2>;

};

Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
JZ4740 and similar SoCs real-time clock driver



Required properties:



- compatible: One of:

  - "ingenic,jz4740-rtc" - for use with the JZ4740 SoC

  - "ingenic,jz4780-rtc" - for use with the JZ4780 SoC

- reg: Address range of rtc register set

- interrupts: IRQ number for the alarm interrupt

- clocks: phandle to the "rtc" clock

- clock-names: must be "rtc"



Optional properties:

- system-power-controller: To use this component as the

  system power controller

- reset-pin-assert-time-ms: Reset pin low-level assertion

  time after wakeup (default 60ms; range 0-125ms if RTC clock

  at 32 kHz)

- min-wakeup-pin-assert-time-ms: Minimum wakeup pin assertion

  time (default 100ms; range 0-2s if RTC clock at 32 kHz)



Example:



rtc@10003000 {

	compatible = "ingenic,jz4740-rtc";

	reg = <0x10003000 0x40>;



	interrupt-parent = <&intc>;

	interrupts = <32>;



	clocks = <&rtc_clock>;

	clock-names = "rtc";



	system-power-controller;

	reset-pin-assert-time-ms = <60>;

	min-wakeup-pin-assert-time-ms = <100>;

};

Documentation/devicetree/bindings/rtc/twl-rtc.txt

+9 −10
Original line number Diff line number Diff line 
* TI twl RTC



The TWL family (twl4030/6030) contains a RTC.

* Texas Instruments TWL4030/6030 RTC



Required properties:

- compatible : Should be twl4030-rtc



Examples:

- compatible : Should be "ti,twl4030-rtc"

- interrupts : Should be the interrupt number.



rtc@0 {

Example:

	rtc {

		compatible = "ti,twl4030-rtc";

		interrupts = <11>;

	};

arch/mips/boot/dts/ingenic/jz4740.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -44,6 +44,17 @@ 
		#clock-cells = <1>;

	};



	rtc_dev: rtc@10003000 {

		compatible = "ingenic,jz4740-rtc";

		reg = <0x10003000 0x40>;



		interrupt-parent = <&intc>;

		interrupts = <15>;



		clocks = <&cgu JZ4740_CLK_RTC>;

		clock-names = "rtc";

	};



	uart0: serial@10030000 {

		compatible = "ingenic,jz4740-uart";

		reg = <0x10030000 0x100>;