Commit 8b70f716 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "RTC for 4.9

  Subsystem:
   - delete owner assignment in multiple drivers
   - constify rtc_class_ops structures

  Drivers:
   - ac100: support clock-output-names
   - cmos: properly handle ACPI alarms and quirky BIOSes and other fixes
   - ds1307: fix century bit support while staying comaptible with
     previous behaviour by default
   - ds1347: switch to regmap
   - isl12057 is now handled by ds1307
   - omap: support external wakeup
   - rv8803: allow to disable voltage drop detection"

* tag 'rtc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (25 commits)
  rtc: rv8803: set VDETOFF and SWOFF via device tree
  dt/bindings: Add bindings for Micro Crystal rv8803
  devicetree: Add Micro Crystal AG vendor id
  rtc: cmos: avoid unused function warning
  rtc: ac100: Add NULL checking for devm_kzalloc call
  rtc: ds1347: changed raw spi calls to register map calls
  rtc: cmos: Restore alarm after resume
  rtc: cmos: Clear ACPI-driven alarms upon resume
  rtc: omap: Support ext_wakeup configuration
  rtc: cmos: Initialize hpet timer before irq is registered
  rtc: asm9260: rework locking
  rtc: asm9260: allow COMPILE_TEST
  rtc: constify rtc_class_ops structures
  rtc: ac100: support clock-output-names in device tree binding
  rtc: rx6110: remove owner assignment
  rtc: pic32: Delete owner assignment
  rtc: bq32k: Fix handling of oscillator failure flag
  rtc: bq32k: Use correct mask name for 'minutes' register.
  rtc: sysfs: fix a cast removing the const attribute
  Documentation: dt: Intersil isl12057 is not a trivial device
  ...
parents e5050143 1cd71376

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

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ fsl,sgtl5000 SGTL5000: Ultra Low-Power Audio Codec 
gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface

infineon,slb9635tt	Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)

infineon,slb9645tt	Infineon SLB9645 I2C TPM (new protocol, max 400khz)

isil,isl12057		Intersil ISL12057 I2C RTC Chip

isil,isl29028		Intersil ISL29028 Ambient Light and Proximity Sensor

maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator

maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Optional properties: 
- 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 {

	ds1390: rtc@0 {

		compatible = "dallas,ds1390";

		trickle-resistor-ohms = <250>;

		reg = <0>;

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Real Time Clock driver for:

  - Epson RX8900

  - Micro Crystal rv8803



Required properties:

- compatible: should be: "microcrystal,rv8803" or "epson,rx8900"

- reg : the I2C address of the device for I2C



Optional properties:

- epson,vdet-disable : boolean, if present will disable voltage detector.

  Should be set if no backup battery is used.

- trickle-diode-disable : boolean, if present will disable internal trickle

  charger diode



Example:



	rtc: rtc@32 {

		compatible = "epson,rx8900"

		reg = <0x32>;

		epson,vdet-disable;

		trickle-diode-disable;

	};

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

+21 −0
Original line number Diff line number Diff line
@@ -18,6 +18,18 @@ Optional properties: 
  through pmic_power_en

- clocks: Any internal or external clocks feeding in to rtc

- clock-names: Corresponding names of the clocks

- pinctrl-0: a phandle pointing to the pin settings for the device

- pinctrl-names: should be "default"



Optional subnodes:

- generic pinctrl node



Required pinctrl subnodes properties:

- pins - Names of ext_wakeup pins to configure



Optional pinctrl subnodes properties:

- input-enable - Enables ext_wakeup

- ti,active-high - Set input active high (by default active low)



Example:
@@ -30,4 +42,13 @@ rtc@1c23000 { 
	system-power-controller;

	clocks = <&clk_32k_rtc>, <&clk_32768_ck>;

	clock-names = "ext-clk", "int-clk";



	pinctrl-0 = <&ext_wakeup>;

	pinctrl-names = "default";



	ext_wakeup: ext-wakeup {

		pins = "ext_wakeup0";

		input-enable;

		ti,active-high;

	};

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ melexis Melexis N.V. 
merrii	Merrii Technology Co., Ltd.

micrel	Micrel Inc.

microchip	Microchip Technology Inc.

microcrystal	Micro Crystal AG

micron	Micron Technology Inc.

minix	MINIX Technology Ltd.

mitsubishi	Mitsubishi Electric Corporation

CRA Git | Maintained and supported by SUSTech CRA and CCSE