From patchwork Wed Jun 20 12:56:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9501 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 12E7523E1B for ; Wed, 20 Jun 2012 12:57:26 +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 D605FA18307 for ; Wed, 20 Jun 2012 12:57:25 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so6181466yhp.11 for ; Wed, 20 Jun 2012 05:57:25 -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=A5UNjERZey0FgwTXruiN8p47vCsrGPv3byGfNnmGVBQ=; b=Vr9NA8YwAMbDCK/kBtNFmetR0jjD8Cj0/qokOpoyA6O9ixkCYTJ8wvq4jMiWzFwOBz hzWBDUgXHVHJK8F2xvL5alhj51Q6KsGB4U5ABAwRCd++Z3BUp7yc/idOdL24r4QzZwOu WSvmLvctLpUlLRLjaGYJMKCpdUMQvyWn733WSHPGeDaVyL3m1P2rXs1ijdpD2mnJkNcb BikRhmrTe9p7wS8xKIuFv2wiMSSHAaBM2+Rq7F/uq1kctHQL5ythH8Ul1F1at2Kqyknr PgPbS/CdNWJwHQXEJnKW1DgmlrqT1oIyv2m3qmCirwTvHFylHRwCqVXvzkdvdQ7Q3KbL FAZA== Received: by 10.50.57.167 with SMTP id j7mr4310557igq.53.1340197045486; Wed, 20 Jun 2012 05:57:25 -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 v20csp178561ibb; Wed, 20 Jun 2012 05:57:24 -0700 (PDT) Received: by 10.180.92.65 with SMTP id ck1mr11901704wib.14.1340197044383; Wed, 20 Jun 2012 05:57:24 -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 bo7si34399346wib.45.2012.06.20.05.57.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:24 -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 mail-wi0-f172.google.com with SMTP id hm11so1473510wib.13 for ; Wed, 20 Jun 2012 05:57:24 -0700 (PDT) Received: by 10.180.95.100 with SMTP id dj4mr11918229wib.17.1340197043910; Wed, 20 Jun 2012 05:57:23 -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 gc6sm38878374wib.0.2012.06.20.05.57.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 05:57:23 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: linus.walleij@stericsson.com, arnd@arndb.de, grant.likely@secretlab.ca, linux@arm.linux.org.uk, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 14/15] ARM: ux500: Remove PMU platform registration when booting with DT Date: Wed, 20 Jun 2012 13:56:50 +0100 Message-Id: <1340197011-5435-15-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> References: <1340197011-5435-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlpBazjXrk37RvuXAj4rmQDIifvpfflbdakEe1J1NOwKSuXsg+SEqsokII9C0v/k1HlZ5CJ PMU registration is successfully completed by Device Tree now, so there is no longer a requirement to register it from platform code. This patch removes platform registration during a DT boot. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index a12bd9e..c8dd94f 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -139,7 +139,6 @@ static struct platform_device *platform_devs[] __initdata = { static struct platform_device *of_platform_devs[] __initdata = { &u8500_dma40_device, - &db8500_pmu_device, }; static resource_size_t __initdata db8500_gpio_base[] = { @@ -248,7 +247,7 @@ struct device * __init u8500_of_init_devices(void) /* * Devices to be DT:ed: * u8500_dma40_device = todo - * db8500_pmu_device = todo + * db8500_pmu_device = done * db8500_prcmu_device = done */ platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));