arm64: dts: qcom: Update soundwire secondary node names

Update soundwire secondary nodes of WSA speaker to match with
dt-bindings pattern properties regular expression.

This modification is required to avoid dtbs-check errors
occurred with qcom,soundwire.yaml.

Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Co-developed-by: Ratna Deepthi Kudaravalli <quic_rkudarav@quicinc.com>
Signed-off-by: Ratna Deepthi Kudaravalli <quic_rkudarav@quicinc.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/1667918763-32445-2-git-send-email-quic_srivasam@quicinc.com

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 2c08500..4c39cec 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -1007,7 +1007,7 @@
 };
 
 &swr0 {
-       left_spkr: wsa8810-left {
+       left_spkr: speaker@0,3 {
                compatible = "sdw10217211000";
                reg = <0 3>;
                powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;
@@ -1016,7 +1016,7 @@
                #sound-dai-cells = <0>;
        };
 
-       right_spkr: wsa8810-right {
+       right_spkr: speaker@0,4 {
                compatible = "sdw10217211000";
                reg = <0 4>;
                powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 02dcf75..3e7ceb0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -1101,7 +1101,7 @@
        vdd-io-supply = <&vreg_s4a_1p8>;
 
        swm: swm@c85 {
-               left_spkr: wsa8810-left {
+               left_spkr: speaker@0,1 {
                        compatible = "sdw10217201000";
                        reg = <0 1>;
                        powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
@@ -1110,7 +1110,7 @@
                        #sound-dai-cells = <0>;
                };
 
-               right_spkr: wsa8810-right {
+               right_spkr: speaker@0,2 {
                        compatible = "sdw10217201000";
                        powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
                        reg = <0 2>;

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index 0c375ec..f32b744 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -785,7 +785,7 @@
        qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
 
        swm: swm@c85 {
-               left_spkr: wsa8810-left {
+               left_spkr: speaker@0,3 {
                        compatible = "sdw10217211000";
                        reg = <0 3>;
                        powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
@@ -794,7 +794,7 @@
                        #sound-dai-cells = <0>;
                };
 
-               right_spkr: wsa8810-right {
+               right_spkr: speaker@0,4 {
                        compatible = "sdw10217211000";
                        powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;
                        reg = <0 4>;

diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
index b712834..daca1e0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
@@ -717,7 +717,7 @@
        qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
 
        swm: swm@c85 {
-               left_spkr: wsa8810-left {
+               left_spkr: speaker@0,3 {
                        compatible = "sdw10217211000";
                        reg = <0 3>;
                        powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
@@ -726,7 +726,7 @@
                        #sound-dai-cells = <0>;
                };
 
-               right_spkr: wsa8810-right {
+               right_spkr: speaker@0,4 {
                        compatible = "sdw10217211000";
                        powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;
                        reg = <0 4>;

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 391806c..3ed8c84 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -757,7 +757,7 @@
 };
 
 &swr0 {
-       left_spkr: wsa8810-right@0,3{
+       left_spkr: speaker@0,3 {
                compatible = "sdw10217211000";
                reg = <0 3>;
                powerdown-gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
@@ -766,7 +766,7 @@
                #sound-dai-cells = <0>;
        };
 
-       right_spkr: wsa8810-left@0,4{
+       right_spkr: speaker@0,4 {
                compatible = "sdw10217211000";
                reg = <0 4>;
                powerdown-gpios = <&tlmm 127 GPIO_ACTIVE_HIGH>;