arm64: dts: qcom: sc8280xp: correct Soundwire wakeup interrupt name

Message ID 20230403132328.61414-1-krzysztof.kozlowski@linaro.org
State New
Headers
Series arm64: dts: qcom: sc8280xp: correct Soundwire wakeup interrupt name |

Commit Message

Krzysztof Kozlowski April 3, 2023, 1:23 p.m. UTC
  The bindings expect second Soundwire interrupt to be "wakeup" (Linux
driver takes by index):

  sc8280xp-crd.dtb: soundwire-controller@3330000: interrupt-names:1: 'wakeup' was expected

Fixes: c18773d162a6 ("arm64: dts: qcom: sc8280xp: add SoundWire and LPASS")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Konrad Dybcio April 3, 2023, 1:28 p.m. UTC | #1
On 3.04.2023 15:23, Krzysztof Kozlowski wrote:
> The bindings expect second Soundwire interrupt to be "wakeup" (Linux
> driver takes by index):
Seems to be a common occurence with drivers that were written a long
time ago but have been updated for new hw since.. Perhaps something
like of_irq_get_by_name_idx(..., "name", idx_if_not_found) could
be useful..


> 
>   sc8280xp-crd.dtb: soundwire-controller@3330000: interrupt-names:1: 'wakeup' was expected
> 
> Fixes: c18773d162a6 ("arm64: dts: qcom: sc8280xp: add SoundWire and LPASS")
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index af7bee14fa06..cd38320dafda 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -2606,7 +2606,7 @@ swr2: soundwire-controller@3330000 {
>  			reg = <0 0x03330000 0 0x2000>;
>  			interrupts-extended = <&intc GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
>  					      <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
> -			interrupt-names = "core", "wake";
> +			interrupt-names = "core", "wakeup";
>  
>  			clocks = <&txmacro>;
>  			clock-names = "iface";
  
Bjorn Andersson April 5, 2023, 4:09 a.m. UTC | #2
On Mon, 3 Apr 2023 15:23:28 +0200, Krzysztof Kozlowski wrote:
> The bindings expect second Soundwire interrupt to be "wakeup" (Linux
> driver takes by index):
> 
>   sc8280xp-crd.dtb: soundwire-controller@3330000: interrupt-names:1: 'wakeup' was expected
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sc8280xp: correct Soundwire wakeup interrupt name
      commit: 894e258b6a38922f9860a20ca07cf2f745e3b090

Best regards,
  

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index af7bee14fa06..cd38320dafda 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -2606,7 +2606,7 @@  swr2: soundwire-controller@3330000 {
 			reg = <0 0x03330000 0 0x2000>;
 			interrupts-extended = <&intc GIC_SPI 959 IRQ_TYPE_LEVEL_HIGH>,
 					      <&intc GIC_SPI 520 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "core", "wake";
+			interrupt-names = "core", "wakeup";
 
 			clocks = <&txmacro>;
 			clock-names = "iface";