Received: by 10.213.65.68 with SMTP id h4csp1772063imn; Mon, 19 Mar 2018 12:51:08 -0700 (PDT) X-Google-Smtp-Source: AG47ELuJkjsIoihPP+RwxDvTV06tAWgNuPZ+Ua4g3Y4lTzOnIUZagq/6GKXyopdL6LT/WT1qLsqJ X-Received: by 2002:a17:902:51cb:: with SMTP id y69-v6mr4429094plh.155.1521489068812; Mon, 19 Mar 2018 12:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521489068; cv=none; d=google.com; s=arc-20160816; b=QteoOycF8SLyzl5GbUWr43xu4KkL6zDpCu2mtKx1/TPPXHuLvbj2ZAlQoDkBq8s+hw wTfm7A6IiZL8QGsqxBHy91iXXIb8LfMYdEYmjMNAljjh/Sws7jmPdrl5Rrji0wUaE1Tb ePgQ/QK1agiq68jiI/Tg9xOorXjVUQLypn2P3SNzOGvHmhHojUef4IlTvNMpjHZkmAPP 3vyvC2kLvw3G1+SrCm5wDDPlcP+LqzC63JSpfRUXJjW9xZWqnZY1CXAvmEh4a91c6A50 J2PGbXM3K3kNXahyXvIs9tIMScaHOMjywTPhBTNn42M0T7HZDwOXJds+8ANOamMPbv/H DgVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gkCJWN55E+IiYKprfB5HBKA+fhQFGQBnHVypWP/kLyE=; b=DNrxHFNwnQZkJcWsTJ/xiqzk3Mxogrfs/L3EhAA+8G/9ep8DsjqsaMF/nIDpLnS8Bl 08cxoZhMQ8gqav9RBq6Dk8m24y5pvKMOFMx+WGoPsqgYKj3ODhxBkYl3eIo1Q3WOZmnk 8Rk/iSubyfTR8yaScLnWx/oQQa05210QaidhhTmHs0T00mH9OC7jhjGyWlyetHGkBypL +ZWxZrUJziUByk0DEHq75T+oKM5cUlmdMlt0xLgc+J5zv2jHQxRw7CMArBAS1eH3WotW CTOqgHsTNfZ/0pkYEizL0DeaCF7uNS1fXvUz0NjciLtOaohl8b/RQiOCRFzOSFyv3zKC nzzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n23-v6si540800pll.175.2018.03.19.12.50.54; Mon, 19 Mar 2018 12:51:08 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030960AbeCSSUD (ORCPT + 99 others); Mon, 19 Mar 2018 14:20:03 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47420 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030937AbeCSSTx (ORCPT ); Mon, 19 Mar 2018 14:19:53 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id C105511A2; Mon, 19 Mar 2018 18:19:51 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonas Jensen , Linus Walleij , Olof Johansson , Sasha Levin Subject: [PATCH 4.9 045/241] ARM: dts: Adjust moxart IRQ controller and flags Date: Mon, 19 Mar 2018 19:05:10 +0100 Message-Id: <20180319180753.060143251@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ 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 Signed-off-by: Jonas Jensen Signed-off-by: Linus Walleij Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -6,7 +6,7 @@ */ /dts-v1/; -/include/ "moxart.dtsi" +#include "moxart.dtsi" / { model = "MOXA UC-7112-LX"; --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -6,6 +6,7 @@ */ /include/ "skeleton.dtsi" +#include / { 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 = <ðphy0>; 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 = <ðphy1>; 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>;