| Message ID | 20240328074544.5076-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5582e357d0c6bfdc889773ca3c9b7b0dd31dc334 |
| Headers | show |
| Series | arm64: dts: qcom: pm6150: correct Type-C compatible | expand |
On 30/03/2024 08:07, Gabor Juhos wrote: > 2024. 03. 28. 8:45 keltezéssel, Krzysztof Kozlowski írta: >> The first part of the compatible of Type-C node misses ending quote, >> thus we have one long compatible consisting of two compatible strings >> leading to dtbs_check warnings: >> >> sc7180-idp.dtb: usb-vbus-regulator@1100: compatible:0: 'qcom,pm6150-vbus-reg,\n qcom,pm8150b-vbus-reg' does not match '^[a-zA-Z0-9][a-zA-Z0-9,+\\-._/]+$' >> sc7180-idp.dtb: /soc@0/spmi@c440000/pmic@0/usb-vbus-regulator@1100: failed to match any schema with compatible: ['qcom,pm6150-vbus-reg,\n qcom,pm8150b-vbus-reg'] >> >> Reported-by: Rob Herring <robh@kernel.org> >> Fixes: f81c2f01cad6 ("arm64: dts: qcom: pm6150: define USB-C related blocks") >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> --- >> arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi >> index 11158c2bd524..b20a639cddf3 100644 >> --- a/arch/arm64/boot/dts/qcom/pm6150.dtsi >> +++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi >> @@ -71,8 +71,8 @@ pm6150_vbus: usb-vbus-regulator@1100 { >> }; >> >> pm6150_typec: typec@1500 { >> - compatible = "qcom,pm6150-typec, >> - qcom,pm8150b-typec"; >> + compatible = "qcom,pm6150-typec", >> + "qcom,pm8150b-typec"; > > The warning in the commit description is related to the > 'usb-vbus-regulator@1100' node, whereas this fixes the compatible of a different > one. > > Did you want to fix both? D'oh! There are two of them! Thanks for the catch. Yes, I want to fix both of them :) Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi index 11158c2bd524..b20a639cddf3 100644 --- a/arch/arm64/boot/dts/qcom/pm6150.dtsi +++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi @@ -71,8 +71,8 @@ pm6150_vbus: usb-vbus-regulator@1100 { }; pm6150_typec: typec@1500 { - compatible = "qcom,pm6150-typec, - qcom,pm8150b-typec"; + compatible = "qcom,pm6150-typec", + "qcom,pm8150b-typec"; reg = <0x1500>, <0x1700>; interrupts = <0x0 0x15 0x00 IRQ_TYPE_EDGE_RISING>, <0x0 0x15 0x01 IRQ_TYPE_EDGE_BOTH>,
The first part of the compatible of Type-C node misses ending quote, thus we have one long compatible consisting of two compatible strings leading to dtbs_check warnings: sc7180-idp.dtb: usb-vbus-regulator@1100: compatible:0: 'qcom,pm6150-vbus-reg,\n qcom,pm8150b-vbus-reg' does not match '^[a-zA-Z0-9][a-zA-Z0-9,+\\-._/]+$' sc7180-idp.dtb: /soc@0/spmi@c440000/pmic@0/usb-vbus-regulator@1100: failed to match any schema with compatible: ['qcom,pm6150-vbus-reg,\n qcom,pm8150b-vbus-reg'] Reported-by: Rob Herring <robh@kernel.org> Fixes: f81c2f01cad6 ("arm64: dts: qcom: pm6150: define USB-C related blocks") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)