From patchwork Tue Mar 13 11:45:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10278285 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 2BEDB602C2 for ; Tue, 13 Mar 2018 11:46:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C6A328EDA for ; Tue, 13 Mar 2018 11:46:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FF4E28F8C; Tue, 13 Mar 2018 11:46:31 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 906DD28EDA for ; Tue, 13 Mar 2018 11:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933023AbeCMLq2 (ORCPT ); Tue, 13 Mar 2018 07:46:28 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:45499 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932892AbeCMLq2 (ORCPT ); Tue, 13 Mar 2018 07:46:28 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MGiFl-1eqzQy2ppR-00DWrx; Tue, 13 Mar 2018 12:46:21 +0100 From: Arnd Bergmann To: "Rafael J. Wysocki" , Viresh Kumar Cc: Arnd Bergmann , Sudeep Holla , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] cpufreq: scmi: add thermal dependency Date: Tue, 13 Mar 2018 12:45:41 +0100 Message-Id: <20180313114607.2061209-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180313114607.2061209-1-arnd@arndb.de> References: <20180313114607.2061209-1-arnd@arndb.de> X-Provags-ID: V03:K0:Ub40RA2KrXxyns1AKvX6VG5a8JZPLwXt0AF0rWOdfBRrEwoLee5 g8z82UyREIC+m2/0qQHxTbARkdPmy95bm0uOCqr6q8D1kEFKIZyUxnR+squm8Rv86oNrqKp lnhrLv1I2gTlW0AyQabOccBEi0diJDvrNyt+/r3NsXvkxdkWVMY2uYbe9IZIv88JLElbEzh vgAJg5hhcOQDKQl3xuuQQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:hZNyBtAC1tA=:6WG+bDIezYeah+7Rt2Jp6i fzZ2XqbHzCJNcGkG7UhYZAIA7uhsGChjH2Q7+tXbs67upszKiMzvZ0rF67WnBzyW0l2qG0kLH olvxkqKNvmG2pWLACO0a/eMptzl8E0GhgOzYtNDejZrxXoMIaT15iWYFpH3f2nPTCnLzmu6BK yS2LAkvdovsyJDE3gcrQNsovT0NxGwuU6jVVGZjko5x1QNLcKM+bG0YSDHDxn8dtI1hmG8GbP 0j4bUyoIyARLjfjwL1U3HGHpvAvc0wOQQ2f6vFfu/uYMK1cCBEDV8bD3950NN0js1fMyZpbVJ pAU/J+IA8UtyaESpRllPm/t7+2T+OjYPqsJmKA9SN2Z1/+iQAcV7T5Q73z/7VYuVxKNlW1wJF ULpgqTuoKJ7Tyvbdu+4ToX4DkSXtWf2leYW9ZtW9jx9dq8LZECdZ77OgvWiv69sRe0wRhpSES ykpYkDP161KUsGIlohq33HSrtuJegOoZYOVCi+ASG3SHJJr11uBqcpza3RgNwnHkBR3QcXdP6 fxV54zpimjQf1is5tCtgssopo/k+ErKm1Kpm3wRsirSduTEWJ3t617Fk7CPQiwj2bwOVDa8lL gLZApTEJbN01724Wk+rLUw/MgH0fO3MmT7LoFYcZaL1bNgi5pni1nu7Q0uhh9seIrHYcVKKrY Gd+IhiE9TplV5iObTMjtITyuvTuVGCqSlaiCXceMJGE30fAVlrt02ExwE1d9a3iXxnHwSHZbd bv+bwKYm21UaCgIPpWKwEQfpFJlAPiylKD7vbg== Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A built-in scmi cpufreq driver cannot link against a modular thermal framework: drivers/cpufreq/scmi-cpufreq.o: In function `scmi_cpufreq_ready': scmi-cpufreq.c:(.text+0x40): undefined reference to `of_cpufreq_cooling_register' drivers/cpufreq/scmi-cpufreq.o: In function `scmi_cpufreq_exit': scmi-cpufreq.c:(.text+0x88): undefined reference to `cpufreq_cooling_unregister' This adds a Kconfig dependency that makes sure this configuration is not possible, while allowing all configurations that can work. Note that disabling CPU_THERMAL means we don't care about the THERMAL dependency. Signed-off-by: Arnd Bergmann Acked-by: Sudeep Holla Acked-by: Viresh Kumar --- drivers/cpufreq/Kconfig.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index d9457d1e535c..7f56fe5183f2 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -242,6 +242,7 @@ config ARM_SA1110_CPUFREQ config ARM_SCMI_CPUFREQ tristate "SCMI based CPUfreq driver" depends on ARM_SCMI_PROTOCOL || COMPILE_TEST + depends on !CPU_THERMAL || THERMAL select PM_OPP help This adds the CPUfreq driver support for ARM platforms using SCMI