From patchwork Mon Jul 9 15:51:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10515045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14A91600CA for ; Mon, 9 Jul 2018 15:52:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 030E128C5A for ; Mon, 9 Jul 2018 15:52:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB45F28D43; Mon, 9 Jul 2018 15:52:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 991D428C79 for ; Mon, 9 Jul 2018 15:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=jPRP9yCMO3QKif9g9K2o/7ptlJpWfs2YiOxnrwWA5m4=; b=m6M RV+K4Ye7b+IHRiosd4G3DIMijo2cDqrbCtBlexLNTmdF3JMjD6A2UMsm8X3DNoUwMbINj2tMtmgMe 8YxppTaSGcTo16NOO6Gl+UDvSeITTRp6ZwwCVEKrCjA8LrOggxDQTzo+rS8L7qYAz9xg8bhZFBjNk u2Zsg+wjZanpLORBurMHMStOw4RfSOk66UtsQUQwg5KXwp4fLXR8JBcYY+iZeb4qNU/hiv7Qx4kst nKeqbTujfqyZKHQ0C9FXU/Yljl1YobbycK3lpuMflj3RK2427XJK/U3DsYWt0RJG+Itl0siZIEpTU gDRKutEkGQiZgxilFwv9w0w3DB/H0KA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcYSM-0001gk-Qd; Mon, 09 Jul 2018 15:52:06 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcYS2-00017c-57 for linux-arm-kernel@lists.infradead.org; Mon, 09 Jul 2018 15:51:48 +0000 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mep7w-1fReNH0beK-00ODqQ; Mon, 09 Jul 2018 17:51:31 +0200 From: Arnd Bergmann To: Shawn Guo , Sascha Hauer Subject: [PATCH] ARM: imx: call imx6sx_cpuidle_init() conditionally for 6sll Date: Mon, 9 Jul 2018 17:51:17 +0200 Message-Id: <20180709155130.2126597-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:VCzWh3uXnKYDxq2EQyeRZu902WGUzMfMyXzx9SsTkwhZY+g8e/m OOiVoI+YOOtsPsMtn7+5ke9QngRhS7JiAehx/vQ3Gg8maTNDHOZgjvPrZpXDtNDar2naVTK Sr3NmDLZ7GKfpvna6NDKP2Bd79sAYxkj7tzi2nvNS/oGbTVbR5hXbN/a9rekPuXbKX7jQRJ GtG2WgYDHsErFiBKB1gcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:je8t16iOs4A=:MkjVNVslkzESQf4+pgDZw7 Q3cx2VZxLz1IPQAsO7NImUc9qDAJfBTldwNEILvF6C6aOJWt4YtEtEGBMD9a8+Ya6jeB5BuTB K29ZeTWyeHAtPT4fJS8KxSc6SDuaIbIGTLiByAiO9Xss+6oxKem6U8uEtaoHoZDBCGVxWlF4d +c103k+4yzWgcLpROYyiy9In739vUMY7Bkob458Dy2e8nc0R4G+FVBm22f7CtyXygmDE0VQ2o jb2OsK+x7W5ycSWp1f7BGwUZurJaHNHs82UK1B3eLmGjwwJLDESBx8qOwoynl6uG06/od+rDW f8yZND6qbfKNIYUW749xCxL54GA7ulOOFB5i+CVe1t0dlNnVZun5Wh71SPn/lTzxwuVKNcRDG xGxdsF1ZT6+7Xp8npZiZm82Dmd8tPB7e1kpaQDTeH7Jq0D5Q/iapZAWQg44OXqXPjYkAioD7v +bNgpcKaGaO2B8c2G6DR6Tk6oA3IJcRAFHSYIzWLsdqbuSuANFkNdoWzGCH+gzkMU4uK2foBc 9Cihdl+WQCn1V+jX2gnMzD4YtDESFDzz/trDrj0GhKu+9IegY6f0KJAXU0dIe10g2LT/2Y3Ut nNQ1amSKHlUroFpKzGEygBxwrEMSO48NEu2YumBkc8786oNdhpyFU5k5Ggf2plW5sEmjOlDzr 1BonGAOknHOt+xlE6RTU5D0pgtvR+gc10V3a8ilJ3d/wRcmt7VsSS3kc/Kz/Q6o8QmGk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180709_085146_602167_D824844A X-CRM114-Status: GOOD ( 12.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bai Ping , Anson Huang , linux-kernel@vger.kernel.org, Arnd Bergmann , NXP Linux Team , Pengutronix Kernel Team , Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The imx6sl platform has two different cpuidle implementations, and fails to link if we only want one of the two: arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late': mach-imx6sl.c:(.init.text+0x12): undefined reference to `imx6sx_cpuidle_init' This makes the call into reference conditional on the configuration. Fixes: e7fa1fb39b11 ("ARM: imx: add cpu idle support for i.MX6SLL") Signed-off-by: Arnd Bergmann --- I had already sent a related patch earlier, but missed this second problem then. --- arch/arm/mach-imx/mach-imx6sl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index 183540e0838b..99be4225297a 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -42,9 +42,9 @@ static void __init imx6sl_init_late(void) if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0); - if (cpu_is_imx6sl()) + if (IS_ENABLED(CONFIG_SOC_IMX6SL) && cpu_is_imx6sl()) imx6sl_cpuidle_init(); - else + else if (IS_ENABLED(CONFIG_SOC_IMX6SLL)) imx6sx_cpuidle_init(); }