From patchwork Thu Apr 19 20:36:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7962 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2DA1223E20 for ; Thu, 19 Apr 2012 20:37:17 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E7BCEA180E6 for ; Thu, 19 Apr 2012 20:37:16 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so16953504iag.11 for ; Thu, 19 Apr 2012 13:37:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=y+k1b9Nqo+WM/omB32HdZwCAk8GlCX3zIW2BJb7FdRs=; b=ABMnzOlAsKEE3DedJAObQM6lJm2wydS2Yg98TOU7zR+LojP3Ztl4LKUKwDJxwZvOM/ rjQIKBaVV+diN8ORi/dFE2QU/cK45FwCDyFs5MM/F8yIE4zOYbUYQOBwXgWrr0nQm7Wv sueWCSGxXt3/IWRwOr0SOWI07oTxaAzSUr37TaGoiB8am0mxI7nLYcthKKWeHw+3oON5 mnMqIS0m43D4eLPIRinW/HlU6aoUR5Q2vgk0x9xLgCDmeqbQnU82TALyKlcLKepr+06x QnBlPqc0nbx9ArNDot8AJq8zyVTFC+Hr+HvUbVDUIbZbH4SUttjBatiHiz1igQvt2gVr 36aQ== Received: by 10.43.52.74 with SMTP id vl10mr3007470icb.55.1334867836718; Thu, 19 Apr 2012 13:37:16 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp317251ibt; Thu, 19 Apr 2012 13:37:16 -0700 (PDT) Received: by 10.180.107.104 with SMTP id hb8mr8613670wib.8.1334867835486; Thu, 19 Apr 2012 13:37:15 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id l32si3780646weq.32.2012.04.19.13.37.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f172.google.com with SMTP id hj6so5508wib.13 for ; Thu, 19 Apr 2012 13:37:15 -0700 (PDT) Received: by 10.216.133.96 with SMTP id p74mr2207397wei.30.1334867834997; Thu, 19 Apr 2012 13:37:14 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id h8sm345540wix.4.2012.04.19.13.37.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:14 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk Cc: Lee Jones Subject: [PATCH 09/15] ARM: ux500: Correctly describe SMSC9115 for Snowball in DT Date: Thu, 19 Apr 2012 21:36:38 +0100 Message-Id: <1334867804-31942-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> References: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnY0kt441+1sgEufsq+JBQAXHSx2h9+8LmVYqZhhJxM5WHDvuakaAFea74+ZNMAvmuTUqkW Here we split the description of the external-bus@50000000 over two description files. In the more generic db8500 description file we only specify the external-bus. Normally this would be used to communicate with a NOR-flash device. On the Snowball however, the SMSC9115 Ethernet chip occupies it. In the Snowball board specific description file is where we actually specify that it is in fact the Ethernet device which lives here. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 9 +++++++++ arch/arm/boot/dts/snowball.dts | 10 +++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 9e8ff2c..f633210 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -307,5 +307,14 @@ interrupts = <0 100 0x4>; status = "disabled"; }; + + external-bus@50000000 { + compatible = "simple-bus"; + reg = <0x50000000 0x4000000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x50000000 0x4000000>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 22b82cc..56f8a76 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -72,15 +72,11 @@ soc-u9500 { external-bus@50000000 { - compatible = "simple-bus"; - reg = <0x50000000 0x10000000>; - #address-cells = <1>; - #size-cells = <1>; - ranges; + status = "okay"; - ethernet@50000000 { + ethernet@0 { compatible = "smsc,lan9115"; - reg = <0x50000000 0x10000>; + reg = <0 0x10000>; interrupts = <12 0x1>; interrupt-parent = <&gpio4>;