From patchwork Sat May 18 22:47:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2589481 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 04D81DF2E5 for ; Sat, 18 May 2013 22:48:18 +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 1UdpvC-0005YW-0A; Sat, 18 May 2013 22:48:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Udpv9-0005Gz-92; Sat, 18 May 2013 22:48:11 +0000 Received: from mail-lb0-f171.google.com ([209.85.217.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Udpv6-0005Ge-F7 for linux-arm-kernel@lists.infradead.org; Sat, 18 May 2013 22:48:09 +0000 Received: by mail-lb0-f171.google.com with SMTP id v20so5503066lbc.16 for ; Sat, 18 May 2013 15:47:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=heQY0O2Ezm5iT4z6GDupJZS1MQLpQDRM4XuKlQQxjfc=; b=fk8daF4j6mqmNg4I1taHQTpl7kCoAB4IAtCRsn16Gq8Q8h1Bef/nnuKlI/wvun/eT8 ntWlgNKqkdkaNHaWDnUD9m2nml5rva5sGK/8zlI2YeTmwF3KfV2CagYbKvMgkG8jgfTM +Kl4Zh2A6rhbbkciMLfbcy/4ue+HuBjiNW6/cOOvc74sa5v1qGGf7Y0CB1j6h1wsSycE 6TglCrwovsgJQZsa8cqGCf0tVfrbtBXvDEBX7YoWhpWdXdgAmBD29Hx/ve0t+96sB+lt lB7GlGhABFdhdTTodVy7yYM9T0aDQ7+OBQfB8PyWZcAO4iXBY73SYH0mI85hffkXxc3B jphQ== X-Received: by 10.112.171.169 with SMTP id av9mr570022lbc.130.1368917266165; Sat, 18 May 2013 15:47:46 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-67.bredband.comhem.se. [83.249.208.67]) by mx.google.com with ESMTPSA id je10sm2855817lbc.3.2013.05.18.15.47.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 18 May 2013 15:47:45 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: nomadik: fix IRQ assignment for SMC ethernet Date: Sun, 19 May 2013 00:47:39 +0200 Message-Id: <1368917259-7883-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Gm-Message-State: ALoCoQnl1BUvfyv+5tceP240E9hj/ORViZYa2QHq4BfjvS4SVg5B5ngsEwncOownYkruJ9Q8nkBz X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130518_184808_682820_DA16B738 X-CRM114-Status: GOOD ( 12.36 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij , 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 The assignment of IRQ for the SMC91x ethernet adapter had two problems making it non-working: - It was not put into the ethernet device node. Let's do this by using the board-specific overlay, so we can make other overlays on other Nomadik boards. - The IRQ number was actually completely wrong, this was the number for NHK8815, not S8815. After this ethernet starts working on the USB S8815. Signed-off-by: Linus Walleij --- ARM SoC folks: I would appreciate if you apply this patch directly for v3.10 fixes. --- arch/arm/boot/dts/ste-nomadik-s8815.dts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index b28fbf3..6f82d93 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -14,13 +14,19 @@ bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk"; }; + /* This is where the interrupt is routed on the S8815 board */ + external-bus@34000000 { + ethernet@300 { + interrupt-parent = <&gpio3>; + interrupts = <8 0x1>; + }; + }; + /* Custom board node with GPIO pins to active etc */ usb-s8815 { /* The S8815 is using this very GPIO pin for the SMSC91x IRQs */ ethernet-gpio { - gpios = <&gpio3 19 0x1>; - interrupts = <19 0x1>; - interrupt-parent = <&gpio3>; + gpios = <&gpio3 8 0x1>; }; /* This will bias the MMC/SD card detect line */ mmcsd-gpio {