[PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Luca Weiss]

extcon is a Linux-specific name and shouldn't be a part of the dts. Make
it be called usb-detect@ instead.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
This patch builds on top of
https://lore.kernel.org/linux-arm-msm/20221031173933.936147-1-luca@z3ntu.xyz/
But could also be applied without, if conflicts are resolved.

 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
index cf10d62ace54..14aa42057d6f 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -123,10 +123,6 @@ patternProperties:
       - $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#
-
   "gpio(s)?@[0-9a-f]+$":
     type: object
     $ref: /schemas/pinctrl/qcom,pmic-gpio.yaml#
@@ -143,6 +139,10 @@ patternProperties:
     type: object
     $ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
 
+  "^usb-detect@[0-9a-f]+$":
+    type: object
+    $ref: /schemas/extcon/qcom,pm8941-misc.yaml#
+
   "^usb-vbus-regulator@[0-9a-f]+$":
     type: object
     $ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#
-- 
2.38.1

[PATCH 2/3] bindings: pm8941-misc: rename misc node name

[Luca Weiss]

The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
the example to match.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
index 6a9c96f0352a..fbda899fd260 100644
--- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
+++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
@@ -49,7 +49,7 @@ examples:
             interrupt-controller;
             #interrupt-cells = <4>;
 
-            usb_id: misc@900 {
+            usb_id: usb-detect@900 {
                     compatible = "qcom,pm8941-misc";
                     reg = <0x900>;
                     interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
-- 
2.38.1

[PATCH 3/3] ARM: dts: qcom: pm8941: rename misc node name

[Luca Weiss]

The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
the dts to match.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom-pm8941.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index 7a4467e03aa1..863e598591b7 100644
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -27,7 +27,7 @@ pwrkey@800 {
 			bias-pull-up;
 		};
 
-		usb_id: misc@900 {
+		usb_id: usb-detect@900 {
 			compatible = "qcom,pm8941-misc";
 			reg = <0x900>;
 			interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
-- 
2.38.1

Re: [PATCH 2/3] bindings: pm8941-misc: rename misc node name

[Neil Armstrong]

Hi,
On 31/10/2022 18:57, Luca Weiss wrote:
> The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
> the example to match.

Subject should be:
dt-bindings: pm8941-misc: rename misc node name
instead of:
bindings: pm8941-misc: rename misc node name

> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
>   Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> index 6a9c96f0352a..fbda899fd260 100644
> --- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> +++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> @@ -49,7 +49,7 @@ examples:
>               interrupt-controller;
>               #interrupt-cells = <4>;
>   
> -            usb_id: misc@900 {
> +            usb_id: usb-detect@900 {
>                       compatible = "qcom,pm8941-misc";
>                       reg = <0x900>;
>                       interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;

With subject fixed:

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Re: [PATCH 3/3] ARM: dts: qcom: pm8941: rename misc node name

[Neil Armstrong]

On 31/10/2022 18:57, Luca Weiss wrote:
> The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
> the dts to match.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
>   arch/arm/boot/dts/qcom-pm8941.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
> index 7a4467e03aa1..863e598591b7 100644
> --- a/arch/arm/boot/dts/qcom-pm8941.dtsi
> +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
> @@ -27,7 +27,7 @@ pwrkey@800 {
>   			bias-pull-up;
>   		};
>   
> -		usb_id: misc@900 {
> +		usb_id: usb-detect@900 {
>   			compatible = "qcom,pm8941-misc";
>   			reg = <0x900>;
>   			interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Re: [PATCH 2/3] bindings: pm8941-misc: rename misc node name

[Luca Weiss]

Hi Neil,

On Mittwoch, 2. November 2022 11:35:55 CET Neil Armstrong wrote:
> Hi,
> 
> On 31/10/2022 18:57, Luca Weiss wrote:
> > The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
> > the example to match.
> 
> Subject should be:
> dt-bindings: pm8941-misc: rename misc node name
> instead of:
> bindings: pm8941-misc: rename misc node name

Also here I've followed the style of the previous commits to this file

4fcdd677c4ea bindings: pm8941-misc: Add support for VBUS detection
dd6f5afb1c2d bindings: pm8941-misc: Convert bindings to YAML

Though it seems other commits in this directory recently have used
"dt-bindings: extcon: " prefix. Do you still want me to change it?

Regards
Luca

> 
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > ---
> > 
> >   Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git
> > a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> > b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml index
> > 6a9c96f0352a..fbda899fd260 100644
> > --- a/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> > +++ b/Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
> > 
> > @@ -49,7 +49,7 @@ examples:
> >               interrupt-controller;
> >               #interrupt-cells = <4>;
> > 
> > -            usb_id: misc@900 {
> > +            usb_id: usb-detect@900 {
> > 
> >                       compatible = "qcom,pm8941-misc";
> >                       reg = <0x900>;
> >                       interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
> 
> With subject fixed:
> 
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Re: [PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Rob Herring]

On Mon, 31 Oct 2022 18:57:14 +0100, Luca Weiss wrote:
> extcon is a Linux-specific name and shouldn't be a part of the dts. Make
> it be called usb-detect@ instead.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/20221031173933.936147-1-luca@z3ntu.xyz/
> But could also be applied without, if conflicts are resolved.
> 
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 2/3] bindings: pm8941-misc: rename misc node name

[Rob Herring]

On Wed, Nov 02, 2022 at 04:43:14PM +0100, Luca Weiss wrote:
> Hi Neil,
> 
> On Mittwoch, 2. November 2022 11:35:55 CET Neil Armstrong wrote:
> > Hi,
> > 
> > On 31/10/2022 18:57, Luca Weiss wrote:
> > > The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
> > > the example to match.
> > 
> > Subject should be:
> > dt-bindings: pm8941-misc: rename misc node name
> > instead of:
> > bindings: pm8941-misc: rename misc node name
> 
> Also here I've followed the style of the previous commits to this file
> 
> 4fcdd677c4ea bindings: pm8941-misc: Add support for VBUS detection
> dd6f5afb1c2d bindings: pm8941-misc: Convert bindings to YAML
> 
> Though it seems other commits in this directory recently have used
> "dt-bindings: extcon: " prefix. Do you still want me to change it?

Yes.

Re: [PATCH 2/3] bindings: pm8941-misc: rename misc node name

[Rob Herring]

On Mon, 31 Oct 2022 18:57:15 +0100, Luca Weiss wrote:
> The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
> the example to match.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
>  Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Lee Jones]

On Mon, 31 Oct 2022, Luca Weiss wrote:

> extcon is a Linux-specific name and shouldn't be a part of the dts. Make
> it be called usb-detect@ instead.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/20221031173933.936147-1-luca@z3ntu.xyz/
> But could also be applied without, if conflicts are resolved.
> 
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Same here.  Only 1/3 received.

Can I take this on its own?

> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> index cf10d62ace54..14aa42057d6f 100644
> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> @@ -123,10 +123,6 @@ patternProperties:
>        - $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#
> -
>    "gpio(s)?@[0-9a-f]+$":
>      type: object
>      $ref: /schemas/pinctrl/qcom,pmic-gpio.yaml#
> @@ -143,6 +139,10 @@ patternProperties:
>      type: object
>      $ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
>  
> +  "^usb-detect@[0-9a-f]+$":
> +    type: object
> +    $ref: /schemas/extcon/qcom,pm8941-misc.yaml#
> +
>    "^usb-vbus-regulator@[0-9a-f]+$":
>      type: object
>      $ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#

-- 
Lee Jones [李琼斯]

Re: [PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Luca Weiss]

On Montag, 7. November 2022 10:08:16 CET Lee Jones wrote:
> On Mon, 31 Oct 2022, Luca Weiss wrote:
> > extcon is a Linux-specific name and shouldn't be a part of the dts. Make
> > it be called usb-detect@ instead.
> > 
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > ---
> > This patch builds on top of
> > https://lore.kernel.org/linux-arm-msm/20221031173933.936147-1-luca@z3ntu.x
> > yz/ But could also be applied without, if conflicts are resolved.
> > 
> >  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> Same here.  Only 1/3 received.
> 
> Can I take this on its own?

Hi,

yes, this can be taken on its own. Perhaps it'll introduce some temporary 
dtbs_check warnings until the other patches have also made it into the tree.

Patch 2 is pm8941-misc yaml change, and patch 3 is adjusting dtsi file for the 
new name.

Lore: https://lore.kernel.org/lkml/20221031175717.942237-1-luca@z3ntu.xyz/

Regards
Luca

> 
> > diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> > b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml index
> > cf10d62ace54..14aa42057d6f 100644
> > --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> > +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> > 
> > @@ -123,10 +123,6 @@ patternProperties:
> >        - $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#
> > -
> > 
> >    "gpio(s)?@[0-9a-f]+$":
> >      type: object
> >      $ref: /schemas/pinctrl/qcom,pmic-gpio.yaml#
> > 
> > @@ -143,6 +139,10 @@ patternProperties:
> >      type: object
> >      $ref: /schemas/thermal/qcom,spmi-temp-alarm.yaml#
> > 
> > +  "^usb-detect@[0-9a-f]+$":
> > +    type: object
> > +    $ref: /schemas/extcon/qcom,pm8941-misc.yaml#
> > +
> > 
> >    "^usb-vbus-regulator@[0-9a-f]+$":
> >      type: object
> >      $ref: /schemas/regulator/qcom,usb-vbus-regulator.yaml#

Re: (subset) [PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Bjorn Andersson]

On Mon, 31 Oct 2022 18:57:14 +0100, Luca Weiss wrote:
> extcon is a Linux-specific name and shouldn't be a part of the dts. Make
> it be called usb-detect@ instead.
> 
> 

Applied, thanks!

[3/3] ARM: dts: qcom: pm8941: rename misc node name
      commit: 52c47b894b260c3e5102bb4b3e77772734508bcf

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH 1/3] dt-bindings: mfd: qcom,spmi-pmic: rename extcon node name

[Lee Jones]

On Mon, 31 Oct 2022, Luca Weiss wrote:

> extcon is a Linux-specific name and shouldn't be a part of the dts. Make
> it be called usb-detect@ instead.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/20221031173933.936147-1-luca@z3ntu.xyz/
> But could also be applied without, if conflicts are resolved.
> 
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]