From patchwork Fri May 18 08:39:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8801 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 446B723E23 for ; Fri, 18 May 2012 08:39:53 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0FB66A1819F for ; Fri, 18 May 2012 08:39:52 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so3204914ggn.11 for ; Fri, 18 May 2012 01:39:52 -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=1sIMBcdNIYOMvdkxZiUvCTzxp329erPYjODybqW2tYY=; b=aeJVtcpejs3tsKr8TtWxuZHmqjejaPIbU7oJeLncrg1rjErbP81OTL8U0GA8GcwxKh kt2hItHRAOTN/Hh5q2ZWpaWNrQJVk0F41gVyO1ceBppUdYyXLBraAViQAYNhck0v4gpe cQt+4aHRE5nVsb9Wxurlm6a9w2CS2dhjY2qC7yDl7zdV/a/Nfbe608Pd1Mrft4L9ZL2W V0hksGwIR18wqIGGMIH4dCxnLlMEbuySgv24SJjcna4sgZFywBfeOTwrWm3+kHo5xKl+ 2Ok7UNxo1JJKGKpXckm50ZKMRVFZX7JPQFuNxbTY1i79zB11TDvu+2IaftYO+9kgUqgp R08A== Received: by 10.50.222.202 with SMTP id qo10mr16006062igc.0.1337330392574; Fri, 18 May 2012 01:39:52 -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.35.72 with SMTP id o8csp86482ibd; Fri, 18 May 2012 01:39:51 -0700 (PDT) Received: by 10.180.80.104 with SMTP id q8mr26020953wix.14.1337330391449; Fri, 18 May 2012 01:39:51 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id o43si10523287wee.144.2012.05.18.01.39.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 May 2012 01:39:51 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-wg0-f50.google.com with SMTP id ds11so2667382wgb.31 for ; Fri, 18 May 2012 01:39:51 -0700 (PDT) Received: by 10.216.141.226 with SMTP id g76mr6505771wej.67.1337330390879; Fri, 18 May 2012 01:39:50 -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 bn9sm63091322wib.5.2012.05.18.01.39.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 May 2012 01:39:50 -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, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com Cc: Lee Jones Subject: [PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots Date: Fri, 18 May 2012 09:39:15 +0100 Message-Id: <1337330355-17747-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337330355-17747-1-git-send-email-lee.jones@linaro.org> References: <1337330355-17747-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmM19fRFgkq3vcsWXn1sZTGHJDwBuj/8BfUEc/0NBo7g4C8zDnRjFcz73jGg5rmijjDxtGF The patch to disable SMSC911x registration was applied twice in the upstream kernel by mistake. Git interpreted this as 'take the same entry from a similar struct' which was close by. This was the wrong thing to do. This patch rectifies this error and re-enables SMSC911x registration when Device Tree is not enabled. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 33d47e1..2ddbb87 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -596,6 +596,7 @@ static void __init mop500_uart_init(struct device *parent) static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, + &snowball_sbnet_dev, &ab8500_device, };