From patchwork Wed Aug 22 15:13:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10888 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 251D623E1B for ; Wed, 22 Aug 2012 15:13:48 +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 1E67BA18D8D for ; Wed, 22 Aug 2012 15:13:35 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j38so924267iad.11 for ; Wed, 22 Aug 2012 08:13:47 -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-provags-id:x-gm-message-state; bh=1tF5NYNxzwQvyDMZYvMVK+21r/zQomOAvD4DGjjFkm4=; b=nb2Zsz62AoqEwBgUoDgHyZEpv4oKwHFm0VRkn3Z4y4548WubIJCBgxBfdVUyo6gPNq uV756FlqMXXA0YpVuDLLOueVq4XUeG01fzaJBVyytJNYnUvgyjhtp6TpiWOW1LVIAdmE v9+5PIyqiimsjxQLtZyCxGCjkMwUVp7OhBYA2zKvnJK9+I6HanTld7GgyVu5nq+RjRhG mrw5uxTfcwhqhQdadUj1RDC59BbpaR+I/klYkZq5G9szVskOBsp6W5kQxwURzxhOC+nS PfJO+9qzVjobPEgKkekcgI0d5jK/xVgnxHxmsC9kPT4CTMNmVlWy3RZbsSPNQnA8GNaR hd5g== Received: by 10.42.84.69 with SMTP id k5mr17479489icl.5.1345648427554; Wed, 22 Aug 2012 08:13:47 -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.50.184.232 with SMTP id ex8csp207652igc; Wed, 22 Aug 2012 08:13:46 -0700 (PDT) Received: by 10.204.156.68 with SMTP id v4mr6535623bkw.68.1345648426218; Wed, 22 Aug 2012 08:13:46 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTP id im19si2888045bkc.36.2012.08.22.08.13.45; Wed, 22 Aug 2012 08:13:46 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0LhvGc-1TQYoe0BZC-00n89K; Wed, 22 Aug 2012 17:13:34 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Russell King , linux-kernel@vger.kernel.org, Arnd Bergmann , Shawn Guo , Sascha Hauer , stable@vger.kernel.org Subject: [PATCH 3/6] ARM: imx: build pm-imx5 code only when PM is enabled Date: Wed, 22 Aug 2012 17:13:07 +0200 Message-Id: <1345648390-4234-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1345648390-4234-1-git-send-email-arnd@arndb.de> References: <1345648390-4234-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:v3FtPFwQxFF2RP6esnaJXbVdaaB3CBfX+Do6qm/t0ss QrGQAGZHvuCQ1wfCr1YwXXC3qCaOKsn61qSUv5UiTEhV4G7gWZ iT+pMwuvLyN2KikhKP29D4sXNsnZReezjzMwVqEQw+lV+qYUfT lPzr7GsXkTLyXxzPaI6hhh3SsaRYsxGQhE60bWFKArnrb6UA66 kSbjY1AMOrRIdMqwqG1jD+DgFL2NQKjG427JrzFcHg523MCxcK 4Jk9FQK8VlFzEzF+bhO8NKDx2wVciqexSV35uODgcoOSJo6+ix +1I2mKQ5A7MtuFeFG5LODyRIb/UFALVr+mKJYXW0+jqBF6edTU iPadQ6ObLD36cHosy2t8jk+zMUqXtUop+b1ukO6ZiAaxInekhe WVHBYrQuOeUjA== X-Gm-Message-State: ALoCoQn0rtYrlJKTCyJcqvTPggxC9R8t9RenZqK9PaiK9C2vczxxOi/VJ7Ke/9EPcDJ3XzCmEMMm This moves the imx5 pm code out of the list of unconditionally compiled files for imx5, mirroring what we already do for imx6 and how it was done before the code was move from mach-mx5 to mach-imx in v3.3. Without this patch, building with CONFIG_PM disabled results in: arch/arm/mach-imx/pm-imx5.c:202:116: error: redefinition of 'imx51_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:154:91: note: previous definition of 'imx51_pm_init' was here arch/arm/mach-imx/pm-imx5.c:209:116: error: redefinition of 'imx53_pm_init' arch/arm/mach-imx/include/mach-imx/common.h:155:91: note: previous definition of 'imx53_pm_init' was here Signed-off-by: Arnd Bergmann Cc: Shawn Guo Cc: Sascha Hauer Cc: stable@vger.kernel.org --- arch/arm/mach-imx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 07f7c22..e08adb7 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -9,7 +9,8 @@ obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o -obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o +imx5-pm-$(CONFIG_PM) += pm-imx5.o +obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ clk-pfd.o clk-busy.o