Commit c043dee9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: correct interrupt flags on rk3399 boards 



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

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200917185211.5483-2-krzk@kernel.org


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent a070d3b8

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+2 −1
Original line number Diff line number Diff line
@@ -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 <dt-bindings/usb/pd.h>

#include "rk3399.dtsi"
@@ -786,7 +787,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
Original line number Diff line number Diff line
@@ -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"
@@ -629,7 +630,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
Original line number Diff line number Diff line
@@ -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"
@@ -682,7 +683,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
Original line number Diff line number Diff line
@@ -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"
@@ -509,7 +510,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
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include "dt-bindings/pwm/pwm.h"

#include "dt-bindings/input/input.h"

#include <dt-bindings/interrupt-controller/irq.h>

#include "dt-bindings/usb/pd.h"

#include "rk3399.dtsi"

#include "rk3399-opp.dtsi"
@@ -735,7 +736,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>;