2023-11-06 15:59:00

by Neil Armstrong

[permalink] [raw]
Subject: [PATCH] arm64: dts: qcom: sm8450: fix soundwire controllers node name

Fix the following dt bindings check:
arch/arm64/boot/dts/qcom/sm8450-hdk.dtb: soundwire-controller@31f0000: $nodename:0: 'soundwire-controller@31f0000' does not match '^soundwire(@.*)?$'
from schema $id: http://devicetree.org/schemas/soundwire/qcom,soundwire.yaml#

Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8450.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 9b0ff240e678..a305f8c03f9e 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2165,7 +2165,7 @@ wsa2macro: codec@31e0000 {
#sound-dai-cells = <1>;
};

- swr4: soundwire-controller@31f0000 {
+ swr4: soundwire@31f0000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x031f0000 0 0x2000>;
interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
@@ -2213,7 +2213,7 @@ rxmacro: codec@3200000 {
#sound-dai-cells = <1>;
};

- swr1: soundwire-controller@3210000 {
+ swr1: soundwire@3210000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x03210000 0 0x2000>;
interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
@@ -2280,7 +2280,7 @@ wsamacro: codec@3240000 {
#sound-dai-cells = <1>;
};

- swr0: soundwire-controller@3250000 {
+ swr0: soundwire@3250000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x03250000 0 0x2000>;
interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
@@ -2307,7 +2307,7 @@ swr0: soundwire-controller@3250000 {
status = "disabled";
};

- swr2: soundwire-controller@33b0000 {
+ swr2: soundwire@33b0000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x033b0000 0 0x2000>;
interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,

---
base-commit: d9ea330bc3c68e8d08e116f3827ae94568fef367
change-id: 20231106-topic-sm8450-upstream-soundwire-bindings-fix-fdd40dbabf6e

Best regards,
--
Neil Armstrong <[email protected]>


2023-11-06 16:01:08

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: sm8450: fix soundwire controllers node name

On 06/11/2023 16:58, Neil Armstrong wrote:
> Fix the following dt bindings check:
> arch/arm64/boot/dts/qcom/sm8450-hdk.dtb: soundwire-controller@31f0000: $nodename:0: 'soundwire-controller@31f0000' does not match '^soundwire(@.*)?$'
> from schema $id: http://devicetree.org/schemas/soundwire/qcom,soundwire.yaml#
>
> Signed-off-by: Neil Armstrong <[email protected]>
> ---

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

2023-11-06 16:02:56

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: sm8450: fix soundwire controllers node name

On 06/11/2023 16:58, Neil Armstrong wrote:
> Fix the following dt bindings check:
> arch/arm64/boot/dts/qcom/sm8450-hdk.dtb: soundwire-controller@31f0000: $nodename:0: 'soundwire-controller@31f0000' does not match '^soundwire(@.*)?$'
> from schema $id: http://devicetree.org/schemas/soundwire/qcom,soundwire.yaml#

Wait, how did you get this? There is no such pattern enforcement.

Best regards,
Krzysztof

2023-11-06 16:04:48

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: sm8450: fix soundwire controllers node name

On 06/11/2023 17:02, Krzysztof Kozlowski wrote:
> On 06/11/2023 16:58, Neil Armstrong wrote:
>> Fix the following dt bindings check:
>> arch/arm64/boot/dts/qcom/sm8450-hdk.dtb: soundwire-controller@31f0000: $nodename:0: 'soundwire-controller@31f0000' does not match '^soundwire(@.*)?$'
>> from schema $id: http://devicetree.org/schemas/soundwire/qcom,soundwire.yaml#
>
> Wait, how did you get this? There is no such pattern enforcement.

Never mind, I found recent patch:
https://lore.kernel.org/all/[email protected]/

Best regards,
Krzysztof

2023-12-08 02:55:11

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: sm8450: fix soundwire controllers node name


On Mon, 06 Nov 2023 16:58:33 +0100, Neil Armstrong wrote:
> Fix the following dt bindings check:
> arch/arm64/boot/dts/qcom/sm8450-hdk.dtb: soundwire-controller@31f0000: $nodename:0: 'soundwire-controller@31f0000' does not match '^soundwire(@.*)?$'
> from schema $id: http://devicetree.org/schemas/soundwire/qcom,soundwire.yaml#
>
>

Applied, thanks!

[1/1] arm64: dts: qcom: sm8450: fix soundwire controllers node name
commit: 11fcb81373de52eeb1d3ff135a8d24a4b18978d3

Best regards,
--
Bjorn Andersson <[email protected]>