From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623AbdIKUOK (ORCPT ); Mon, 11 Sep 2017 16:14:10 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:64592 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332AbdIKUOI (ORCPT ); Mon, 11 Sep 2017 16:14:08 -0400 From: Arnd Bergmann To: Florian Fainelli Cc: Arnd Bergmann , Brian Norris , Gregory Fong , bcm-kernel-feedback-list@broadcom.com, Justin Chen , Markus Mayer , Doug Berger , Gareth Powell , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] soc: bcm: brcmstb: fix ARM build errors Date: Mon, 11 Sep 2017 22:13:05 +0200 Message-Id: <20170911201324.3423067-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9eueBGFs8PUMipGx3YW7cqjsyV1y2F7R4a1vLoBwPlA7+3N6dR5 7nLxBCOnNMxdb2gkqLE28h1Pq1V3BpWFsiA0NAMnOP5gx3nCFLhHQ7mzZf1UpL/4QDE6Tt4 RJCY/sYnJ9wJ7tONG5Sgja0tKSjbyzJXOlcBOhAyu7gh0cCIDrtWZxiFZXpZTRMesDajrZf Rcm38BYKiEvy2wNYhAGWA== X-UI-Out-Filterresults: notjunk:1;V01:K0:uaBn5LAEYr8=:PmA/vhYOfn6Vv8KxkiHLsM ErG9AplvU+AXDrx4Y6mEHRD4RWlj9KiQsdeex12zqX6aL4f6374hgqBXf3nVrMFcMnbTBaLHJ JZZVawmzSTCbmfxy61swAZh8Ha27CTTjuJHB9jz5rwwyEaSsOrRoaO8W5U3IDWDMjqk2GlPae Z+EZZYbT8fGCsoAEp8S0YgecBbMquh1blBdufwmYy31KEuMfjnYHjZJlM95R7dJ54StVu0fzw RFwDpG41s7xNSjsEh8Rvn1WMdl1jOLA2ScMCnSJUTnu9SJ6WrFiqlfg6BDioZqefABWOTY8N2 czJviKl94gHTsjcpv0lFMMWRJlfP220s8MgeXmJQwUbBAFka6esnrmKMBc6kSRfusEXYr/7Uw JiYfPusNfbeKfoPa+Z9Mzo4bdA/V3AlIU4TFpKPPHumwp6gKYwzDUiWCumTQSz0CzQF8UP6tE OuJZQpGw97zN8+dlcGwpWEi1zJhiPevFzTwkYDFNjDJsPYp9R/456PAujU+Md2jiQ7b8GgBEV hm/gkap/4qebvZmhruYcsQNx0OCfzu/vvq506XTZUvVnIWQkJldAMJcUet+9MUWJbGomeuSzH UxDJGVn6ZP1D40bMEmuZhNbPB53iFqBh5V+xYk7WLm2Fnk/Ih4Q0uOO7PiQk+iRwqSD4YzEZf Y9LnIhpeSelZG1BLg350lhthk/o3FWMOlWA2KtRuMo36MDpWEldWaVCJmc9UtHssUkERXk9D2 n+DAcOjVIFHgK4jxv1NIKRvPf07LdDH1VhZ8Rw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building the new PM driver on older ARM architectures, we can run into one of two build errors: drivers/soc/bcm/brcmstb/pm/pm-arm.c: In function 'brcmstb_do_pmsm_power_down': drivers/soc/bcm/brcmstb/pm/pm-arm.c:334:2: error: implicit declaration of function 'wfi' [-Werror=implicit-function-declaration] drivers/soc/bcm/brcmstb/pm/pm-arm.o: In function `brcmstb_pm_s3_finish': pm-arm.c:(.text+0x860): undefined reference to `cpu_resume' The first one requires at least ARMv6K, the second one requires the CPU suspend/resume logic which is not available on some of the older CPUs, and needs to be selected explicitly. This adds the extra Kconfig statements to enforce this, limiting compilation on ARM to the STB platform that is guaranteed to be ARMv7. We could enable compile-testing for other ARMv7 platforms, but there seems to be little value as an allmodconfig kernel already includes it. Acked-by: Florian Fainelli Signed-off-by: Arnd Bergmann --- v2: change Makefile as well --- drivers/soc/bcm/brcmstb/Kconfig | 3 ++- drivers/soc/bcm/brcmstb/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/soc/bcm/brcmstb/Kconfig b/drivers/soc/bcm/brcmstb/Kconfig index d05bfce82e71..d36f6e03c1a6 100644 --- a/drivers/soc/bcm/brcmstb/Kconfig +++ b/drivers/soc/bcm/brcmstb/Kconfig @@ -4,6 +4,7 @@ config BRCMSTB_PM bool "Support suspend/resume for STB platforms" default y depends on PM - depends on ARM || BMIPS_GENERIC + depends on ARCH_BRCMSTB || BMIPS_GENERIC + select ARM_CPU_SUSPEND if ARM endif # SOC_BRCMSTB diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile index ee5b4de741b8..01687c26535b 100644 --- a/drivers/soc/bcm/brcmstb/Makefile +++ b/drivers/soc/bcm/brcmstb/Makefile @@ -1,2 +1,2 @@ obj-y += common.o biuctrl.o -obj-y += pm/ +obj-$(CONFIG_BRCMSTB_PM) += pm/ -- 2.9.0