From patchwork Wed Jun 20 12:56:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9500 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 2FD0923E1B for ; Wed, 20 Jun 2012 12:57:24 +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 EC516A182F0 for ; Wed, 20 Jun 2012 12:57:23 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so6181466yhp.11 for ; Wed, 20 Jun 2012 05:57:23 -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=zXNUiH8n9x+jdRDJrGvFpNVbvQ8NS4qqK3RT/4OMC/M=; b=BT1tYs73IP99k4B9r8pT/wPtKhwVxk+o3JoWCwN6KANH5bggiSNoR5L3q2AbWiWFiy SIiSWXsVLRG9ogUzClcub9uqhGVVeZVt/L9fkUcSm87uP0GOJz9BJFWBNtvpjjZhBAc3 O0/INavg3/N27xX1vb1zvj0Oq8KnM5VDsUgzI41IC3wLVGlwtA76jTCd4Wb3pUcot7TQ sD27AsUv77VpWyzUNNkYlnTFXnVlaSosOn/WrQFy5gvQuUZOuCx5gLWSXPcOCmeLVU/i PgLC1IfQru5j77U9yMpoWrs7zrprVcTviL5pYmE486Vu5xNhTwbQ9QFC8qCHSzs2VQ/T Ki3Q== Received: by 10.50.203.39 with SMTP id kn7mr4310864igc.53.1340197043576; Wed, 20 Jun 2012 05:57:23 -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 v20csp178559ibb; Wed, 20 Jun 2012 05:57:22 -0700 (PDT) Received: by 10.216.143.146 with SMTP id l18mr38048wej.56.1340197042481; Wed, 20 Jun 2012 05:57:22 -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 dk3si21299185wib.4.2012.06.20.05.57.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:22 -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 mail-we0-f178.google.com with SMTP id f13so5152592wer.37 for ; Wed, 20 Jun 2012 05:57:22 -0700 (PDT) Received: by 10.180.107.70 with SMTP id ha6mr11931824wib.10.1340197041978; Wed, 20 Jun 2012 05:57:21 -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 gc6sm38878374wib.0.2012.06.20.05.57.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:21 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: linus.walleij@stericsson.com, arnd@arndb.de, grant.likely@secretlab.ca, linux@arm.linux.org.uk, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 13/15] ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure Date: Wed, 20 Jun 2012 13:56:49 +0100 Message-Id: <1340197011-5435-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> References: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlP36thCZrwDuJp+4k9efDQkOeGt0UJNpHfZoZ4TFV5MFPyMHme6V8wJKKaGNIeSxCY+VMO 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 3871162..0c5a69b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -783,10 +783,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), @@ -840,8 +836,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); @@ -860,17 +854,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