* 'adc@' is either spmi-iadc or spmi-vadc
* 'charger@' is either pm8941-charger or pm8941-coincell
* 'usb-vbus-regulator@' is usb-vbus-regulator
* 'vibrator@' is now in yaml format, so add it
Signed-off-by: Luca Weiss <[email protected]>
---
Changes since v1:
* Change dcdc@ to usb-vbus-regulator@
* Link to pm8xxx-vib.yaml
.../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
index 777f2da52f1e..cf10d62ace54 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -105,7 +105,9 @@ properties:
patternProperties:
"^adc@[0-9a-f]+$":
type: object
- $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
+ oneOf:
+ - $ref: /schemas/iio/adc/qcom,spmi-iadc.yaml#
+ - $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
"^adc-tm@[0-9a-f]+$":
type: object
@@ -115,6 +117,12 @@ patternProperties:
type: object
additionalProperties: true # FIXME qcom,pm8916-wcd-analog-codec binding not converted yet
+ "^charger@[0-9a-f]+$":
+ type: object
+ oneOf:
+ - $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
+ - $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
+
"extcon@[0-9a-f]+$":
type: object
$ref: /schemas/extcon/qcom,pm8941-misc.yaml#
@@ -135,9 +143,13 @@ patternProperties:
type: object
$ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
+ "^usb-vbus-regulator@[0-9a-f]+$":
+ type: object
+ $ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#
+
"^vibrator@[0-9a-f]+$":
type: object
- additionalProperties: true # FIXME qcom,pm8916-vib binding not converted yet
+ $ref: /schemas/input/qcom,pm8xxx-vib.yaml#
"^mpps@[0-9a-f]+$":
type: object
--
2.38.1
On Mon, 31 Oct 2022 18:39:31 +0100, Luca Weiss wrote:
> * 'adc@' is either spmi-iadc or spmi-vadc
> * 'charger@' is either pm8941-charger or pm8941-coincell
> * 'usb-vbus-regulator@' is usb-vbus-regulator
> * 'vibrator@' is now in yaml format, so add it
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> Changes since v1:
> * Change dcdc@ to usb-vbus-regulator@
> * Link to pm8xxx-vib.yaml
>
> .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 31 Oct 2022, Luca Weiss wrote:
> * 'adc@' is either spmi-iadc or spmi-vadc
> * 'charger@' is either pm8941-charger or pm8941-coincell
> * 'usb-vbus-regulator@' is usb-vbus-regulator
> * 'vibrator@' is now in yaml format, so add it
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> Changes since v1:
> * Change dcdc@ to usb-vbus-regulator@
> * Link to pm8xxx-vib.yaml
>
> .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
I don't see the other 2 patches.
Is this okay to take on its own?
> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> index 777f2da52f1e..cf10d62ace54 100644
> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> @@ -105,7 +105,9 @@ properties:
> patternProperties:
> "^adc@[0-9a-f]+$":
> type: object
> - $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
> + oneOf:
> + - $ref: /schemas/iio/adc/qcom,spmi-iadc.yaml#
> + - $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
>
> "^adc-tm@[0-9a-f]+$":
> type: object
> @@ -115,6 +117,12 @@ patternProperties:
> type: object
> additionalProperties: true # FIXME qcom,pm8916-wcd-analog-codec binding not converted yet
>
> + "^charger@[0-9a-f]+$":
> + type: object
> + oneOf:
> + - $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
> + - $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
> +
> "extcon@[0-9a-f]+$":
> type: object
> $ref: /schemas/extcon/qcom,pm8941-misc.yaml#
> @@ -135,9 +143,13 @@ patternProperties:
> type: object
> $ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
>
> + "^usb-vbus-regulator@[0-9a-f]+$":
> + type: object
> + $ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#
> +
> "^vibrator@[0-9a-f]+$":
> type: object
> - additionalProperties: true # FIXME qcom,pm8916-vib binding not converted yet
> + $ref: /schemas/input/qcom,pm8xxx-vib.yaml#
>
> "^mpps@[0-9a-f]+$":
> type: object
--
Lee Jones [李琼斯]
On Mon, 31 Oct 2022 18:39:31 +0100, Luca Weiss wrote:
> * 'adc@' is either spmi-iadc or spmi-vadc
> * 'charger@' is either pm8941-charger or pm8941-coincell
> * 'usb-vbus-regulator@' is usb-vbus-regulator
> * 'vibrator@' is now in yaml format, so add it
>
>
Applied, thanks!
[3/3] arm64: dts: qcom: pm8150b: change vbus-regulator node name
commit: 0c9a86fb9ebc576e66a2ce6a667684431a14d2f1
Best regards,
--
Bjorn Andersson <[email protected]>
On Mon, 31 Oct 2022, Luca Weiss wrote:
> * 'adc@' is either spmi-iadc or spmi-vadc
> * 'charger@' is either pm8941-charger or pm8941-coincell
> * 'usb-vbus-regulator@' is usb-vbus-regulator
> * 'vibrator@' is now in yaml format, so add it
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> Changes since v1:
> * Change dcdc@ to usb-vbus-regulator@
> * Link to pm8xxx-vib.yaml
>
> .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
I fixed up the subject line for you and applied, thanks.
--
Lee Jones [李琼斯]