ARM: dts: Adjust moxart IRQ controller and flags

PATCH New Linus Walleij 2 participants 2 messages Mar 18, 2017 – Mar 22, 2017 Device tree bindings

Share & tools

Linus Walleij

author

2017-03-18 16:40 UTC #0 lore raw

PATCH 1/1 ARM: dts: Adjust moxart IRQ controller and flags

The moxart interrupt line flags were not respected in previous
driver: instead of assigning them per-consumer, a fixes mask was set in the controller.

With the migration to a standard Faraday driver we need to set up and handle the consumer flags correctly. Also remove the Moxart-specific flags when switching to using real consumer flags.

Extend the register window to 0x100 bytes as we may have a few more registers in there and it doesn't hurt.

Tested-by Jonas Jensen <[email protected]>

Signed-off-by Jonas Jensen <[email protected]>

Signed-off-by Linus Walleij <[email protected]>

---
ARM SoC folks: can you please apply this directly to whatever DTS branch is applicable for Moxart? We are switching to a generic Faraday Technology interrupt controller driver that actually make use of the trigger flags so this needs to be rectified.

---
 arch/arm/boot/dts/moxart-uc7112lx.dts |  2 +-
 arch/arm/boot/dts/moxart.dtsi         | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

arch/arm/boot/dts/moxart-uc7112lx.dts +1 -1

index 10d088df0c35..4a962a26482d 100644
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-/include/ "moxart.dtsi"
+#include "moxart.dtsi"
 
 / {
 	model = "MOXA UC-7112-LX";

arch/arm/boot/dts/moxart.dtsi +9 -8

index 10a8184e0ce9..e86f8c905ac5 100644
@@ -6,6 +6,7 @@
  */
 
 /include/ "skeleton.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	compatible = "moxa,moxart";

@@ -36,8 +37,8 @@
 		ranges;
 
 		intc: interrupt-controller at 98800000 {
-			compatible = "moxa,moxart-ic";
-			reg = <0x98800000 0x38>;
+			compatible = "moxa,moxart-ic", "faraday,ftintc010";
+			reg = <0x98800000 0x100>;
 			interrupt-controller;
 			#interrupt-cells = <2>;
 			interrupt-mask = <0x00080000>;

@@ -59,7 +60,7 @@
 		timer: timer at 98400000 {
 			compatible = "moxa,moxart-timer";
 			reg = <0x98400000 0x42>;
-			interrupts = <19 1>;
+			interrupts = <19 IRQ_TYPE_EDGE_FALLING>;
 			clocks = <&clk_apb>;
 		};

@@ -80,7 +81,7 @@
 		dma: dma at 90500000 {
 			compatible = "moxa,moxart-dma";
 			reg = <0x90500080 0x40>;
-			interrupts = <24 0>;
+			interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
 			#dma-cells = <1>;
 		};

@@ -93,7 +94,7 @@
 		sdhci: sdhci at 98e00000 {
 			compatible = "moxa,moxart-sdhci";
 			reg = <0x98e00000 0x5C>;
-			interrupts = <5 0>;
+			interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clk_apb>;
 			dmas =  <&dma 5>,
 				<&dma 5>;

@@ -120,7 +121,7 @@
 		mac0: mac at 90900000 {
 			compatible = "moxa,moxart-mac";
 			reg = <0x90900000 0x90>;
-			interrupts = <25 0>;
+			interrupts = <25 IRQ_TYPE_LEVEL_HIGH>;
 			phy-handle = <&ethphy0>;
 			phy-mode = "mii";
 			status = "disabled";

@@ -129,7 +130,7 @@
 		mac1: mac at 92000000 {
 			compatible = "moxa,moxart-mac";
 			reg = <0x92000000 0x90>;
-			interrupts = <27 0>;
+			interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
 			phy-handle = <&ethphy1>;
 			phy-mode = "mii";
 			status = "disabled";

@@ -138,7 +139,7 @@
 		uart0: uart at 98200000 {
 			compatible = "ns16550a";
 			reg = <0x98200000 0x20>;
-			interrupts = <31 8>;
+			interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift = <2>;
 			reg-io-width = <4>;
 			clock-frequency = <14745600>;

Signature · 1 line

2.9.3

Olof Johansson

Applied

2017-03-22 00:29 UTC #1 lore raw

PATCH 1/1 ARM: dts: Adjust moxart IRQ controller and flags

Quoted 15 lines · Linus Walleij

The moxart interrupt line flags were not respected in previous
driver: instead of assigning them per-consumer, a fixes mask was set in the controller.
With the migration to a standard Faraday driver we need to set up and handle the consumer flags correctly. Also remove the Moxart-specific flags when switching to using real consumer flags.
Extend the register window to 0x100 bytes as we may have a few more registers in there and it doesn't hurt.
Tested-by Jonas Jensen <[email protected]>
Signed-off-by Jonas Jensen <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Quoted 6 lines

---
ARM SoC folks: can you please apply this directly to whatever DTS branch is applicable for Moxart? We are switching to a generic Faraday Technology interrupt controller driver that actually make use of the trigger flags so this needs to be rectified.

Applied to next/dt, thanks.

-Olof