From patchwork Wed May 30 04:47:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9024 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 2C77523E58 for ; Wed, 30 May 2012 04:48:19 +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 E9723A185A7 for ; Wed, 30 May 2012 04:48:18 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so3863277ggn.11 for ; Tue, 29 May 2012 21:48:18 -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=kVlqkEnCWIq0hHSeQzdSkHt6ST1kzq6iMTi3WHoYI+Y=; b=kX2OUXdmamvvSuatkDrVde0RGxE9MPZcygiAaDlLgQkTE7V8qyTd4AiS1biHTAfucP YIDnm2hGj+5oaBYDV2HbMddXibplbv4zS6SKlKsJhaQ5DdezGdcYl8PGkYNB9diAx6uI 3nHwYQVhqWBJZBR1sZjpUdOrfh3koAdez5eHC6X+efUeoYhaZwgmvYzFL1FMEKrQodNk jGvN8m1AI8FSKa6fwp1IOvLqm7AY/Jm2W66Vc/OjZjmRSasn6MvfwyPgKvqB2RSf3nuz 95xzjcmGsGP9gH65iXWU4ApA3v1e9zZgbMxb65bBszrcYBrRdl4YnZgDOi2DU+iZhCJ4 YMBA== Received: by 10.50.40.193 with SMTP id z1mr9542793igk.0.1338353298327; Tue, 29 May 2012 21:48:18 -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.24.148 with SMTP id v20csp170242ibb; Tue, 29 May 2012 21:48:17 -0700 (PDT) Received: by 10.68.200.104 with SMTP id jr8mr46419426pbc.9.1338353297598; Tue, 29 May 2012 21:48:17 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id ic5si23533843pbc.267.2012.05.29.21.48.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.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-pb0-f50.google.com with SMTP id rr4so7848934pbb.37 for ; Tue, 29 May 2012 21:48:17 -0700 (PDT) Received: by 10.68.241.8 with SMTP id we8mr44570420pbc.130.1338353297205; Tue, 29 May 2012 21:48:17 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:16 -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 06/22] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots Date: Wed, 30 May 2012 12:47:24 +0800 Message-Id: <1338353260-10097-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> References: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlUOjlUqP4n6c1MUnxxo3jQlR/JCAO3sp0CB4dyePJi9bwcMGF/fjCT/6YKMG9MbSLLT6Ou 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 f8e0f1d..aecb0e1 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -673,6 +673,7 @@ static void __init u8500_cryp1_hash1_init(struct device *parent) static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, + &snowball_sbnet_dev, &ab8500_device, };