Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Linus Walleij <linus.walleij@linaro.org>,
        Jonas Jensen <jonas.jensen@gmail.com>,
        Olof Johansson <olof@lixom.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 3.18 12/63] ARM: dts: Adjust moxart IRQ controller
 and flags
Thread-Topic: [PATCH AUTOSEL for 3.18 12/63] ARM: dts: Adjust moxart IRQ
 controller and flags
Thread-Index: AQHTsz+f48pSv4kpDkCxcMm7mZ6Zlw==
Date:   Sat, 3 Mar 2018 22:33:15 +0000
Message-ID: <20180303223228.27323-12-alexander.levin@microsoft.com>
References: <20180303223228.27323-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303223228.27323-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 97c57687-cbe7-4692-58d7-08d58157d65c
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:33:15.9816
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0940
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Linus Walleij <linus.walleij@linaro.org>

[ Upstream commit c2a736b698008d296c5010ec39077eeb5796109f ]

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 <jonas.jensen@gmail.com>
Signed-off-by: Jonas Jensen <jonas.jensen@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 arch/arm/boot/dts/moxart-uc7112lx.dts |  2 +-
 arch/arm/boot/dts/moxart.dtsi         | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/moxart-uc7112lx.dts b/arch/arm/boot/dts/moxa=
rt-uc7112lx.dts
index 10d088df0c35..4a962a26482d 100644
--- a/arch/arm/boot/dts/moxart-uc7112lx.dts
+++ b/arch/arm/boot/dts/moxart-uc7112lx.dts
@@ -6,7 +6,7 @@
  */
=20
 /dts-v1/;
-/include/ "moxart.dtsi"
+#include "moxart.dtsi"
=20
 / {
 	model =3D "MOXA UC-7112-LX";
diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi
index 1fd27ed65a01..64f2f44235d0 100644
--- a/arch/arm/boot/dts/moxart.dtsi
+++ b/arch/arm/boot/dts/moxart.dtsi
@@ -6,6 +6,7 @@
  */
=20
 /include/ "skeleton.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
=20
 / {
 	compatible =3D "moxa,moxart";
@@ -36,8 +37,8 @@
 		ranges;
=20
 		intc: interrupt-controller@98800000 {
-			compatible =3D "moxa,moxart-ic";
-			reg =3D <0x98800000 0x38>;
+			compatible =3D "moxa,moxart-ic", "faraday,ftintc010";
+			reg =3D <0x98800000 0x100>;
 			interrupt-controller;
 			#interrupt-cells =3D <2>;
 			interrupt-mask =3D <0x00080000>;
@@ -59,7 +60,7 @@
 		timer: timer@98400000 {
 			compatible =3D "moxa,moxart-timer";
 			reg =3D <0x98400000 0x42>;
-			interrupts =3D <19 1>;
+			interrupts =3D <19 IRQ_TYPE_EDGE_FALLING>;
 			clocks =3D <&clk_apb>;
 		};
=20
@@ -80,7 +81,7 @@
 		dma: dma@90500000 {
 			compatible =3D "moxa,moxart-dma";
 			reg =3D <0x90500080 0x40>;
-			interrupts =3D <24 0>;
+			interrupts =3D <24 IRQ_TYPE_LEVEL_HIGH>;
 			#dma-cells =3D <1>;
 		};
=20
@@ -93,7 +94,7 @@
 		sdhci: sdhci@98e00000 {
 			compatible =3D "moxa,moxart-sdhci";
 			reg =3D <0x98e00000 0x5C>;
-			interrupts =3D <5 0>;
+			interrupts =3D <5 IRQ_TYPE_LEVEL_HIGH>;
 			clocks =3D <&clk_apb>;
 			dmas =3D  <&dma 5>,
 				<&dma 5>;
@@ -120,7 +121,7 @@
 		mac0: mac@90900000 {
 			compatible =3D "moxa,moxart-mac";
 			reg =3D <0x90900000 0x90>;
-			interrupts =3D <25 0>;
+			interrupts =3D <25 IRQ_TYPE_LEVEL_HIGH>;
 			phy-handle =3D <&ethphy0>;
 			phy-mode =3D "mii";
 			status =3D "disabled";
@@ -129,7 +130,7 @@
 		mac1: mac@92000000 {
 			compatible =3D "moxa,moxart-mac";
 			reg =3D <0x92000000 0x90>;
-			interrupts =3D <27 0>;
+			interrupts =3D <27 IRQ_TYPE_LEVEL_HIGH>;
 			phy-handle =3D <&ethphy1>;
 			phy-mode =3D "mii";
 			status =3D "disabled";
@@ -138,7 +139,7 @@
 		uart0: uart@98200000 {
 			compatible =3D "ns16550a";
 			reg =3D <0x98200000 0x20>;
-			interrupts =3D <31 8>;
+			interrupts =3D <31 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift =3D <2>;
 			reg-io-width =3D <4>;
 			clock-frequency =3D <14745600>;
--=20
2.14.1