Subject: [merged] mfd-devicetree-bindings-add-pm8xxx-rtc-description.patch removed from -mm tree To: joshc@xxxxxxxxxxxxxx,a.zummo@xxxxxxxxxxxx,lee.jones@xxxxxxxxxx,robherring2@xxxxxxxxx,sboyd@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 01 Apr 2014 11:28:35 -0700 The patch titled Subject: mfd: devicetree: bindings: add pm8xxx RTC description has been removed from the -mm tree. Its filename was mfd-devicetree-bindings-add-pm8xxx-rtc-description.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Josh Cartwright <joshc@xxxxxxxxxxxxxx> Subject: mfd: devicetree: bindings: add pm8xxx RTC description The PM8xxx family of PMICs contain an RTC. This RTC is described as a subnode of the PM8xxx. Document these bindings, and replace the pwrkey node in the example with the RTC, which is now described in this document. While we're here, add a short description to the device tree bindings describing what the the PM8xxx devices are and how they are expected to be used. Signed-off-by: Josh Cartwright <joshc@xxxxxxxxxxxxxx> Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Cc: Rob Herring <robherring2@xxxxxxxxx> Cc: Lee Jones <lee.jones@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt | 45 ++++++++-- 1 file changed, 39 insertions(+), 6 deletions(-) diff -puN Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt~mfd-devicetree-bindings-add-pm8xxx-rtc-description Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt --- a/Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt~mfd-devicetree-bindings-add-pm8xxx-rtc-description +++ a/Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt @@ -1,6 +1,9 @@ Qualcomm PM8xxx PMIC multi-function devices -PROPERTIES +The PM8xxx family of Power Management ICs are used to provide regulated +voltages and other various functionality to Qualcomm SoCs. + += PROPERTIES - compatible: Usage: required @@ -45,7 +48,37 @@ PROPERTIES Value type: <empty> Definition: identifies this node as an interrupt controller -EXAMPLE += SUBCOMPONENTS + +The PMIC contains multiple independent functions, each described in a subnode. +The below bindings specify the set of valid subnodes. + +== Real-Time Clock + +- compatible: + Usage: required + Value type: <string> + Definition: must be one of: + "qcom,pm8058-rtc" + "qcom,pm8921-rtc" + +- reg: + Usage: required + Value type: <prop-encoded-array> + Definition: single entry specifying the base address of the RTC registers + +- interrupts: + Usage: required + Value type: <prop-encoded-array> + Definition: single entry specifying the RTC's alarm interrupt + +- allow-set-time: + Usage: optional + Value type: <empty> + Definition: indicates that the setting of RTC time is allowed by + the host CPU + += EXAMPLE pmicintc: pmic@0 { compatible = "qcom,pm8921"; @@ -55,9 +88,9 @@ EXAMPLE #address-cells = <1>; #size-cells = <0>; - pwrkey { - compatible = "qcom,pm8921-pwrkey"; - interrupt-parent = <&pmicintc>; - interrupts = <50 1>, <51 1>; + rtc@11d { + compatible = "qcom,pm8921-rtc"; + reg = <0x11d>; + interrupts = <0x27 0>; }; }; _ Patches currently in -mm which might be from joshc@xxxxxxxxxxxxxx are rtc-pm8xxx-fixup-checkpatch-style-issues.patch rtc-pm8xxx-use-regmap-api-for-register-accesses.patch rtc-pm8xxx-use-devm_request_any_context_irq.patch rtc-pm8xxx-add-support-for-devicetree.patch rtc-pm8xxx-move-device_init_wakeup-before-rtc_register.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html