From patchwork Thu Apr 19 20:36:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7960 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 0037A23E20 for ; Thu, 19 Apr 2012 20:37:14 +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 BBD51A180E6 for ; Thu, 19 Apr 2012 20:37:13 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so16953504iag.11 for ; Thu, 19 Apr 2012 13:37:13 -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=h0hG7r0wDqxr3Rjs86dXKu7AjmqVcjkDAJJp4Gi4Ad4=; b=ZEH0ZnYzwa1NTM1hBuwH2kEDJspCB03EEzf6TyuYYl6qVu131+g4aAZvOJKc8vTW8E COz8qwdxCgsJvTf7k1pzIjfoa1TEp+jvvNRGtXVB5+j8MwizN1fKhz3mdN0eQG0ath13 v/d+Gjz0hS3SITEpGpVG1yMJBL/xnAbO+VqCGVLgWmm91xUWyDeWhF1zV0EiFws2AiB/ f4APrF+fq53XkRzVcfk9aqUWLGDn0mB2Y0RdgkidgsTrY+X/JEfWGN2W85JxqVKsY4v9 YRQ71uByokhg1VupuUx4Ri0lMqpnDTK6hKV9qas9IF2vrDP141/NIliMbXkH1F64FQzW jALg== Received: by 10.50.194.163 with SMTP id hx3mr8128777igc.49.1334867833537; Thu, 19 Apr 2012 13:37:13 -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 x6csp317236ibt; Thu, 19 Apr 2012 13:37:12 -0700 (PDT) Received: by 10.216.205.93 with SMTP id i71mr2167544weo.51.1334867831774; Thu, 19 Apr 2012 13:37:11 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id d7si108054wid.26.2012.04.19.13.37.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:11 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.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-we0-f178.google.com with SMTP id a13so7716743wer.37 for ; Thu, 19 Apr 2012 13:37:11 -0700 (PDT) Received: by 10.180.104.65 with SMTP id gc1mr8591090wib.13.1334867831283; Thu, 19 Apr 2012 13:37:11 -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.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:10 -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 07/15] ARM: ux500: Enable the SMSC9115 on Snowball via Device Tree Date: Thu, 19 Apr 2012 21:36:36 +0100 Message-Id: <1334867804-31942-8-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: ALoCoQl62OfOwMs0ZgGgB6mjVdVpqudcKTPENKxktXn5KydNZWqN8Bcv9ewIoSXhpKM+TibBKep8 Enable the Ethernet port by providing correct information via DT. Signed-off-by: Lee Jones --- arch/arm/boot/dts/snowball.dts | 10 ++++++++-- arch/arm/mach-ux500/board-mop500.c | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 0ba0955..22b82cc 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -79,10 +79,16 @@ ranges; ethernet@50000000 { - compatible = "smsc,9111"; + compatible = "smsc,lan9115"; reg = <0x50000000 0x10000>; - interrupts = <12 0x4>; + interrupts = <12 0x1>; interrupt-parent = <&gpio4>; + + reg-shift = <1>; + reg-io-width = <2>; + smsc,force-internal-phy; + smsc,irq-active-high; + smsc,irq-push-pull; }; }; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 50809af..9dbd34b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -612,7 +612,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = { static struct platform_device *snowball_of_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, - &snowball_sbnet_dev, &ab8500_device, };