From patchwork Thu Apr 19 20:36:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7966 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 210FB23E20 for ; Thu, 19 Apr 2012 20:37:25 +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 DB524A180F3 for ; Thu, 19 Apr 2012 20:37:24 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so16953504iag.11 for ; Thu, 19 Apr 2012 13:37:24 -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=jhLS1IT2d/HqOcFvgow2o9dAMAOtAQ40zc3cbmsdptk=; b=VMvSBzZcPTWAzNMuKPqj3herRIg8bXT3Ve+F6EwF8b2Nnlniq49h7jqYMof/b8nuv9 KWQwtLsuzZMUYwSIoMxdf+GVZdlI1gqhVVeHfMUjucwosRP5xdBYsYZsoloV2hTydz6x t+rw23CotoN9+lacpAPfz6aXO67zPDsfIe9Z3w/1MQWx6J6K/WT0c/IOeVIW5xUNMDaR rkGU2qc8Wyck9Z0kIPMIDd2SO1cUmF/oRbBV9JVxDcEVkTixHWaUeWLlW/a1tLRrVPL3 FRB0oguApd5nXliu8MNHf4a3GoDhjbpb11+j9LPLJ3PHn+UybjrYiEcXj/iwvaM+n7yc NJgw== Received: by 10.50.193.199 with SMTP id hq7mr3666789igc.49.1334867844595; Thu, 19 Apr 2012 13:37:24 -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 x6csp317261ibt; Thu, 19 Apr 2012 13:37:23 -0700 (PDT) Received: by 10.180.82.132 with SMTP id i4mr1622748wiy.12.1334867843320; Thu, 19 Apr 2012 13:37:23 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id gt1si107122wib.34.2012.04.19.13.37.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.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-wi0-f178.google.com with SMTP id hq7so6237wib.13 for ; Thu, 19 Apr 2012 13:37:22 -0700 (PDT) Received: by 10.180.94.33 with SMTP id cz1mr8666169wib.13.1334867842744; Thu, 19 Apr 2012 13:37:22 -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.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 13:37:21 -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 13/15] ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement Date: Thu, 19 Apr 2012 21:36:42 +0100 Message-Id: <1334867804-31942-14-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: ALoCoQkG/DQ0NoSUmg8heg0pXvSV6PYtBmwN9cv5dmnMLotjoIZMIXRczT0/qHtYhxHJJ77fHb35 To aid in sequential one-by-one Device Tree enablement, we split cpu-db8500's platform_devs structure into normal platform boot, where we leave all devices to be added in tact and a DT version where we will remove the devices as they are DT enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 58768d9..c97eab7 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -121,6 +121,12 @@ static struct platform_device *platform_devs[] __initdata = { &db8500_prcmu_device, }; +static struct platform_device *of_platform_devs[] __initdata = { + &u8500_dma40_device, + &db8500_pmu_device, + &db8500_prcmu_device, +}; + static resource_size_t __initdata db8500_gpio_base[] = { U8500_GPIOBANK0_BASE, U8500_GPIOBANK1_BASE, @@ -221,10 +227,16 @@ struct device * __init u8500_of_init_devices(void) platform_device_register_data(parent, "cpufreq-u8500", -1, NULL, 0); - for (i = 0; i < ARRAY_SIZE(platform_devs); i++) - platform_devs[i]->dev.parent = parent; + for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++) + of_platform_devs[i]->dev.parent = parent; - platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs)); + /* + * Devices to be DT:ed: + * u8500_dma40_device = todo + * db8500_pmu_device = todo + * db8500_prcmu_device = todo + */ + platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs)); return parent; }