From patchwork Thu Jul 5 13:06:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9849 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 14EFD23E16 for ; Thu, 5 Jul 2012 13:06:49 +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 D82A4A182E7 for ; Thu, 5 Jul 2012 13:06:48 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so8814614yhp.11 for ; Thu, 05 Jul 2012 06:06:48 -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=GayIx0BoF0mp9x9muYDUH92Trpuo8JsQR8hW9DYC3u/XNQMjJKbb31Z7BTwsvdbdqu VaKbcyQ8JR1CW/VgkPhybV/Erd9/3iLfuUzfrmw+bcFgj7En8CE6US6kFMq4DPnPbvdH Qk7IPMFGUpmwiL5W/DbvxPgd/kSJMkW0dZU7Z62h6v6ypDlgg/r3o9Xx/AoDgSg89QLw BAH+vUmulg9ea0EcBIzHblWfPjqTT77gLYf5uCDsQBmlV8eSpL9A2pZGbu7FaWchPn0o aMNxwAdBqzMOByMeuu0/J9O7Ah+EubUEHFsmI+7nTr8uELlzAH+26Ye1QezCVl6o3bq+ 96gQ== Received: by 10.50.203.39 with SMTP id kn7mr15791857igc.53.1341493608446; Thu, 05 Jul 2012 06:06:48 -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 v20csp65222ibb; Thu, 5 Jul 2012 06:06:47 -0700 (PDT) Received: by 10.180.86.106 with SMTP id o10mr22286480wiz.22.1341493607285; Thu, 05 Jul 2012 06:06:47 -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 cw6si21360510wib.12.2012.07.05.06.06.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:47 -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 hm11so5144759wib.13 for ; Thu, 05 Jul 2012 06:06:46 -0700 (PDT) Received: by 10.217.7.69 with SMTP id z47mr339074wes.213.1341493604406; Thu, 05 Jul 2012 06:06:44 -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 k8sm76767305wia.6.2012.07.05.06.06.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:43 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 6/9] ARM: ux500: Remove PMU platform registration when booting with DT Date: Thu, 5 Jul 2012 14:06:09 +0100 Message-Id: <1341493572-29735-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQns1rviyBodNiJn0Y/8ljoE477rtA2zZ1EYsEKa9MnK0pSD6jeLBLshZ0lPDUUWj07YvlTV 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));