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 <[email protected]>
---
This patch builds on top of
https://lore.kernel.org/linux-arm-msm/[email protected]/
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
The spmi-pmic bindings is now using usb-detect@ for this node, so adjust
the dts to match.
Signed-off-by: Luca Weiss <[email protected]>
---
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
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 <[email protected]>
> ---
> 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 <[email protected]>
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 <[email protected]>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/[email protected]/
> 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 <[email protected]>
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 <[email protected]>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/[email protected]/
> 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 [李琼斯]
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 <[email protected]>
> > ---
> > This patch builds on top of
> > https://lore.kernel.org/linux-arm-msm/[email protected]
> > 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/[email protected]/
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#
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 <[email protected]>
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 <[email protected]>
> ---
> This patch builds on top of
> https://lore.kernel.org/linux-arm-msm/[email protected]/
> 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 [李琼斯]