From patchwork Wed May 30 04:47:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9019 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 E903A23E58 for ; Wed, 30 May 2012 04:48:04 +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 B20FBA185A7 for ; Wed, 30 May 2012 04:48:04 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so3562684yhp.11 for ; Tue, 29 May 2012 21:48:04 -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=AkqbsyIdG14j0sHYzDzaewgckYplwmAWO4i2cw+ickI=; b=S1lTi7eXjDHHLgS2OYw/qCjJLtuDJBDBaSv4qFoU8AoIGtULlqY6LvFJ0opn9D1QB2 G0WFLjpuj2gmT0ajH4AYySfBNC7i2ef7+IuvG0FPWYZo86glPgyehmdbYNZ1L3LnY4ky zx/wOaFM6psFwTm03PuijB8WUl4yXmMBSWwNZKT31oVXxuukA4ry+k1HvWTk57lHopik QF3u3IDegtlzK+/81GfJNyTyG9i7jp+bw6DcsHEreADPv+IxAQ8vG2hW/PL3fn/d5nYl KCDpa3W2VoYnnIE3lG/fl1BR8suY7is3lfOsFrIKX8BdyZXLETFTn3A9CLIdFp1rmXRy zl0w== Received: by 10.42.56.80 with SMTP id y16mr6145071icg.48.1338353284023; Tue, 29 May 2012 21:48:04 -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 v20csp170222ibb; Tue, 29 May 2012 21:48:03 -0700 (PDT) Received: by 10.68.237.166 with SMTP id vd6mr45049263pbc.139.1338353283092; Tue, 29 May 2012 21:48:03 -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.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:03 -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 danh15 with SMTP id h15so7270112dan.37 for ; Tue, 29 May 2012 21:48:02 -0700 (PDT) Received: by 10.68.203.73 with SMTP id ko9mr45813959pbc.66.1338353282702; Tue, 29 May 2012 21:48:02 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.47.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:01 -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 01/22] ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement Date: Wed, 30 May 2012 12:47:19 +0800 Message-Id: <1338353260-10097-2-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: ALoCoQlVc3iwDv7stxT5HVO7ZrviG587PxcFIeL62lFZQ7qnqYoaAzR1B+BptFK0aBUipNF26V/z 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. Acked-by: Linus Walleij Signed-off-by: Arnd Bergmann Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b23a643..d4132f5 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -676,6 +676,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; @@ -876,8 +883,15 @@ static void __init u8500_init_machine(void) ARRAY_SIZE(mop500_i2c2_devices)); } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { - 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+")) {