From patchwork Mon Nov 16 21:27:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7630991 Return-Path: X-Original-To: patchwork-linux-mediatek@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C3CB49F392 for ; Mon, 16 Nov 2015 21:28:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF75020499 for ; Mon, 16 Nov 2015 21:28:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DCAC203B5 for ; Mon, 16 Nov 2015 21:28:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyRK5-0006fs-JU; Mon, 16 Nov 2015 21:28:25 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyRK2-0006QM-4P; Mon, 16 Nov 2015 21:28:23 +0000 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MDmuc-1aA2AU3iJC-00H6vG; Mon, 16 Nov 2015 22:27:56 +0100 From: Arnd Bergmann To: "Rafael J. Wysocki" , Viresh Kumar Subject: [PATCH] cpufreq: mediatek: fix build error Date: Mon, 16 Nov 2015 22:27:55 +0100 Message-ID: <3905943.jgsUmEgmnP@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:zirCEx82uD/gEkrZF22d1QHI+EXtiI9hoYDIhe21BijWP0IZDdd NvOK2z2Vrm9Dcb1VlDrlA6QubAssaryDTFGqkqKf3hYc8ekASodqDTw6w7jD/6Q2zTp5eFP tNjz2rBCkffotRLd8w3da6VxrSsywAx1q7hNFR8Dt+NBjwb54RznAjnMa78onM85+lZEbly 23Djg6utSc5caeD+Ug1UQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:K0zfuHmJprg=:BIeon+OMygQ1X//LukY2mG h9jD/71SXk+xbbSm5Ximsa5MS0WSvNcASdv04c+IBhEe2XIu/G8k8cv4D97LKwi+1EaMyBYip NoV8wTwbqRLLq3Dz47XLBaHfW9WQ2nBP2oIjbQGEiCYBhhH5aB7l23LCVXZUB2oHxwYFy4Yxl j27UeOHZNy6yRHWZ8zf5FaXfFZVkBKmcOtIVpTttLc+XqPxHlbffD+lC6FsXS1pSyWa1WnYX4 /4pAUOctWi6f1bf0D4ok9o7cAK+cS5bhrcxuUad4R75aBOQY5xi/BXce2bbFfMLxqq80Q3tJu Q2xuhKclB03895mm8d2UaRufhR0QBKaFJ1+/B7zGAQbFs0SM+LcJJ+eZFVc2zM5rZpFC4esN/ WEcv5AjlHDpdslAAf9wTJ9312YGWdzSFh8tp+HZNNf/gh2/TwrU0+86NkzlXNcxYPg8Lb1YxG pbztTBoLAPzh1onkKgTs4vf2AIwRIzqSxHhu52tTIdsO9A+S6Eymi8kET7s4eZEEMwox1IJrZ THELd5rbpdhHmUm0/SaKkjDbjqRCL52hfZ0WsIpw0slPSgbg9lFRSIaEwmFbkgjVOQSxQZkq7 4zkH8fUAh9N/pys8HEMOngbU+mRSNN/UnxGAnMa6EWn39tsYlmMXIWiEa48/eaolXZnmk1V6C w3l/yH2u7qR9mrtumL9KhDQlXdyQSOf4mujvneUEUY5J5fG4jTwp61SP2j6MPKWYKZNhHS5wl K1Wms3gBb5Urpws3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151116_132822_552439_3043664A X-CRM114-Status: GOOD ( 12.26 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthias Brugger , linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The recently added mt8173 cpufreq driver relies on the cpu topology that is always present on ARM64 but optional on ARM32: drivers/cpufreq/mt8173-cpufreq.c: In function 'mtk_cpufreq_init': drivers/cpufreq/mt8173-cpufreq.c:441:30: error: 'cpu_topology' undeclared (first use in this function) cpumask_copy(policy->cpus, &cpu_topology[policy->cpu].core_sibling); This refines the Kconfig dependencies so that we can still build on ARM32, but only if COMPILE_TEST is selected and the CPU topology code is present. Signed-off-by: Arnd Bergmann diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 1582c1c016b0..8014c2307332 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -84,6 +84,7 @@ config ARM_KIRKWOOD_CPUFREQ config ARM_MT8173_CPUFREQ bool "Mediatek MT8173 CPUFreq support" depends on ARCH_MEDIATEK && REGULATOR + depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST) depends on !CPU_THERMAL || THERMAL=y select PM_OPP help