2023-04-05 06:11:15

by Krzysztof Kozlowski

Subject: [PATCH 1/5] arm64: dts: qcom: sc8280xp: label the Soundwire nodes

Use labels, instead of comments, for Soundwire controllers. Naming them
is useful, because they are specialized and have also naming in
datasheet/programming guide.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index cd38320dafda..c195a57fd180 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -2497,7 +2497,6 @@ rxmacro: rxmacro@3200000 {
status = "disabled";
};

- /* RX */
swr1: soundwire-controller@3210000 {
compatible = "qcom,soundwire-v1.6.0";
reg = <0 0x03210000 0 0x2000>;
@@ -2572,13 +2571,13 @@ wsamacro: codec@3240000 {
status = "disabled";
};

- /* WSA */
swr0: soundwire-controller@3250000 {
reg = <0 0x03250000 0 0x2000>;
compatible = "qcom,soundwire-v1.6.0";
interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&wsamacro>;
clock-names = "iface";
+ label = "WSA";

qcom,din-ports = <2>;
qcom,dout-ports = <6>;
@@ -2600,7 +2599,6 @@ swr0: soundwire-controller@3250000 {
status = "disabled";
};

- /* TX */
swr2: soundwire-controller@3330000 {
compatible = "qcom,soundwire-v1.6.0";
reg = <0 0x03330000 0 0x2000>;
--
2.34.1

2023-04-05 06:11:42

by Krzysztof Kozlowski

Subject: [PATCH 2/5] arm64: dts: qcom: sm8450: label the Soundwire nodes

Use labels, instead of comments, for Soundwire controllers. Naming them
is useful, because they are specialized and have also naming in
datasheet/programming guide.

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

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index ce4b7d0a09ab..1dd000748f9e 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2153,13 +2153,13 @@ wsa2macro: codec@31e0000 {
#sound-dai-cells = <1>;
};

- /* WSA2 */
swr4: soundwire-controller@31f0000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x031f0000 0 0x2000>;
interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&wsa2macro>;
clock-names = "iface";
+ label = "WSA2";

qcom,din-ports = <2>;
qcom,dout-ports = <6>;
@@ -2268,13 +2268,13 @@ wsamacro: codec@3240000 {
#sound-dai-cells = <1>;
};

- /* WSA */
swr0: soundwire-controller@3250000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x03250000 0 0x2000>;
interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&wsamacro>;
clock-names = "iface";
+ label = "WSA";

qcom,din-ports = <2>;
qcom,dout-ports = <6>;
--
2.34.1

2023-04-05 06:12:00

by Krzysztof Kozlowski

Subject: [PATCH 3/5] arm64: dts: qcom: sc8280xp: simplify interrupts-extended

The parent controller for both interrupts is GIC, so no need for
interrupts-extended.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index c195a57fd180..82c697118163 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -2602,8 +2602,8 @@ swr0: soundwire-controller@3250000 {
swr2: soundwire-controller@3330000 {
compatible = "qcom,soundwire-v1.6.0";
reg = <0 0x03330000 0 0x2000>;
- interrupts-extended = <&intc GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
- <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "core", "wakeup";

clocks = <&txmacro>;
--
2.34.1

2023-04-05 06:12:01

by Krzysztof Kozlowski

Subject: [PATCH 4/5] arm64: dts: qcom: sm8250: simplify interrupts-extended

The parent controller for the interrupt is GIC, so no need for
interrupts-extended.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 7b78761f2041..fae30dc58eb5 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2366,7 +2366,7 @@ txmacro: txmacro@3220000 {
swr2: soundwire-controller@3230000 {
reg = <0 0x03230000 0 0x2000>;
compatible = "qcom,soundwire-v1.5.1";
- interrupts-extended = <&intc GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "core";
status = "disabled";

--
2.34.1

2023-04-05 06:12:47

by Krzysztof Kozlowski

Subject: [PATCH 5/5] arm64: dts: qcom: sm8450: simplify interrupts-extended

The parent controller for both interrupts is GIC, so no need for
interrupts-extended.

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

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 1dd000748f9e..1dc5d2c49aad 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2298,8 +2298,8 @@ swr0: soundwire-controller@3250000 {
swr2: soundwire-controller@33b0000 {
compatible = "qcom,soundwire-v1.7.0";
reg = <0 0x033b0000 0 0x2000>;
- interrupts-extended = <&intc GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
- <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "core", "wakeup";

clocks = <&vamacro>;
--
2.34.1

2023-04-05 15:48:27

by Konrad Dybcio

Subject: Re: [PATCH 1/5] arm64: dts: qcom: sc8280xp: label the Soundwire nodes

On 5.04.2023 08:09, Krzysztof Kozlowski wrote:
> Use labels, instead of comments, for Soundwire controllers. Naming them
> is useful, because they are specialized and have also naming in
> datasheet/programming guide.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index cd38320dafda..c195a57fd180 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -2497,7 +2497,6 @@ rxmacro: rxmacro@3200000 {
> status = "disabled";
> };
>
> - /* RX */
> swr1: soundwire-controller@3210000 {
> compatible = "qcom,soundwire-v1.6.0";
> reg = <0 0x03210000 0 0x2000>;
> @@ -2572,13 +2571,13 @@ wsamacro: codec@3240000 {
> status = "disabled";
> };
>
> - /* WSA */
> swr0: soundwire-controller@3250000 {
> reg = <0 0x03250000 0 0x2000>;
> compatible = "qcom,soundwire-v1.6.0";
> interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&wsamacro>;
> clock-names = "iface";
> + label = "WSA";
>
> qcom,din-ports = <2>;
> qcom,dout-ports = <6>;
> @@ -2600,7 +2599,6 @@ swr0: soundwire-controller@3250000 {
> status = "disabled";
> };
>
> - /* TX */
> swr2: soundwire-controller@3330000 {
> compatible = "qcom,soundwire-v1.6.0";
> reg = <0 0x03330000 0 0x2000>;

2023-04-05 15:49:02

by Konrad Dybcio

Subject: Re: [PATCH 2/5] arm64: dts: qcom: sm8450: label the Soundwire nodes

On 5.04.2023 08:09, Krzysztof Kozlowski wrote:
> Use labels, instead of comments, for Soundwire controllers. Naming them
> is useful, because they are specialized and have also naming in
> datasheet/programming guide.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index ce4b7d0a09ab..1dd000748f9e 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -2153,13 +2153,13 @@ wsa2macro: codec@31e0000 {
> #sound-dai-cells = <1>;
> };
>
> - /* WSA2 */
> swr4: soundwire-controller@31f0000 {
> compatible = "qcom,soundwire-v1.7.0";
> reg = <0 0x031f0000 0 0x2000>;
> interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&wsa2macro>;
> clock-names = "iface";
> + label = "WSA2";
>
> qcom,din-ports = <2>;
> qcom,dout-ports = <6>;
> @@ -2268,13 +2268,13 @@ wsamacro: codec@3240000 {
> #sound-dai-cells = <1>;
> };
>
> - /* WSA */
> swr0: soundwire-controller@3250000 {
> compatible = "qcom,soundwire-v1.7.0";
> reg = <0 0x03250000 0 0x2000>;
> interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&wsamacro>;
> clock-names = "iface";
> + label = "WSA";
>
> qcom,din-ports = <2>;
> qcom,dout-ports = <6>;

2023-04-05 15:49:34

by Konrad Dybcio

Subject: Re: [PATCH 3/5] arm64: dts: qcom: sc8280xp: simplify interrupts-extended

On 5.04.2023 08:09, Krzysztof Kozlowski wrote:
> The parent controller for both interrupts is GIC, so no need for
> interrupts-extended.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index c195a57fd180..82c697118163 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -2602,8 +2602,8 @@ swr0: soundwire-controller@3250000 {
> swr2: soundwire-controller@3330000 {
> compatible = "qcom,soundwire-v1.6.0";
> reg = <0 0x03330000 0 0x2000>;
> - interrupts-extended = <&intc GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
> - <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "core", "wakeup";
>
> clocks = <&txmacro>;

2023-04-05 15:53:17

by Konrad Dybcio

Subject: Re: [PATCH 4/5] arm64: dts: qcom: sm8250: simplify interrupts-extended

On 5.04.2023 08:09, Krzysztof Kozlowski wrote:
> The parent controller for the interrupt is GIC, so no need for
> interrupts-extended.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index 7b78761f2041..fae30dc58eb5 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -2366,7 +2366,7 @@ txmacro: txmacro@3220000 {
> swr2: soundwire-controller@3230000 {
> reg = <0 0x03230000 0 0x2000>;
> compatible = "qcom,soundwire-v1.5.1";
> - interrupts-extended = <&intc GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "core";
> status = "disabled";
>

2023-04-05 16:07:11

by Konrad Dybcio

Subject: Re: [PATCH 5/5] arm64: dts: qcom: sm8450: simplify interrupts-extended

On 5.04.2023 08:09, Krzysztof Kozlowski wrote:
> The parent controller for both interrupts is GIC, so no need for
> interrupts-extended.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index 1dd000748f9e..1dc5d2c49aad 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -2298,8 +2298,8 @@ swr0: soundwire-controller@3250000 {
> swr2: soundwire-controller@33b0000 {
> compatible = "qcom,soundwire-v1.7.0";
> reg = <0 0x033b0000 0 0x2000>;
> - interrupts-extended = <&intc GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
> - <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "core", "wakeup";
>
> clocks = <&vamacro>;

2023-04-07 17:39:41

by Bjorn Andersson

Subject: Re: (subset) [PATCH 1/5] arm64: dts: qcom: sc8280xp: label the Soundwire nodes

On Wed, 5 Apr 2023 08:09:02 +0200, Krzysztof Kozlowski wrote:
> Use labels, instead of comments, for Soundwire controllers. Naming them
> is useful, because they are specialized and have also naming in
> datasheet/programming guide.
>
>

Applied, thanks!

[1/5] arm64: dts: qcom: sc8280xp: label the Soundwire nodes
commit: f77256439ccb794ec02eb07dfc6f1f96972a8cff
[2/5] arm64: dts: qcom: sm8450: label the Soundwire nodes
commit: add214009d0632bf3f28158f81e4d202d8c9aa0e
[3/5] arm64: dts: qcom: sc8280xp: simplify interrupts-extended
commit: 465b99f3b4ca55f25124adff6d6ccac4371f1930
[4/5] arm64: dts: qcom: sm8250: simplify interrupts-extended
commit: 563065020d9ae67999f3f3f3a6ec3508e17a4d88
[5/5] arm64: dts: qcom: sm8450: simplify interrupts-extended
commit: d6573b4c202e75edd8b7ffbef6496613a1ef89df

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