From patchwork Tue Apr 17 10:43:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7892 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 066AD23E00 for ; Tue, 17 Apr 2012 10:44:46 +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 C2C0BA1841B for ; Tue, 17 Apr 2012 10:44:45 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12004590iag.11 for ; Tue, 17 Apr 2012 03:44:45 -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=xZdnCWn4cgCmRiYZeJbfMMm8XulNXty33kOhP7RKjuw=; b=J2XelnmrqsbcH5L8QgEVyNeCLbU7C8Xg6l+1rwCX4IErf1YA5XKDa45XxT8dcaOdYy qlOw5U5Nh4lUBT2cbydytwuh7xA/SVrMKN4CH24mmf1pNQva64r4PMWi2zBFIkLKPtH9 IpGDOGWEcyr//4c7gNkZN/Tw7MWDjAVZwJRUr+CZkasOtjSyQGeX0LE1jT7BNxqXxD6i Qc8B6oMLsm2TlE2EEh7M8LRnr94QXXQNhNH4uWfR7dkjEbwe9zm/dP4oJsXIrB2dvZeo 02pbZI7jFut4CnXnvExZhSum9eYbGd23PAgRFZWPX9oibE2I/tcZkaNFCj+uzUZjrHHR 8iAg== Received: by 10.50.10.201 with SMTP id k9mr8787661igb.55.1334659485575; Tue, 17 Apr 2012 03:44:45 -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 x6csp138686ibt; Tue, 17 Apr 2012 03:44:45 -0700 (PDT) Received: by 10.180.90.102 with SMTP id bv6mr5951429wib.6.1334659484249; Tue, 17 Apr 2012 03:44:44 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id l32si21429998weq.106.2012.04.17.03.44.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhj6 with SMTP id hj6so301545wib.13 for ; Tue, 17 Apr 2012 03:44:43 -0700 (PDT) Received: by 10.180.105.69 with SMTP id gk5mr6856317wib.3.1334659483638; Tue, 17 Apr 2012 03:44:43 -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 fn2sm42069492wib.0.2012.04.17.03.44.39 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 03:44:43 -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 05/16] ARM: ux500: New DT:ed snowball_platform_devs for one-by-one device enablement Date: Tue, 17 Apr 2012 11:43:57 +0100 Message-Id: <1334659448-11521-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> References: <1334659448-11521-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQny9IFfMOu+EhPIGgbsPZZfyVzPDtUPnup7KYrA0+/Axxn0cAWgkRPEHsKE6Vk4rQFv1ppu 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 a352313..ee1296a 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+")) { /*