diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 22:49:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 22:49:08 -0700 |
commit | 8407ef4685895759f111190d091394ef974f52fb (patch) | |
tree | 7f654f935e405bf7eceab590cb1b718d395ee3f9 /Documentation | |
parent | b4ae78edf77f1751a2a0ae08a8398b35a763d6f6 (diff) | |
parent | ee087744247c421c83abea7f01217bfd39b8f5a9 (diff) | |
download | blackbird-obmc-linux-8407ef4685895759f111190d091394ef974f52fb.tar.gz blackbird-obmc-linux-8407ef4685895759f111190d091394ef974f52fb.zip |
Merge tag 'rtc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull more RTC updates from Alexandre Belloni:
"A second pull request for v4.6 with a few fixesi before -rc1. The new
features for abx80x actually make the RTC behave correctly.
Drivers:
- abx80x: handle both XT and RC oscillators, XT failure bit and
autocalibration
- m41t80: avoid out of range year values
- rv8803: workaround an i2c HW issue"
* tag 'rtc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: abx80x: handle the oscillator failure bit
rtc: abx80x: handle autocalibration
rtc: rv8803: workaround i2c HW issue
rtc: mcp795: add devicetree support
rtc: asm9260: remove incorrect __init/__exit annotations
rtc: m41t80: avoid out of range year values
rtc: s3c: Don't print an error on probe deferral
rtc: rv3029: stop mentioning rv3029c2
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/rtc/maxim,mcp795.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt b/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt new file mode 100644 index 000000000000..a59fdd8c236d --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt @@ -0,0 +1,11 @@ +* Maxim MCP795 SPI Serial Real-Time Clock + +Required properties: +- compatible: Should contain "maxim,mcp795". +- reg: SPI address for chip + +Example: + mcp795: rtc@0 { + compatible = "maxim,mcp795"; + reg = <0>; + }; |