From patchwork Thu May 2 23:48:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2514191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id A41B4DF215 for ; Thu, 2 May 2013 23:50:23 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY3Fw-00055W-8w; Thu, 02 May 2013 23:49:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY3Fq-0004U5-Ic; Thu, 02 May 2013 23:49:38 +0000 Received: from mail-bk0-x234.google.com ([2a00:1450:4008:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY3Fd-0004Qu-8D for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 23:49:26 +0000 Received: by mail-bk0-f52.google.com with SMTP id q16so481822bkw.25 for ; Thu, 02 May 2013 16:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=uenNJ5VQRoCq6urMNxO+O1oChQJoDXes9ddqXsUvoNg=; b=pDIBoi6U91iOeUZ+QmPfLyNV7kax92OFgrHJ9+JNAxDo+QiQCNjJJRr8xfK614aL3J S28I8cTusZKQ2Cna1uIxKutQa5prPLK/+yr6wEBEw/twJbaBalaGRr7Gurhkow/27CHx r3B32KOfFEsCQuW1r8phODCUCcxBWaC6IKBzuXmVT0kAK2AHJUgypYQebzMbfYgbGMQ0 bJ/XqY3B/A53qNjAq+U/V/iFy2JiQA/9BHEBEmcwU/KgG4oxi6deuZtiQH6A3sSeSPEm 5dYaKq9laOSY/c/ROhqSmTlXrKQ0Az8CVK2wYQv792nFjFRkssExKgWZFK/ubvHsY6BK Ml8g== X-Received: by 10.204.188.17 with SMTP id cy17mr2722998bkb.114.1367538542174; Thu, 02 May 2013 16:49:02 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id jg3sm1873444bkb.0.2013.05.02.16.49.00 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 16:49:01 -0700 (PDT) Received: from edge.lan (magicgate.lan [192.168.1.1]) by topkick.lan (Postfix) with ESMTPSA id 556B960471; Fri, 3 May 2013 01:48:35 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v2 2/5] ARM: dove: add DT parsing for legacy mv643xx_eth Date: Fri, 3 May 2013 01:48:36 +0200 Message-Id: <1367538519-23940-3-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367538519-23940-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1367519104-19677-1-git-send-email-sebastian.hesselbarth@gmail.com> <1367538519-23940-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_194925_491437_4F113E51 X-CRM114-Status: GOOD ( 18.06 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , Arnd Bergmann , Jean-Francois Moine , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Jason Gunthorpe , Gregory Clement , Rob Landley , Grant Likely , Thomas Gleixner , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org To allow to move to orion irqchip driver, existing legacy devices have to map their irqs. This patch adds init code to map the corresponding irqs. It will vanish as soon as there is true device tree support for mv643xx_eth. Signed-off-by: Sebastian Hesselbarth --- Changelog: v1->v2: - split off DT changes (Suggested by Jason Cooper) Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Thomas Gleixner Cc: Russell King Cc: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn Cc: Jason Gunthorpe Cc: Thomas Petazzoni Cc: Gregory Clement Cc: Ezequiel Garcia Cc: Jean-Francois Moine Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-dove/board-dt.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index fbde1dd..9df6dd7 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,34 @@ static struct mv643xx_eth_platform_data dove_dt_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, }; +#define DOVE_GE00_PHYS_BASE 0xf1070000 + +static void __init dove_legacy_ge00_init(void) +{ + struct device_node *np = of_find_compatible_node(NULL, NULL, + "marvell,mv643xx-eth-block"); + int irq_sum, irq_err; + + if (!np) + return; + + irq_sum = irq_of_parse_and_map(np, 0); + if (!irq_sum) { + pr_err("%s: missing sum irq\n", np->full_name); + return; + } + + irq_err = irq_of_parse_and_map(np, 1); + if (!irq_err) { + pr_err("%s: missing err irq\n", np->full_name); + return; + } + + /* legacy ge00_init wants phys base */ + orion_ge00_init(&dove_dt_ge00_data, DOVE_GE00_PHYS_BASE, + irq_sum, irq_err, 1600); +} + static void __init dove_dt_init(void) { pr_info("Dove 88AP510 SoC\n"); @@ -70,7 +99,7 @@ static void __init dove_dt_init(void) dove_of_clk_init(); /* Internal devices not ported to DT yet */ - dove_ge00_init(&dove_dt_ge00_data); + dove_legacy_ge00_init(); dove_pcie_init(1, 1); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);