From patchwork Tue Apr 17 10:43:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7894 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 C7DEE23E00 for ; Tue, 17 Apr 2012 10:44:53 +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 87C8CA1841B for ; Tue, 17 Apr 2012 10:44:53 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12004590iag.11 for ; Tue, 17 Apr 2012 03:44:53 -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=siZctcWw8FVTYWAVAlY8iNgvxJP2xGFgmuxWor008ps=; b=WKilOHRteZ5EFNrTpHre5ZkHJkPz9E9IGTShAc6/LZLiGSdmKGs+V9fxfCfCLCVaGr HqvbJ9c5FnMmTcApsH10umRM1RSJVBedK50Z3qRVCqd2OkIyLgURj0fdUSiVTVTLmKEO IEpUdAoeQPInwpW7qYwMhlcLfMZ3AyC5YUP8d/XVP73thPXpvqVCg5nrLtAf8WclR0Wa EMv31N4FBNJnGanzFQQGAdA1Rf90kieAZbfSIKdRny318IEskaUFUJLQF6H3pGwWkuX+ /66GgkU1S1cF7OH4XQIiYAyR47uROoOcQMRIMiuYtBFokjQMJG+LxDJRpuTbcBcNvsPr rTEA== Received: by 10.43.52.74 with SMTP id vl10mr9510243icb.55.1334659493337; Tue, 17 Apr 2012 03:44:53 -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 x6csp138699ibt; Tue, 17 Apr 2012 03:44:52 -0700 (PDT) Received: by 10.180.76.240 with SMTP id n16mr27179981wiw.10.1334659492163; Tue, 17 Apr 2012 03:44:52 -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 l12si11620543wiw.12.2012.04.17.03.44.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:52 -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 wera13 with SMTP id a13so5368067wer.37 for ; Tue, 17 Apr 2012 03:44:51 -0700 (PDT) Received: by 10.216.134.41 with SMTP id r41mr9142255wei.13.1334659491629; Tue, 17 Apr 2012 03:44:51 -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.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:50 -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 07/16] ARM: ux500: Enable the SMSC9115 on Snowball via Device Tree Date: Tue, 17 Apr 2012 11:43:59 +0100 Message-Id: <1334659448-11521-8-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: ALoCoQkVnWFjI06PHmEs4MYU7WzZ3wzBp3h0FBOeGynmYzeBS7YHkBWJQJ1T+tgTFOAH8Q6fNkkw 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 29fec0f..a46345e 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, };