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

Commit 5782fd14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "Subsystem:
   - constify rtc_class_ops structures

 New driver:
   - STM32

 Drivers:
   - armada38x: fix errata, Armada 7K/8K support
   - ds3232: fix wakeup support
   - gemini: DT support
   - m48t86: huge cleanup and platform_data removal
   - mcp795: alarm support
   - sun6i: proper oscillator handling
   - tegra: proper clock handling
   - tps65910: calibration support"

* tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (44 commits)
  rtc: ds3232: Call device_init_wakeup before device_register
  rtc: pcf2127: bulk read only date and time registers.
  rtc: armada38x: Add support for Armada 7K/8K
  rtc: armada38x: Prepare driver to manage different versions
  rtc: ds3232: Add regmap max_register definition.
  rtc: ds3232: Cleanup whitespace around register and bit definitions.
  rtc: m48t86: remove unused platform_data
  ARM: Orion5x: ts78xx: allow rtc-m48t86 to manage it's own resources
  ARM: Orion5x: ts78xx: remove RTC detection
  ARM: ep93xx: ts72xx: allow rtc-m48t86 to manage its own resources
  rtc: m48t86: verify that the RTC is actually present
  rtc: m48t86: add NVRAM support
  rtc: m48t86: allow driver to manage its resources
  rtc: m48t86: shorten register name defines
  bindings: rtc: correct wrong reference in required properties
  rtc: sun6i: Fix return value check in sun6i_rtc_clk_init()
  rtc: sun6i: extend test coverage
  rtc: sun6i: Fix compatibility with old DT binding
  rtc: snvs: add a missing write sync
  rtc: bq32000: add support to enable disable the trickle charge FET bypass
  ...
parents 45554b23 d4f6c6f1

Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/bus/i2c/devices/.../trickle_charge_bypass

Date:		Jan 2017

KernelVersion:	4.11

Contact:	Enric Balletbo i Serra <eballetbo@gmail.com>

Description:    Attribute for enable/disable the trickle charge bypass

		The trickle_charge_bypass attribute allows the userspace to

                enable/disable the Trickle charge FET bypass.

Documentation/devicetree/bindings/rtc/armada-380-rtc.txt

+5 −3
Original line number Diff line number Diff line 
* Real Time Clock of the Armada 38x SoCs

* Real Time Clock of the Armada 38x/7K/8K SoCs



RTC controller for the Armada 38x SoCs

RTC controller for the Armada 38x, 7K and 8K SoCs



Required properties:

- compatible : Should be "marvell,armada-380-rtc"

- compatible : Should be one of the following:

	"marvell,armada-380-rtc" for Armada 38x SoC

	"marvell,armada-8k-rtc" for Aramda 7K/8K SoCs

- reg: a list of base address and size pairs, one for each entry in

  reg-names

- reg names: should contain:

Documentation/devicetree/bindings/rtc/cortina,gemini.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* Cortina Systems Gemini RTC



Gemini SoC real-time clock.



Required properties:

- compatible : Should be "cortina,gemini-rtc"



Examples:



rtc@45000000 {

	compatible = "cortina,gemini-rtc";

	reg = <0x45000000 0x100>;

	interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;

};

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

+4 −1
Original line number Diff line number Diff line
@@ -8,10 +8,13 @@ Required properties: 
  region.

- interrupts: rtc alarm interrupt



Optional properties:

- interrupts: dryice security violation interrupt



Example:



rtc@80056000 {

	compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";

	reg = <0x80056000 2000>;

	interrupts = <29>;

	interrupts = <29 56>;

};

Documentation/devicetree/bindings/rtc/maxim,ds3231.txt

+2 −1
Original line number Diff line number Diff line 
* Maxim DS3231 Real Time Clock



Required properties:

see: Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst

- compatible: Should contain "maxim,ds3231".

- reg: I2C address for chip.



Optional property:

- #clock-cells: Should be 1.