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: 141307 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3081160ljj; Fri, 6 Jul 2018 05:55:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe4D/YZuY2bkrPcP4iNikjwwMEgUMUB5Qq6cp5rFqCO+IdefbyDZjWRsqPfYc5xqNGurne1 X-Received: by 2002:a62:a3d1:: with SMTP id q78-v6mr10445514pfl.5.1530881747626; Fri, 06 Jul 2018 05:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530881747; cv=none; d=google.com; s=arc-20160816; b=nQSv3p0bYcwrMG+whcKvaOJoJXGIPsI95RvkJKE/bOPKuhQPPIS6eKCqWhlv1j3PB+ cs6CqQWfihb9VjJNUWwrsJ7q/+RXWzWBHXBAxl72M1f+mSlPA0LYhsmixPW7htHtbfro SVma4AgOQl8RnRnidb05hTNlGgeEu/2uLM53uZV/ld1jHhs0RBHzCuS62W1qQ8MJ45hc xKuHe3ClwX99F9fEc59AoH2KcHj++Xb2OHfFPezXTW/sf7JzXwUEbDPLkCUIJwAj2Oh+ ZU+O1ZiR2dsUv3L7r5MHwLuk8G9jM1EuEhHJmjfyAof8q6NhzQT39sDfSqzWkfgcU8TV ZYBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=f5lrWOU/2et3802UzEkS37xxMwcMK8rBSqUUBDWmA0g=; b=DjV8dyOFnJNyTJeMsphujSQn5r/tF47Re9WrZMUUnf2Ld7IHdPLNzyvuM4FAOmvFY/ TVD2ZKWibWzFieJTqCQg84YQ9zwS2iBEW1w9wHt5KdsgBjLkhav1Fl9f/NRIpox3hbMH 7+AtwfNe/aP/i4srk5OHYn9y0Esx504b53Mn8zcOcA7hLbAWr0NTBZhkkFBJHWi1k0hW ZlZea8obY6ZJaJJ7KIan4+ARtwNV2CS79uJyh6ubedOHpba/8cFi0A0qbrGLw4g8WgSV KY4TMhBqLiRiM+x3SraIQZfN/6t7mulEEAC84tOLC4l+alau0p6MzfjWjbgOEtu37U7V hxug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4-v6si7573751pgc.654.2018.07.06.05.55.47; Fri, 06 Jul 2018 05:55:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933105AbeGFMzp (ORCPT + 30 others); Fri, 6 Jul 2018 08:55:45 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:40723 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932569AbeGFMzo (ORCPT ); Fri, 6 Jul 2018 08:55:44 -0400 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 Cc: Arnd Bergmann , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Anson Huang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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