From patchwork Thu Apr 5 10:25:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7661 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 4B54C23E47 for ; Thu, 5 Apr 2012 10:25:40 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E2D52A18598 for ; Thu, 5 Apr 2012 10:25:39 +0000 (UTC) Received: by iage36 with SMTP id e36so2173069iag.11 for ; Thu, 05 Apr 2012 03:25:39 -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:x-gm-message-state; bh=dgRwOzgmavCrwTSPH5S0U7/mrTmlpu6Ob8ovL8GkzEY=; b=mPHRO+OdBDefOTMNt8i5spxG+TlrnNxJ6Me3b1sQMjzJv6d2o9Ier5A/PXs2uGSKFf Wxg+SyV1Z1o5hrhH2uQOzaanzAytIwzsbPD/iM3iuO8qjyeOwyUpLOLUMDz9M9aU71Ph zckimysRG73Nd6kpZ02djN+JS7jfnZiVIRRtXSbLk5zxySXsXAq+0MOAU1YAlZsbedIA 0c9S7M292eSd2gc5YLQ4ZeZhc/NBsg47M25zXh/zR29A2aaiXfaIrSNCKjsS2xIbizx8 H8H1LSA2LPGlS+911OxBFSacbdiX+hU0lNEliNSi0n4UXdE4CFhxgIcH66UuqzWWjYlk WqjA== Received: by 10.50.194.232 with SMTP id hz8mr1268566igc.38.1333621539204; Thu, 05 Apr 2012 03:25:39 -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.164.217 with SMTP id f25csp53779iby; Thu, 5 Apr 2012 03:25:37 -0700 (PDT) Received: by 10.180.91.10 with SMTP id ca10mr11623062wib.17.1333621537114; Thu, 05 Apr 2012 03:25:37 -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 y43si3820022weq.58.2012.04.05.03.25.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 03:25:37 -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 wera13 with SMTP id a13so1017548wer.37 for ; Thu, 05 Apr 2012 03:25:36 -0700 (PDT) Received: by 10.180.81.135 with SMTP id a7mr11692844wiy.16.1333621536535; Thu, 05 Apr 2012 03:25:36 -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 l5sm12490310wia.11.2012.04.05.03.25.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 03:25:35 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk, Lee Jones Subject: [PATCH 1/7] ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement Date: Thu, 5 Apr 2012 11:25:28 +0100 Message-Id: <1333621534-29627-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 X-Gm-Message-State: ALoCoQkj4KvCBZ6RhaklLtPv0R2hbtWge7zF0E5EWDg/uFm+TpzHoMRCrgv8B8o5P9KwqbNx3DZS During Device Tree enablement it is necessary to remove snowball_* platform_data segments one at at time, as and when particular devices are DT enabled. This patch provides a temporary solution. Once this new struct is empty it will be removed again. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 77d03c1..29e0ade 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -609,6 +609,13 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &ab8500_device, }; +static struct platform_device *snowball_of_platform_devs[] __initdata = { + &snowball_led_dev, + &snowball_key_dev, + &snowball_sbnet_dev, + &ab8500_device, +}; + static void __init mop500_init_machine(void) { struct device *parent = NULL; @@ -786,8 +793,15 @@ static void __init u8500_init_machine(void) mop500_sdi_init(parent); } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { snowball_pins_init(); - platform_add_devices(snowball_platform_devs, - ARRAY_SIZE(snowball_platform_devs)); + + /* Devices to be DT:ed: + snowball_led_dev = todo + snowball_key_dev = todo + snowball_sbnet_dev = todo + ab8500_device = todo + */ + platform_add_devices(snowball_of_platform_devs, + ARRAY_SIZE(snowball_of_platform_devs)); snowball_sdi_init(parent); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {