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

Commit 561a8eb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC updates from Alexandre Belloni:
 "Subsystem:
   - remove .open() and .release() RTC ops
   - constify i2c_device_id

  New driver:
   - Realtek RTD1295
   - Android emulator (goldfish) RTC

  Drivers:
   - ds1307: Beginning of a huge cleanup
   - s35390a: handle invalid RTC time
   - sun6i: external oscillator gate support"

* tag 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (40 commits)
  rtc: ds1307: use octal permissions
  rtc: ds1307: fix braces
  rtc: ds1307: fix alignments and blank lines
  rtc: ds1307: use BIT
  rtc: ds1307: use u32
  rtc: ds1307: use sizeof
  rtc: ds1307: remove regs member
  rtc: Add Realtek RTD1295
  dt-bindings: rtc: Add Realtek RTD1295
  rtc: sun6i: Add support for the external oscillator gate
  rtc: goldfish: Add RTC driver for Android emulator
  dt-bindings: Add device tree binding for Goldfish RTC driver
  rtc: ds1307: add basic support for ds1341 chip
  rtc: ds1307: remove member nvram_offset from struct ds1307
  rtc: ds1307: factor out offset to struct chip_desc
  rtc: ds1307: factor out rtc_ops to struct chip_desc
  rtc: ds1307: factor out irq_handler to struct chip_desc
  rtc: ds1307: improve irq setup
  rtc: ds1307: constify struct chip_desc variables
  rtc: ds1307: improve trickle charger initialization
  ...
parents 2818d0d7 b4be271c

Documentation/devicetree/bindings/power/wakeup-source.txt

+4 −5
Original line number Original line Diff line number Diff line
@@ -20,13 +20,12 @@ List of legacy properties and respective binding document 
1. "enable-sdio-wakeup"		Documentation/devicetree/bindings/mmc/mmc.txt

1. "enable-sdio-wakeup"		Documentation/devicetree/bindings/mmc/mmc.txt

2. "gpio-key,wakeup"		Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt

2. "gpio-key,wakeup"		Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt

3. "has-tpo"			Documentation/devicetree/bindings/rtc/rtc-opal.txt

3. "has-tpo"			Documentation/devicetree/bindings/rtc/rtc-opal.txt

4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt

4. "linux,wakeup"		Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt

5. "linux,wakeup"		Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt

				Documentation/devicetree/bindings/mfd/tc3589x.txt

				Documentation/devicetree/bindings/mfd/tc3589x.txt

				Documentation/devicetree/bindings/input/ads7846.txt

				Documentation/devicetree/bindings/input/ads7846.txt

6. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt

5. "linux,keypad-wakeup"	Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt

7. "linux,input-wakeup"		Documentation/devicetree/bindings/input/samsung-keypad.txt

6. "linux,input-wakeup"		Documentation/devicetree/bindings/input/samsung-keypad.txt

8. "nvidia,wakeup-source"	Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt

7. "nvidia,wakeup-source"	Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt





Examples

Examples

--------

--------

Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
Android Goldfish RTC



Android Goldfish RTC device used by Android emulator.



Required properties:



- compatible : should contain "google,goldfish-rtc"

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish_timer@9020000 {

		compatible = "google,goldfish-rtc";

		reg = <0x9020000 0x1000>;

		interrupts = <0x3>;

	};

Documentation/devicetree/bindings/rtc/isil,isl12057.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ Optional properties: 




 - "wakeup-source": mark the chip as a wakeup source, independently of

 - "wakeup-source": mark the chip as a wakeup source, independently of

    the availability of an IRQ line connected to the SoC.

    the availability of an IRQ line connected to the SoC.

    (Legacy property supported: "isil,irq2-can-wakeup-machine")





 - "interrupt-parent", "interrupts": for passing the interrupt line

 - "interrupt-parent", "interrupts": for passing the interrupt line

   of the SoC connected to IRQ#2 of the RTC chip.

   of the SoC connected to IRQ#2 of the RTC chip.

Documentation/devicetree/bindings/rtc/realtek,rtd119x.txt

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
Realtek RTD129x Real-Time Clock

===============================



Required properties:

- compatible :  Should be "realtek,rtd1295-rtc"

- reg        :  Specifies the physical base address and size

- clocks     :  Specifies the clock gate





Example:



	rtc@9801b600 {

		compatible = "realtek,rtd1295-clk";

		reg = <0x9801b600 0x100>;

		clocks = <&clkc RTD1295_CLK_EN_MISC_RTC>;

	};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 




Required properties for new device trees

Required properties for new device trees

- clocks	: phandle to the 32kHz external oscillator

- clocks	: phandle to the 32kHz external oscillator

- clock-output-names : name of the LOSC clock created

- clock-output-names : names of the LOSC and its external output clocks created

- #clock-cells  : must be equals to 1. The RTC provides two clocks: the

- #clock-cells  : must be equals to 1. The RTC provides two clocks: the

		  LOSC and its external output, with index 0 and 1

		  LOSC and its external output, with index 0 and 1

		  respectively.

		  respectively.
@@ -21,7 +21,7 @@ rtc: rtc@01f00000 { 
	compatible = "allwinner,sun6i-a31-rtc";

	compatible = "allwinner,sun6i-a31-rtc";

	reg = <0x01f00000 0x54>;

	reg = <0x01f00000 0x54>;

	interrupts = <0 40 4>, <0 41 4>;

	interrupts = <0 40 4>, <0 41 4>;

	clock-output-names = "osc32k";

	clock-output-names = "osc32k", "osc32k-out";

	clocks = <&ext_osc32k>;

	clocks = <&ext_osc32k>;

	#clock-cells = <1>;

	#clock-cells = <1>;

};
 
};