From patchwork Tue Apr 17 10:44:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7896 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 DB68D23E00 for ; Tue, 17 Apr 2012 10:45:01 +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 9F6E6A181C2 for ; Tue, 17 Apr 2012 10:45:01 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12004590iag.11 for ; Tue, 17 Apr 2012 03:45:01 -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=Jn6/m3zfWm8BUD+bXT1FkWD3t9q1l0g6Qn4KrQ1TETX9f7dETsti3NfvbCPvt9yT8t N2PtwXhA8Unt1HtRhhBqk0r4aimptTROjdCb/QWBWGc5YZjU9dZq2CIyVAjlKYbu5hJr KVEhEcsV1pWLPWruCFeY0lmks1cUlE8Jy7ZKR4PG65AM/KVp0dHI0ksKw6p50MnF40UJ d2hIaV74iH1qJc3kgRBuog+LhQVZ+XDLRx/WN5APYUCjamw71LXfVCEoIpMfkqdxxKNM Qalx1oplN2Smu2IkRYKsOJ1eme6P83c8N0J7bUm/yB7K0BzA57NKzuGictAgDjXNhaNy E19g== Received: by 10.50.194.163 with SMTP id hx3mr8623015igc.49.1334659501381; Tue, 17 Apr 2012 03:45:01 -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 x6csp138706ibt; Tue, 17 Apr 2012 03:45:00 -0700 (PDT) Received: by 10.180.102.3 with SMTP id fk3mr27375462wib.9.1334659500224; Tue, 17 Apr 2012 03:45:00 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id g51si21466178wee.30.2012.04.17.03.44.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:45:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 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-f178.google.com with SMTP id hq7so368069wib.13 for ; Tue, 17 Apr 2012 03:44:59 -0700 (PDT) Received: by 10.180.82.136 with SMTP id i8mr27043111wiy.19.1334659499685; Tue, 17 Apr 2012 03:44:59 -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 fn2sm42069492wib.0.2012.04.17.03.44.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:59 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk, Lee Jones Subject: [PATCH 09/16] ARM: ux500: Correctly describe SMSC9115 for Snowball in DT Date: Tue, 17 Apr 2012 11:44:01 +0100 Message-Id: <1334659448-11521-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> References: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnMEaz5sBfpD/an7p7oM5PAj2qdyh/1tX4JzOTC5aRDFA0f2phbJmhLmGl/BGgxA4S6/eHE 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>;