Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2a736b6 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

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: default avatarJonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: default avatarJonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 223b9ad7

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

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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@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@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@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@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@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@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@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>;