| Message ID | 20220928-mdm9615-dt-schema-fixes-v4-6-dac2dfaac703@linaro.org |
|---|---|
| State | Accepted |
| Commit | 8eae11e8ce9beb6c91e216c274f4b3bdf85a0924 |
| Headers | show |
| Series | arm: qcom: mdm9615: first round of bindings and DT fixes | expand |
On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote: > Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that > the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey. > > Reviewed-by: Rob Herring <robh@kernel.org> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Should I merge this through my tree or you want all these changes to go together through some particular tree? Thanks.
Hi, On 27/10/2022 09:55, Dmitry Torokhov wrote: > On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote: >> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that >> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey. >> >> Reviewed-by: Rob Herring <robh@kernel.org> >> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > > Should I merge this through my tree or you want all these changes to go > together through some particular tree? I have no preference, Krzysztof will you take it and prepare a branch to Bjorn ? > > Thanks. > Neil
On 27/10/2022 08:39, Neil Armstrong wrote: > Hi, > > On 27/10/2022 09:55, Dmitry Torokhov wrote: >> On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote: >>> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that >>> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey. >>> >>> Reviewed-by: Rob Herring <robh@kernel.org> >>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >> >> Should I merge this through my tree or you want all these changes to go >> together through some particular tree? > > I have no preference, > Krzysztof will you take it and prepare a branch to Bjorn ? No, I did not plan on doing it. Dmitry, Please grab it (assuming there are no dependencies). Best regards, Krzysztof
On Thu, Oct 27, 2022 at 08:43:20AM -0400, Krzysztof Kozlowski wrote: > On 27/10/2022 08:39, Neil Armstrong wrote: > > Hi, > > > > On 27/10/2022 09:55, Dmitry Torokhov wrote: > >> On Fri, Oct 21, 2022 at 11:06:42AM +0200, Neil Armstrong wrote: > >>> Convert input/qcom,pm8xxx-pwrkey.txt to YAML, and take in account that > >>> the PM8921 pwrkey compatible is used as fallback for the PM8018 pwrkey. > >>> > >>> Reviewed-by: Rob Herring <robh@kernel.org> > >>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > >> > >> Should I merge this through my tree or you want all these changes to go > >> together through some particular tree? > > > > I have no preference, > > Krzysztof will you take it and prepare a branch to Bjorn ? > > No, I did not plan on doing it. > > Dmitry, > Please grab it (assuming there are no dependencies). Applied, thank you.
diff --git a/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml b/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml new file mode 100644 index 000000000000..12c74c083258 --- /dev/null +++ b/Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/qcom,pm8921-pwrkey.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm PM8921 PMIC Power Key + +maintainers: + - Bjorn Andersson <andersson@kernel.org> + +allOf: + - $ref: input.yaml# + +properties: + compatible: + oneOf: + - enum: + - qcom,pm8921-pwrkey + - qcom,pm8058-pwrkey + - items: + - enum: + - qcom,pm8018-pwrkey + - const: qcom,pm8921-pwrkey + + reg: + maxItems: 1 + + interrupts: + items: + - description: key release + - description: key press + + debounce: + description: + Time in microseconds that key must be pressed or + released for state change interrupt to trigger. + $ref: /schemas/types.yaml#/definitions/uint32 + + pull-up: + description: + Presence of this property indicates that the KPDPWR_N + pin should be configured for pull up. + $ref: /schemas/types.yaml#/definitions/flag + +required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + ssbi { + #address-cells = <1>; + #size-cells = <0>; + + pmic@0 { + reg = <0x0>; + #address-cells = <1>; + #size-cells = <0>; + + pwrkey@1c { + compatible = "qcom,pm8921-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pmicint>; + interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>; + debounce = <15625>; + pull-up; + }; + }; + }; +... diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt deleted file mode 100644 index 588536cc96ed..000000000000 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt +++ /dev/null @@ -1,46 +0,0 @@ -Qualcomm PM8xxx PMIC Power Key - -PROPERTIES - -- compatible: - Usage: required - Value type: <string> - Definition: must be one of: - "qcom,pm8058-pwrkey" - "qcom,pm8921-pwrkey" - -- reg: - Usage: required - Value type: <prop-encoded-array> - Definition: address of power key control register - -- interrupts: - Usage: required - Value type: <prop-encoded-array> - Definition: the first interrupt specifies the key release interrupt - and the second interrupt specifies the key press interrupt. - The format of the specifier is defined by the binding - document describing the node's interrupt parent. - -- debounce: - Usage: optional - Value type: <u32> - Definition: time in microseconds that key must be pressed or release - for state change interrupt to trigger. - -- pull-up: - Usage: optional - Value type: <empty> - Definition: presence of this property indicates that the KPDPWR_N pin - should be configured for pull up. - -EXAMPLE - - pwrkey@1c { - compatible = "qcom,pm8921-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pmicintc>; - interrupts = <50 1>, <51 1>; - debounce = <15625>; - pull-up; - };