diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:18:56 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 22:18:56 (GMT) |
| commit | fceec41b68143e895f748e72bd07c5e2d45ab185 (patch) | |
| tree | b0c1e54f52b83956989c29a8f3ed50b88f5ede66 /Documentation | |
| parent | e747ea14de075172212823cbcb4a07a8ccd55c35 (diff) | |
| parent | 23c282d62f573263db679e6b4c9f2da82aa24f96 (diff) | |
| download | linux-fceec41b68143e895f748e72bd07c5e2d45ab185.tar.xz | |
Merge tag 'qcom-drivers-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Pull "Qualcomm ARM Based Driver Updates for v4.9" from Andy Gross:
* Silence smem probe defer messages
* Make scm explicitly non-modular
* Assorted SMD bug fixes and minor changes
* Add PM8018 RTC support
* tag 'qcom-drivers-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
rtc: rtc-pm8xxx: Add support for pm8018 rtc
soc: qcom: smd: Reset rx tail rather than tx
soc: qcom: smd: Represent smd edges as devices
soc: qcom: smd: Request irqs after parsing properties
soc: qcom: smd: Simplify multi channel handling
soc: qcom: smd: Correct compile stub prototypes
firmware: qcom_scm: make it explicitly non-modular
soc: qcom: smem: Silence probe defer error
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt b/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt index f24f334..37a088f 100644 --- a/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt +++ b/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt @@ -62,6 +62,7 @@ The below bindings specify the set of valid subnodes. "qcom,pm8058-rtc" "qcom,pm8921-rtc" "qcom,pm8941-rtc" + "qcom,pm8018-rtc" - reg: Usage: required |