From patchwork Thu Apr 19 20:36:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7958 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 F3D2C23E20 for ; Thu, 19 Apr 2012 20:37:08 +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 BB1F6A180F3 for ; Thu, 19 Apr 2012 20:37:08 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so16953504iag.11 for ; Thu, 19 Apr 2012 13:37:08 -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=BIUnSTl3QlI6WlvQqPD5IT+SLcU1rt5qqqxw34Xtloo=; b=OZ1GPut8vKTqYLgxkPjBe/JTHGYD+6yYoPWgh6dp8TfzU9p8qAj1iRIJTJ5hvv8xW8 AN2a8D0IYgdsMQ2Yv9akWZmCIalFq1C7hszkf0TR0hOQIcbZJPb7zJmxDF3GdTyh3meK 7i5pjJBwhMMmimKTnCj91tpC4Ksv6bM7sTDmeiKMDxOZGwIHaem+YrlYDrugG775CJmQ KEGGJ6lmV8ZN9fXrNZE00hcXh/B2emhnvdV3O6Jp80HFMavubCD7ZofHpYDnaWZY9maY ubAe43fXTHcOMUVhU8kJY9PxE8Yya+u/LXTE6oBa0fTP9JpyWO3hHfQqj25m4uibnf0g lnYQ== Received: by 10.50.183.225 with SMTP id ep1mr124971igc.1.1334867828547; Thu, 19 Apr 2012 13:37:08 -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.137.198 with SMTP id x6csp317228ibt; Thu, 19 Apr 2012 13:37:07 -0700 (PDT) Received: by 10.180.24.7 with SMTP id q7mr1630784wif.11.1334867827122; Thu, 19 Apr 2012 13:37:07 -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 n8si3783096wee.27.2012.04.19.13.37.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:07 -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 a13so7716765wer.37 for ; Thu, 19 Apr 2012 13:37:06 -0700 (PDT) Received: by 10.180.94.161 with SMTP id dd1mr8572570wib.16.1334867826659; Thu, 19 Apr 2012 13:37:06 -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 h8sm345540wix.4.2012.04.19.13.37.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:05 -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, linux@arm.linux.org.uk Cc: Lee Jones Subject: [PATCH 05/15] ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement Date: Thu, 19 Apr 2012 21:36:34 +0100 Message-Id: <1334867804-31942-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> References: <1334867804-31942-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkrG9JU/zNiRWA/nSJo5u4QTu3gb1NXLTBxH6Kv26CwwVAxf3AYLxN/6RuEJVpJJXXKIuwI 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 | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 7938258..0dbcdd2 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; @@ -801,8 +808,16 @@ 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 = done + * ab8500_device = todo + */ + platform_add_devices(snowball_of_platform_devs, + ARRAY_SIZE(snowball_of_platform_devs)); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /*