[PATCH] arm64: dts: qcom: Rename "Twitter" to "Tweeter"

[PATCH] arm64: dts: qcom: Rename "Twitter" to "Tweeter"

[Maya Matuszczyk]

This makes the name consistent with both other x1e80100 devices and the
dictionary. A UCM fix was merged already.

Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
---
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index 10b28d870f08..004353220dc5 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -177,9 +177,9 @@ sound {
 		compatible = "qcom,x1e80100-sndcard";
 		model = "X1E80100-CRD";
 		audio-routing = "WooferLeft IN", "WSA WSA_SPK1 OUT",
-				"TwitterLeft IN", "WSA WSA_SPK2 OUT",
+				"TweeterLeft IN", "WSA WSA_SPK2 OUT",
 				"WooferRight IN", "WSA2 WSA_SPK2 OUT",
-				"TwitterRight IN", "WSA2 WSA_SPK2 OUT",
+				"TweeterRight IN", "WSA2 WSA_SPK2 OUT",
 				"IN1_HPHL", "HPHL_OUT",
 				"IN2_HPHR", "HPHR_OUT",
 				"AMIC2", "MIC BIAS2",
@@ -933,7 +933,7 @@ left_tweeter: speaker@0,1 {
 		reg = <0 1>;
 		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
 		#sound-dai-cells = <0>;
-		sound-name-prefix = "TwitterLeft";
+		sound-name-prefix = "TweeterLeft";
 		vdd-1p8-supply = <&vreg_l15b_1p8>;
 		vdd-io-supply = <&vreg_l12b_1p2>;
 		qcom,port-mapping = <4 5 6 7 11 13>;
@@ -986,7 +986,7 @@ right_tweeter: speaker@0,1 {
 		reg = <0 1>;
 		reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
 		#sound-dai-cells = <0>;
-		sound-name-prefix = "TwitterRight";
+		sound-name-prefix = "TweeterRight";
 		vdd-1p8-supply = <&vreg_l15b_1p8>;
 		vdd-io-supply = <&vreg_l12b_1p2>;
 		qcom,port-mapping = <4 5 6 7 11 13>;
-- 
2.45.2

Re: [PATCH] arm64: dts: qcom: Rename "Twitter" to "Tweeter"

[Johan Hovold]

On Tue, Oct 15, 2024 at 07:01:56PM +0200, Maya Matuszczyk wrote:
> This makes the name consistent with both other x1e80100 devices and the
> dictionary. A UCM fix was merged already.

I'm not opposed to fixing this, but please say something about what will
break when the kernel and UCM files are not updated in lockstep here.

Johan

Re: [PATCH] arm64: dts: qcom: Rename "Twitter" to "Tweeter"

[Krzysztof Kozlowski]

On 15/10/2024 19:01, Maya Matuszczyk wrote:
> This makes the name consistent with both other x1e80100 devices and the
> dictionary. A UCM fix was merged already.

This will break user-space using old UCM and any other user-space
relying on previous names, which should be mentioned in the commit msg.

That's said, CRD is development platform, not available to any end user,
thus it's perfectly fine to break it, if explained in commit msg.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

Re: [PATCH] arm64: dts: qcom: Rename "Twitter" to "Tweeter"

[Bjorn Andersson]

On Tue, Oct 15, 2024 at 07:01:56PM GMT, Maya Matuszczyk wrote:
> This makes the name consistent with both other x1e80100 devices and the
> dictionary. A UCM fix was merged already.
> 

Please, as you update the commit message, make sure that the subject
prefix matches other changes in the particular file.

Regards,
Bjorn

> Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com>
> ---
>  arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
> index 10b28d870f08..004353220dc5 100644
> --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
> @@ -177,9 +177,9 @@ sound {
>  		compatible = "qcom,x1e80100-sndcard";
>  		model = "X1E80100-CRD";
>  		audio-routing = "WooferLeft IN", "WSA WSA_SPK1 OUT",
> -				"TwitterLeft IN", "WSA WSA_SPK2 OUT",
> +				"TweeterLeft IN", "WSA WSA_SPK2 OUT",
>  				"WooferRight IN", "WSA2 WSA_SPK2 OUT",
> -				"TwitterRight IN", "WSA2 WSA_SPK2 OUT",
> +				"TweeterRight IN", "WSA2 WSA_SPK2 OUT",
>  				"IN1_HPHL", "HPHL_OUT",
>  				"IN2_HPHR", "HPHR_OUT",
>  				"AMIC2", "MIC BIAS2",
> @@ -933,7 +933,7 @@ left_tweeter: speaker@0,1 {
>  		reg = <0 1>;
>  		reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
>  		#sound-dai-cells = <0>;
> -		sound-name-prefix = "TwitterLeft";
> +		sound-name-prefix = "TweeterLeft";
>  		vdd-1p8-supply = <&vreg_l15b_1p8>;
>  		vdd-io-supply = <&vreg_l12b_1p2>;
>  		qcom,port-mapping = <4 5 6 7 11 13>;
> @@ -986,7 +986,7 @@ right_tweeter: speaker@0,1 {
>  		reg = <0 1>;
>  		reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
>  		#sound-dai-cells = <0>;
> -		sound-name-prefix = "TwitterRight";
> +		sound-name-prefix = "TweeterRight";
>  		vdd-1p8-supply = <&vreg_l15b_1p8>;
>  		vdd-io-supply = <&vreg_l12b_1p2>;
>  		qcom,port-mapping = <4 5 6 7 11 13>;
> -- 
> 2.45.2
>