From patchwork Fri Jul 6 12:54:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10511641 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 83268603D7 for ; Fri, 6 Jul 2018 12:55:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73A3F2857D for ; Fri, 6 Jul 2018 12:55:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67C80285EC; Fri, 6 Jul 2018 12:55:44 +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 135B22857D for ; Fri, 6 Jul 2018 12:55:44 +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=sfxLEFeBwBVzcXBw9DqAWSB3lAtvHztOAUYHIY+xQ9c=; b=EnR uVQMdOzF7UMyDjNQzsi29tU3Pn2WWfqORVrDsLlQf5hlXIvkBYmJfCiSbg3eHDEtyw44MsnMJYaDT JHkYP8cSTCy9O4X5lFeqjy9WWcuy8vD5roaJWiVEDWYrYvd/MguG65AnmPj7V620vkjdWvc6/7ozW HsWjnhiLDunfuK+DZrYPea8gqto3phBFk8orZWVSvw/j+2/Gds/QTr+GKqO2hJsiTbKOjVy9wu1h4 CQEntotNpJNxiXrdppAJrGCQwkUXqobeIDPQdOfl7NCRb4pQoYCTEmHLQHD9EKZ5kTen/kKv1sT+w ddSsiREfkwC0B1MW6+vqjShRn5/rSnA==; 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 1fbQGz-0002Op-AD; Fri, 06 Jul 2018 12:55:41 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fbQGw-0002Ni-VV for linux-arm-kernel@lists.infradead.org; Fri, 06 Jul 2018 12:55:40 +0000 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0iAY-1gORLm307q-00un52; Fri, 06 Jul 2018 14:55:24 +0200 From: Arnd Bergmann To: Shawn Guo , Sascha Hauer Subject: [PATCH] ARM: imx: fix i.MX6SLL build Date: Fri, 6 Jul 2018 14:54:48 +0200 Message-Id: <20180706125523.3480661-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:ADlBXXsBUcF+iwsDPPVUFUxpJKnEXgFbnfxNkCerIuTc69RPfBu whs3AqUociKj5jEPVgTYWhXRC6hiPafjK0432W+VuRRDifzyhW7Q0AIjP4P66KV9vb8pU5S wwybP2eZDdDiACyq8mhj0E7TYl6lIAWQ71XYD0NcH2T/BSfOiFlWSz3RIGkgiZkfCe1r9AL kAlrOxuhwanHL0GOKVmAQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:efo/kRdU3ao=:8mjfFSxVY/896y6tTONnFu GlRiYmeJiJn3AsEXbV6uSl/MbPfh+Vi+7M3dMoNDyW2OBlgmj41oItMe4sNjE7/HJKl+xCQuE wE+iw7J7xbBH+1+btjxzg/bMPFh4Ra6k/CKz+1Us5gZtwGrZ+mOuoD+9utf8xb4jWHqoiSFCK n9CtGGiU8f4wOeaDVbmuMYI3CFOkjg0+v6UoHbxEcBGfOPn/Cxzl7aTxzel18aknH1zLGYp87 BWruTJzg9hal1KLqMowY7VjKSOVRc9Erow5sKFVABYmgMrC9FAugJPJTDtgzytjmTc5wIiUi4 sh76HANa7vtE4PiZ78s3L3h4UKeAMr7c/DH6rx/yh8Q9wnl3tUFeT9ZCMJogP6P/eagULxHid E6v4tivnOxbGaBC+wIbwhOCLcsFfiAA8LPkO9kTJSK9C9B06FFe/9PMTXxDngy9tZtPZ0ZH8m atrUZ0yuYXAQsq+YrkYZlTRgYXiS4oCFLV1jNU4pjsrMLSQXFQdQDpdUbTYVujHqrLI8k4SEK 9L2YFv/i+glflIXidrNX9UlDqUSWyblwr8YvWShV7jT5a4l4pTiFNFPBXuGJxW2F3Fqy4lyH0 ulud9wDLBd5W5StPjPnh74FplRA0aaBVAPFzGHLgcJUm5qgzRQ8R7DGX6J0Oxozj+vouVSbix 8BcNeGknQgJ4dW2ITNKhkDL+xCIIWdRF5LoPPW64+W/Epi5Z2LGq66UqJsTOpNfmoUXo= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180706_055539_312075_263B2C65 X-CRM114-Status: GOOD ( 11.91 ) 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: Arnd Bergmann , Anson Huang , linux-kernel@vger.kernel.org, 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 i.MX6SLL cpuidle support reuses the i.MX6SX implementation, but the Makefile accidentally enables the i.MX6SL one as well, which then fails with a link error unless the kernel also enables the the i.MX6SL clock driver: arch/arm/mach-imx/cpuidle-imx6sl.o: In function `imx6sl_enter_wait': cpuidle-imx6sl.c:(.text+0x24): undefined reference to `imx6sl_set_wait_clk' This changes the two lines that were just modified again, hopefully getting every case right this time. Fixes: e7fa1fb39b11 ("ARM: imx: add cpu idle support for i.MX6SLL") Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 146ebf97b7eb..bae179af21f6 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -25,8 +25,8 @@ obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o -obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o cpuidle-imx6sx.o -obj-$(CONFIG_SOC_IMX6SLL) += cpuidle-imx6sl.o cpuidle-imx6sx.o +obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o +obj-$(CONFIG_SOC_IMX6SLL) += cpuidle-imx6sx.o obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o endif