From patchwork Wed May 30 04:47:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9021 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 5F97723E58 for ; Wed, 30 May 2012 04:48:10 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2CBF5A18073 for ; Wed, 30 May 2012 04:48:10 +0000 (UTC) Received: by yenq6 with SMTP id q6so3248783yen.11 for ; Tue, 29 May 2012 21:48:09 -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=UOKRSLfMOs0EFSEsoLgFUrveuHPA+/dXFfS1BB3v1Tg=; b=kFsMDsjbDFi4hW2AOiLkCc1/wCIgj5iqaT407Y51tsgo0+eNU7kL8lxM0Bb7AB2SkJ 3Fvbu6Y4Vj9jINV03VC4Bsy/D2XtAXS3tIiPYcFqLolaAqb//Ctr6H01hdHy5WzPlfP7 q65CIn3ddPl5MXoCem4QfWuXce7AJ+nd8r4MdGrzpT2QaTKDN7pBMunHwJICXQDHH5rl TMdUscldDEHzJIfEx2lMtEGzjEBo26m6Z8BonhcuJ2peuq5JNyuS4zXVrxMHkIERi0SG iHx/dBmpk7acZ0UXnJiXhPOTIPejYjDQimlF0UGvmhcdEFvW9BfKeXKwyQtAAoWR69Ux GZgQ== Received: by 10.42.89.72 with SMTP id f8mr8530919icm.33.1338353289418; Tue, 29 May 2012 21:48:09 -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 v20csp170229ibb; Tue, 29 May 2012 21:48:08 -0700 (PDT) Received: by 10.68.231.40 with SMTP id td8mr46188984pbc.150.1338353288768; Tue, 29 May 2012 21:48:08 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id ku9si15135999pbc.355.2012.05.29.21.48.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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-pz0-f50.google.com with SMTP id h15so7270112dan.37 for ; Tue, 29 May 2012 21:48:08 -0700 (PDT) Received: by 10.68.218.7 with SMTP id pc7mr45155460pbc.88.1338353288540; Tue, 29 May 2012 21:48:08 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:07 -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 03/22] ARM: ux500: Disable SMSC911x platform code registration when DT is enabled Date: Wed, 30 May 2012 12:47:21 +0800 Message-Id: <1338353260-10097-4-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: ALoCoQlfKOfykpzPyRrhc4XBG4+f0wDAjla/zofq4cSqwbMaG6kG7ppbBU5KZXAflmijpFB67kCr Now the SCMC911x is correctly enabled in Device Tree, there is no need to continue registering it from platform code. In fact, if we continue doing so, the system will throw an error on boot. Acked-by: Linus Walleij Signed-off-by: Arnd Bergmann Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index ff04010..f8e0f1d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -679,7 +679,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, }; @@ -887,7 +886,7 @@ static void __init u8500_init_machine(void) * Devices to be DT:ed: * snowball_led_dev = todo * snowball_key_dev = todo - * snowball_sbnet_dev = todo + * snowball_sbnet_dev = done * ab8500_device = todo */ platform_add_devices(snowball_of_platform_devs,