From patchwork Thu Jul 5 13:06:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9847 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 280EA23E16 for ; Thu, 5 Jul 2012 13:06:45 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id EBDBCA182CE for ; Thu, 5 Jul 2012 13:06:44 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so8814614yhp.11 for ; Thu, 05 Jul 2012 06:06:44 -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=VHlTcpT+YG8hQYmd6jgC4cu9BMGWydzIK4Cw73mRoMQ=; b=IycSqenPfW6yYYLq++CCgX2IlGgLGfILpGMvuGRT/yUgsSf6T+fxHmJSQIJIVIfEat aeV9fjJmG8n/RtPuWDmKMYBWwnjKgSAZqer7IJdynRozCV8HXb/kYbsL9xdU5jIM7jhk 1qCFiRWfk4Wpu4zvpGfmNSBEtN2g6BJLgYD53ki/6h6iFrceXE89A954PZGwp5YAwUx/ NXuqFWZp3agxpKYpnHNhYzzrcCjh8hVsJJU5QLaOMSPYeRl9jLYGQyEZ5lUgFuY+yPYz c3ziPpjqA6+NVtT9uPM8QGofSFmznCD5dXPKcaMBo/ISqvq7QgbnJuvlaeezhjgJTvwi JHUA== Received: by 10.42.89.72 with SMTP id f8mr13496423icm.33.1341493604507; Thu, 05 Jul 2012 06:06:44 -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 v20csp65217ibb; Thu, 5 Jul 2012 06:06:43 -0700 (PDT) Received: by 10.216.218.220 with SMTP id k70mr3872605wep.165.1341493603389; Thu, 05 Jul 2012 06:06:43 -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 j8si5241730wek.25.2012.07.05.06.06.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:43 -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 wgbds11 with SMTP id ds11so8111009wgb.31 for ; Thu, 05 Jul 2012 06:06:42 -0700 (PDT) Received: by 10.180.105.135 with SMTP id gm7mr48532994wib.10.1341493602748; Thu, 05 Jul 2012 06:06:42 -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 k8sm76767305wia.6.2012.07.05.06.06.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:41 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 5/9] ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure Date: Thu, 5 Jul 2012 14:06:08 +0100 Message-Id: <1341493572-29735-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkYchXEQbDwOB7V3QVENibOwc/wKZxmk7rop9w+p0rmIgpG7YyTjLj8bna4+sSjrI0omJyL All Device Tree enablement for Snowball's Platform devices; LEDs, Keys, Ethernet and all associated AB8500 Multi-Functional Devices are now complete, so here we remove any trace of adding those devices when Device Tree is enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 3b76115..c12cd97 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -745,10 +745,6 @@ MACHINE_END #ifdef CONFIG_MACH_UX500_DT -static struct platform_device *snowball_of_platform_devs[] __initdata = { - &snowball_key_dev, -}; - struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires DMA and call-back bindings. */ OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat), @@ -802,8 +798,6 @@ static void __init u8500_init_machine(void) for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) mop500_platform_devs[i]->dev.parent = parent; - for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++) - snowball_platform_devs[i]->dev.parent = parent; /* automatically probe child nodes of db8500 device */ of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); @@ -822,17 +816,6 @@ static void __init u8500_init_machine(void) mop500_uib_init(); - } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { - /* - * Devices to be DT:ed: - * snowball_led_dev = done - * snowball_key_dev = todo - * snowball_sbnet_dev = done - * ab8500_device = done - */ - platform_add_devices(snowball_of_platform_devs, - ARRAY_SIZE(snowball_of_platform_devs)); - } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /* * The HREFv60 board removed a GPIO expander and routed