From patchwork Mon Jul 24 13:48:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9859437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D1CC60349 for ; Mon, 24 Jul 2017 13:52:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F27AF274A3 for ; Mon, 24 Jul 2017 13:52:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E711028409; Mon, 24 Jul 2017 13:52:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69382274A3 for ; Mon, 24 Jul 2017 13:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9uABMPl4fC4Jh60Ga59ajclH1Sf2NlRlbhD8M4w08II=; b=W43CkYiHwbXEvBYR0Jl/bnAN5E en3XSXQaib7MFMKiX+Eq2E4zCjZWKu+iF2e8uPDB/RWk0CTCshIPsV6r/Eb+h8KuH55bIiUsewft5 FLLS/38ec+8rZTwnGdvSzJkxk4jYjoyaPNhYS0FqCgnEA85+szGrzhS3tH4ZkzWVWHTK7l/fSWPFe KQFLgsmj2UzGecWghTXmEBQz44s3u7xgh7npt5Nz/NheDiqpj+MM1aAW6LWzr+NeXR1By8GKjsauL a9uYXLjrsBBC1xohGIhPA0VtPsnUJHLY+zaVWD2q6/sAiu9nvFMhmJfebzP+7p3XoPM7dogKnOoI0 FnFzcm5w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dZdmc-0007yV-2x; Mon, 24 Jul 2017 13:52:26 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dZdl2-0006Gm-BU for linux-arm-kernel@lists.infradead.org; Mon, 24 Jul 2017 13:50:53 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 7634B21E5A; Mon, 24 Jul 2017 15:50:03 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5019520DB8; Mon, 24 Jul 2017 15:50:03 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com Subject: [PATCH net-next 09/18] net: mvpp2: use named interrupts Date: Mon, 24 Jul 2017 15:48:39 +0200 Message-Id: <20170724134848.19330-10-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724134848.19330-1-antoine.tenart@free-electrons.com> References: <20170724134848.19330-1-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170724_065048_865055_0AC92D65 X-CRM114-Status: GOOD ( 11.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, netdev@vger.kernel.org, Antoine Tenart , linux@armlinux.org.uk, nadavh@marvell.com, stefanc@marvell.com, mw@semihalf.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch update the Marvell PPv2 driver to use named interrupts. A compatibility path is kept to allow using device trees using the old dt bindings. This change is needed as other interrupts will be used by the PPv2 driver at some point. Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvpp2.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index f6eb98d38ced..77eef2cc40a1 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -6789,10 +6789,20 @@ static int mvpp2_port_probe(struct platform_device *pdev, port = netdev_priv(dev); - port->irq = irq_of_parse_and_map(port_node, 0); - if (port->irq <= 0) { - err = -EINVAL; - goto err_free_netdev; + if (of_get_property(port_node, "interrupt-names", NULL)) { + port->irq = of_irq_get_byname(port_node, "rx-shared"); + if (port->irq <= 0) { + err = (port->irq == -EPROBE_DEFER) ? + -EPROBE_DEFER : -EINVAL; + goto err_free_netdev; + } + } else { + /* kept for dt compatibility */ + port->irq = irq_of_parse_and_map(port_node, 0); + if (port->irq <= 0) { + err = -EINVAL; + goto err_free_netdev; + } } if (of_property_read_bool(port_node, "marvell,loopback"))