| Message ID | 20231107102111.16465-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 58e8fcf992831ef3642d90115ab119c19bfdd0c5 |
| Headers | show |
| Series | [1/2] arm64: dts: qcom: sc8280xp: correct Soundwire node name | expand |
On 07/11/2023 11:21, Krzysztof Kozlowski wrote: > Soundwire Devicetree bindings expect the Soundwire controller device > node to be named just "soundwire": > > sm8250-xiaomi-elish-boe.dtb: soundwire-controller@3250000: $nodename:0: 'soundwire-controller@3250000' does not match '^soundwire(@.*)?$' > > Reported-by: Neil Armstrong <neil.armstrong@linaro.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi > index da71de5e1a80..e18a18a9e767 100644 > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi > @@ -2557,7 +2557,7 @@ wsamacro: codec@3240000 { > status = "disabled"; > }; > > - swr0: soundwire-controller@3250000 { > + swr0: soundwire@3250000 { > reg = <0 0x03250000 0 0x2000>; > compatible = "qcom,soundwire-v1.5.1"; > interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>; > @@ -2623,7 +2623,7 @@ rxmacro: rxmacro@3200000 { > #sound-dai-cells = <1>; > }; > > - swr1: soundwire-controller@3210000 { > + swr1: soundwire@3210000 { > reg = <0 0x03210000 0 0x2000>; > compatible = "qcom,soundwire-v1.5.1"; > status = "disabled"; > @@ -2670,7 +2670,7 @@ txmacro: txmacro@3220000 { > }; > > /* tx macro */ > - swr2: soundwire-controller@3230000 { > + swr2: soundwire@3230000 { > reg = <0 0x03230000 0 0x2000>; > compatible = "qcom,soundwire-v1.5.1"; > interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On Tue, 07 Nov 2023 11:21:10 +0100, Krzysztof Kozlowski wrote: > Soundwire Devicetree bindings expect the Soundwire controller device > node to be named just "soundwire": > > sc8280xp-lenovo-thinkpad-x13s.dtb: soundwire-controller@3210000: $nodename:0: 'soundwire-controller@3210000' does not match '^soundwire(@.*)?$' > > Applied, thanks! [1/2] arm64: dts: qcom: sc8280xp: correct Soundwire node name commit: 58e8fcf992831ef3642d90115ab119c19bfdd0c5 [2/2] arm64: dts: qcom: sm8250: correct Soundwire node name commit: c1f52fb9a128771cfe2cae528c32b302e98398f3 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index e5bc9c51ceff..3af3625dd5e6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -2730,7 +2730,7 @@ rxmacro: rxmacro@3200000 { status = "disabled"; }; - swr1: soundwire-controller@3210000 { + swr1: soundwire@3210000 { compatible = "qcom,soundwire-v1.6.0"; reg = <0 0x03210000 0 0x2000>; interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>; @@ -2806,7 +2806,7 @@ wsamacro: codec@3240000 { status = "disabled"; }; - swr0: soundwire-controller@3250000 { + swr0: soundwire@3250000 { reg = <0 0x03250000 0 0x2000>; compatible = "qcom,soundwire-v1.6.0"; interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>; @@ -2843,7 +2843,7 @@ lpass_audiocc: clock-controller@32a9000 { #reset-cells = <1>; }; - swr2: soundwire-controller@3330000 { + swr2: soundwire@3330000 { compatible = "qcom,soundwire-v1.6.0"; reg = <0 0x03330000 0 0x2000>; interrupts = <GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
Soundwire Devicetree bindings expect the Soundwire controller device node to be named just "soundwire": sc8280xp-lenovo-thinkpad-x13s.dtb: soundwire-controller@3210000: $nodename:0: 'soundwire-controller@3210000' does not match '^soundwire(@.*)?$' Reported-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)