From patchwork Wed Mar 19 19:29:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3861551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 471BABF540 for ; Wed, 19 Mar 2014 21:27:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70581201FB for ; Wed, 19 Mar 2014 21:27:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46CC9201FA for ; Wed, 19 Mar 2014 21:27:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMEo-0000DD-Sh; Wed, 19 Mar 2014 19:33:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQME3-0005kM-Hd; Wed, 19 Mar 2014 19:32:31 +0000 Received: from moutng.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCX-0005VJ-MA for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:06 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MPXk1-1WUSvS2W6j-004kwJ; Wed, 19 Mar 2014 20:30:35 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 14/62] ARM: imx: imx6q_set_lpm is only defined for CONFIG_PM=y Date: Wed, 19 Mar 2014 20:29:11 +0100 Message-Id: <1395257399-359545-15-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:62uZL6QwDoJ4lPsRoCh1CWhsGdPP2Zafz+j99Q+/IqY QZlD7fymT85fHQ7+H2QF5sQCmy+a9nvq97BwdY0JLpDNH2IYhK snYZ8F/yNQgxl5XCRYL/g7Q5OO//nkmPW+clR4CexsXgbc3qOE 2HDrTH2uK/Bp18U1HlALOK2D0vm4WE6DEf9aqjPIssWHS/AkL2 VCgkfeaEs9gTjY0hsgE0ejox7tUM3hrxYpfyTsxRyAJ7ad5GST KdBhroSwTULM5ZQVUCIWoiq6rumTZG5eOlbRHN/3hJCPv76WQm FUgm74zkom1DfMaupZ4N5e2LVlQUvC8kkqtKBZRkZPYiulZ3Lu vESqQBZnq4EI2qYyTRTEO+4za8az5j1cXkGdtXOzf X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153058_218678_896B27D7 X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -1.9 (-) Cc: Shawn Guo , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This ensures that we only call imx6q_set_lpm if CONFIG_PM is enabled and we are building the pm-imx6q.c file. Another fix that has been suggested for this is to always build this file conditionally build only the parts of it that are relevant only to CONFIG_PM. Signed-off-by: Arnd Bergmann Cc: Shawn Guo Cc: Sascha Hauer --- arch/arm/mach-imx/clk-imx6q.c | 3 ++- arch/arm/mach-imx/clk-imx6sl.c | 3 ++- arch/arm/mach-imx/cpuidle-imx6sl.c | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index b0e7f9d..133b23e 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -478,7 +478,8 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk_set_parent(clk[lvds1_sel], clk[sata_ref]); /* Set initial power mode */ - imx6q_set_lpm(WAIT_CLOCKED); + if (IS_ENABLED(CONFIG_PM)) + imx6q_set_lpm(WAIT_CLOCKED); np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); base = of_iomap(np, 0); diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c index f7073c0..a882bdf 100644 --- a/arch/arm/mach-imx/clk-imx6sl.c +++ b/arch/arm/mach-imx/clk-imx6sl.c @@ -382,7 +382,8 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clk_set_parent(clks[IMX6SL_CLK_SPDIF0_SEL], clks[IMX6SL_CLK_PLL3_PFD3]); /* Set initial power mode */ - imx6q_set_lpm(WAIT_CLOCKED); + if (IS_ENABLED(CONFIG_PM)) + imx6q_set_lpm(WAIT_CLOCKED); np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-gpt"); base = of_iomap(np, 0); diff --git a/arch/arm/mach-imx/cpuidle-imx6sl.c b/arch/arm/mach-imx/cpuidle-imx6sl.c index d4b6b81..c9a6aa8 100644 --- a/arch/arm/mach-imx/cpuidle-imx6sl.c +++ b/arch/arm/mach-imx/cpuidle-imx6sl.c @@ -53,5 +53,8 @@ static struct cpuidle_driver imx6sl_cpuidle_driver = { int __init imx6sl_cpuidle_init(void) { + if (!IS_ENABLED(CONFIG_PM)) + return -ENOSYS; + return cpuidle_register(&imx6sl_cpuidle_driver, NULL); }