ARM: dts: rk3188: correct interrupt flags
Subsystems (2)
PATCH v2 1/2 ARM: dts: rk3188: correct interrupt flags
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:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags without affecting the code:
ACTIVE_HIGH => IRQ_TYPE_NONE
---
Not tested on HW.
Changes since v1:
1. Correct title
--- arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/rk3188-bqedison2qc.dts +2 -1
@@ -7,6 +7,7 @@ /dts-v1/; #include <dt-bindings/i2c/i2c.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> #include "rk3188.dtsi" / {
@@ -479,7 +480,7 @@ reg = <1>; compatible = "brcm,bcm4329-fmac"; interrupt-parent = <&gpio3>; - interrupts = <RK_PD2 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PD2 IRQ_TYPE_NONE>; interrupt-names = "host-wake"; brcm,drive-strength = <5>; pinctrl-names = "default";
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v2 2/2 arm64: dts: rk3399: correct interrupt flags
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:
1. GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE
2. GPIO_ACTIVE_LOW = 1 = IRQ_TYPE_EDGE_RISING
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH
---
Not tested on HW.
Changes since v1:
1. Correct title
--- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 ++- arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 ++- arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 ++- arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 3 ++- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 ++- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 ++- 8 files changed, 14 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -1
@@ -5,6 +5,7 @@ /dts-v1/; #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pwm/pwm.h> #include "rk3399.dtsi" #include "rk3399-opp.dtsi"
@@ -676,7 +677,7 @@ reg = <1>; compatible = "brcm,bcm4329-fmac"; interrupt-parent = <&gpio0>; - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; brcm,drive-strength = <5>; pinctrl-names = "default";
arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts +2 -1
@@ -2,6 +2,7 @@ /dts-v1/; #include <dt-bindings/pwm/pwm.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/interrupt-controller/irq.h> #include "rk3399.dtsi" #include "rk3399-opp.dtsi"
@@ -623,7 +624,7 @@ 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>;
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +2 -1
@@ -6,6 +6,7 @@ /dts-v1/; #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pwm/pwm.h> #include "rk3399.dtsi" #include "rk3399-opp.dtsi"
@@ -662,7 +663,7 @@ reg = <1>; compatible = "brcm,bcm4329-fmac"; interrupt-parent = <&gpio0>; - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; brcm,drive-strength = <5>; pinctrl-names = "default";
arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts +2 -1
@@ -5,6 +5,7 @@ /dts-v1/; #include <dt-bindings/input/linux-event-codes.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pwm/pwm.h> #include "rk3399.dtsi" #include "rk3399-opp.dtsi"
@@ -503,7 +504,7 @@ 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>;
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +2 -1
@@ -7,6 +7,7 @@ #include "dt-bindings/pwm/pwm.h" #include "dt-bindings/input/input.h" +#include <dt-bindings/interrupt-controller/irq.h> #include "rk3399.dtsi" #include "rk3399-opp.dtsi"
@@ -691,7 +692,7 @@ reg = <1>; compatible = "brcm,bcm4329-fmac"; 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>;
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts +1 -1
@@ -19,7 +19,7 @@ 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>;
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts +1 -1
@@ -20,7 +20,7 @@ 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>;
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +2 -1
@@ -7,6 +7,7 @@ #include "rk3399.dtsi" #include "rk3399-opp.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> / { sdio_pwrseq: sdio-pwrseq {
@@ -522,7 +523,7 @@ 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>;
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 13 lines · Krzysztof Kozlowski
GPIO_ACTIVE_xflags 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:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags without affecting the code:
ACTIVE_HIGH=>IRQ_TYPE_NONESigned-off-by Krzysztof Kozlowski <[email protected]>---
Quoted 7 lines
Not tested on HW.
Changes since v1:
1. Correct title--- arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Hi,
Any comments/review/testing from Heiko or other Rockchip folks? Shall I cc here someone?
Best regards,
Krzysztof
Heiko Stübner
maintainerHi,
Am Freitag, 2. Oktober 2020, 18:11:28 CEST schrieb Krzysztof Kozlowski:
Quoted 22 lines · Krzysztof Kozlowski
Quoted 13 lines
GPIO_ACTIVE_xflags 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:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags without affecting the code:
ACTIVE_HIGH=>IRQ_TYPE_NONESigned-off-by Krzysztof Kozlowski <[email protected]>---
Quoted 7 lines
Not tested on HW.
Changes since v1:
1. Correct title--- arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 4 lines
Hi,
Any comments/review/testing from Heiko or other Rockchip folks? Shall I cc here someone?
I'm actually wondering about this ... I somehow remember writing a response, but don't see it in my history - so it might have gotten lost before I actually sent it.
I think the biggest issue I have is that none of that is tested on any hardware and looking at other brcm wifi drivers in the kernel, the interrupt polarity seems to be all over the place, some set it high, some low and I even have seen edge triggers.
As all changes are in regard to (copied) brcm wifi node, it would be really interesting to actually know what trigger is the right one.
I've Cc'ed Jagan who I think has worked on an affected board, maybe he can check which trigger is correct.
Heiko
Quoted 40 lines · Heiko Stübner
Hi,
Am Freitag, 2. Oktober 2020, 18:11:28 CEST schrieb Krzysztof Kozlowski:
Quoted 22 lines · Krzysztof Kozlowski
Quoted 13 lines
GPIO_ACTIVE_xflags 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:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags without affecting the code:
ACTIVE_HIGH=>IRQ_TYPE_NONESigned-off-by Krzysztof Kozlowski <[email protected]>---
Quoted 7 lines
Not tested on HW.
Changes since v1:
1. Correct title--- arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Quoted 4 lines
Hi,
Any comments/review/testing from Heiko or other Rockchip folks? Shall I cc here someone?
I'm actually wondering about this ... I somehow remember writing a response, but don't see it in my history - so it might have gotten lost before I actually sent it.
I think the biggest issue I have is that none of that is tested on any hardware and looking at other brcm wifi drivers in the kernel, the interrupt polarity seems to be all over the place, some set it high, some low and I even have seen edge triggers.
Quoted 5 lines
As all changes are in regard to (copied) brcm wifi node, it would be really interesting to actually know what trigger is the right one.
I've Cc'ed Jagan who I think has worked on an affected board, maybe he can check which trigger is correct.
Hi Heiko,
Nothing moved here since 2020 and the DTSes still have incorrect flags for interrupts.
I can rebase and resend (although maybe it still applies cleanly), but more important - is someone going to take this patch? or test it?
Best regards,
Krzysztof
Quoted 8 lines · Krzysztof Kozlowski
GPIO_ACTIVE_xflags 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:
1.GPIO_ACTIVE_HIGH= 0 =IRQ_TYPE_NONE
2.GPIO_ACTIVE_LOW= 1 =IRQ_TYPE_EDGE_RISINGCorrect the interrupt flags without affecting the code:
ACTIVE_HIGH=>IRQ_TYPE_NONE
Applied, thanks!
[1/2] ARM: dts: rk3188: correct interrupt flags
commit: 7e5a7e39d767b60d8631792bd3d7820a6f4a43f8
[2/2] arm64: dts: rk3399: correct interrupt flags
commit: 57f3b0bf5c346f73a848c3d74270b21ed110e530Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>