2023-07-05 06:52:03

by Krzysztof Kozlowski

Subject: [RFT PATCH 2/3] arm64: dts: rockchip: correct audio-codec interrupt flag in Rock Pi 4B

GPIO_ACTIVE_x flags are not correct in the context of interrupt flags.
These are simple defines so they could be used in DTS but they will not
have the same meaning: GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE.

Correct the interrupt flags, assuming the author of the code wanted same
logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_LOW => IRQ_TYPE_LEVEL_LOW

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
index cec3b7b1b947..8a17c1eaae15 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
@@ -31,7 +31,7 @@ brcmf: wifi@1 {
compatible = "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpio0>;
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_l>;
--
2.34.1

2023-07-06 11:54:12

by Christopher Obbard

Subject: Re: [RFT PATCH 2/3] arm64: dts: rockchip: correct audio-codec interrupt flag in Rock Pi 4B

Hi Krzysztof,

On Wed, 2023-07-05 at 08:48 +0200, Krzysztof Kozlowski wrote:
> GPIO_ACTIVE_x flags are not correct in the context of interrupt flags.
> These are simple defines so they could be used in DTS but they will not
> have the same meaning: GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE.
>
> Correct the interrupt flags, assuming the author of the code wanted same
> logical behavior behind the name "ACTIVE_xxx", this is:
>   ACTIVE_LOW  => IRQ_TYPE_LEVEL_LOW
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---

This works fine on my hardware. With that:

Tested-by: Christopher Obbard <[email protected]>

>  arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
> index cec3b7b1b947..8a17c1eaae15 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
> @@ -31,7 +31,7 @@ brcmf: wifi@1 {
>                 compatible = "brcm,bcm4329-fmac";
>                 reg = <1>;
>                 interrupt-parent = <&gpio0>;
> -               interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
> +               interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
>                 interrupt-names = "host-wake";
>                 pinctrl-names = "default";
>                 pinctrl-0 = <&wifi_host_wake_l>;