From patchwork Fri Oct 31 20:45:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 39981 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5E5782405B for ; Fri, 31 Oct 2014 20:48:36 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id n3sf1072516wiv.5 for ; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=qV/H99lZ1jFl8vYjgHuqdB3/qxx0N2B/gSKvZUuDEZ8=; b=QgHBRnlYm2T9OaUFHPI50xEY5O+d0m9CBzQ80W1mp2TcGa+f7K++CSByCJZUg/D3qs HAbvetpDL+T9q7APHGp/rKix8mxkfSgltI9z7AmdcdIbLR//Daxdh80Zx98lTPJAIBwZ qtB5ObC8j2FGpno1qF0RqUHvPpUTBljBR0ePXyi0a7FPy9W7dnOKttEyOEPMdHuDn24X VfJAkNmShYjGKGOLjgC8xU9w5t329rDGwWFvK0fFUd5QxvHALtJ7POEUOXkfXWLqtM3G LdDrrX04cWwtufpzif0CKQrUoBs8g+xWdo4opOWE9BouqGRWnw1krX/CfCtOyvQevf30 ZFaA== X-Gm-Message-State: ALoCoQleGX08hZdlkRkhGm3IZyVBQnxVsVGDwyYzaiOVCuM85ABXFvbX265GTQcT2+l+GYaicieA X-Received: by 10.181.29.105 with SMTP id jv9mr1003949wid.1.1414788515533; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.200 with SMTP id v8ls314535lag.25.gmail; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) X-Received: by 10.153.11.133 with SMTP id ei5mr29342541lad.75.1414788515209; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id ca5si16973808lad.118.2014.10.31.13.48.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 13:48:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id gd6so5609833lab.6 for ; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr28919652lbw.66.1414788515133; Fri, 31 Oct 2014 13:48:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp258715lbz; Fri, 31 Oct 2014 13:48:34 -0700 (PDT) X-Received: by 10.66.120.202 with SMTP id le10mr4942192pab.86.1414788511815; Fri, 31 Oct 2014 13:48:31 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wu4si10131077pbc.19.2014.10.31.13.48.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:48:31 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ65-0000ZC-1T; Fri, 31 Oct 2014 20:47:01 +0000 Received: from mail-la0-f48.google.com ([209.85.215.48]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XkJ5f-0000Md-FZ for linux-arm-kernel@lists.infradead.org; Fri, 31 Oct 2014 20:46:36 +0000 Received: by mail-la0-f48.google.com with SMTP id gq15so7001204lab.35 for ; Fri, 31 Oct 2014 13:46:12 -0700 (PDT) X-Received: by 10.112.150.136 with SMTP id ui8mr29209347lbb.60.1414788372709; Fri, 31 Oct 2014 13:46:12 -0700 (PDT) Received: from localhost.localdomain (c83-254-157-117.bredband.comhem.se. [83.254.157.117]) by mx.google.com with ESMTPSA id 8sm3087368lav.15.2014.10.31.13.46.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Oct 2014 13:46:11 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] ARM: nomadik: push ethernet down to board Date: Fri, 31 Oct 2014 21:45:34 +0100 Message-Id: <1414788335-28334-5-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1414788335-28334-1-git-send-email-linus.walleij@linaro.org> References: <1414788335-28334-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141031_134635_747177_E5E5D637 X-CRM114-Status: GOOD ( 14.90 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.48 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.48 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The SoC file defines the location and type of the ethernet adapter, this should be in the per-board file, as it is by no means necessary to have an ethernet adapter connected to this memory space. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-s8815.dts | 24 ++++++++++++++++-------- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 12 ------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 33caad8df276..e411ff7769fe 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -4,6 +4,7 @@ */ /dts-v1/; +#include #include "ste-nomadik-stn8815.dtsi" / { @@ -14,14 +15,6 @@ 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>; - }; - }; - src@101e0000 { /* These chrystal drivers are not used on this board */ disable-sxtalo; @@ -73,6 +66,21 @@ }; }; + /* Ethernet */ + external-bus@34000000 { + compatible = "simple-bus"; + reg = <0x34000000 0x1000000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x34000000 0x1000000>; + ethernet@300 { + compatible = "smsc,lan91c111"; + reg = <0x300 0x0fd00>; + interrupt-parent = <&gpio3>; + interrupts = <8 IRQ_TYPE_EDGE_RISING>; + }; + }; + /* GPIO I2C connected to the USB portions of the STw4811 only */ gpio-i2c { compatible = "i2c-gpio"; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index c638c1ce2fc4..f435ff20aefe 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -673,18 +673,6 @@ }; }; - external-bus@34000000 { - compatible = "simple-bus"; - reg = <0x34000000 0x1000000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x34000000 0x1000000>; - ethernet@300 { - compatible = "smsc,lan91c111"; - reg = <0x300 0x0fd00>; - }; - }; - /* I2C0 connected to the STw4811 power management chip */ i2c0 { compatible = "st,nomadik-i2c", "arm,primecell";