From patchwork Fri Oct 4 12:39:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 2988581 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 057D39F288 for ; Fri, 4 Oct 2013 12:40:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BE902025A for ; Fri, 4 Oct 2013 12:40:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2284320250 for ; Fri, 4 Oct 2013 12:40:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754016Ab3JDMki (ORCPT ); Fri, 4 Oct 2013 08:40:38 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:29250 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753824Ab3JDMkh (ORCPT ); Fri, 4 Oct 2013 08:40:37 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MU5009RG9UCDTM0@mailout1.samsung.com>; Fri, 04 Oct 2013 21:39:48 +0900 (KST) X-AuditID: cbfee61b-b7f776d0000016c8-84-524eb71374b2 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E4.97.05832.317BE425; Fri, 04 Oct 2013 21:39:48 +0900 (KST) Received: from amdc1032.localnet ([106.116.147.136]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MU500LR79UA8A20@mmp2.samsung.com>; Fri, 04 Oct 2013 21:39:47 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Eduardo Valentin Cc: Zhang Rui , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Kyungmin Park Subject: [PATCH 1/2] thermal: TI: remove TI_THERMAL dependency on CPU_THERMAL Date: Fri, 04 Oct 2013 14:39:43 +0200 Message-id: <1412622.ASunnW5zzY@amdc1032> User-Agent: KMail/4.8.4 (Linux/3.2.0-52-generic-pae; KDE/4.8.5; i686; ; ) MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset=us-ascii X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGLMWRmVeSWpSXmKPExsVy+t9jQV2R7X5BBm1HmSzW7P/JZHG26Q27 xeVdc9gsPvceYbR48rCPzYHVY/Gel0wefVtWMXocv7GdyePzJrkAligum5TUnMyy1CJ9uwSu jH23zrIXvOCv+HNtKlsD43beLkZODgkBE4lVW94xQthiEhfurWfrYuTiEBKYzijR+mIeO4TT wiQx+egNdpAqNgEriYntq8A6RAT0JG68eMIEUsQs0MEocW/9JlaQhLCAr8SGmRuZQGwWAVWJ tpUvwBp4BTQl2j/2gMVFBTwlPk1aygwRF5T4MfkeC4jNLCAvsW//VFYIW0ti/c7jTBMY+WYh KZuFpGwWkrIFjMyrGEVTC5ILipPSc430ihNzi0vz0vWS83M3MYJD85n0DsZVDRaHGAU4GJV4 eDcU+wYJsSaWFVfmHmKU4GBWEuE9PskvSIg3JbGyKrUoP76oNCe1+BCjNAeLkjjvwVbrQCGB 9MSS1OzU1ILUIpgsEwenVANj+jaZnw7LpDukj0XvSHzgU5bBs4lT8dffoHW1rH5F16rLZ6yO M17Btkov+udH4bjcigNvPl3Y/Gr2wzb9iXf0pe9GH2fIs5hgXF60NubAMt3Yf9tUCn6uqnaw VPiZskqicpnchUwnN5PsqQJHMhwLOeVvbr3/pfS0yCWZS7dsWUKkNddceb5biaU4I9FQi7mo OBEAjSS1ckkCAAA= Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Cover cpufreq_get_current_driver() call in ti-thermal-common.c with CPU_FREQ ifdefs and remove no longer needed CPU_THERMAL dependency from TI_THERMAL config option (stubs for other cpufreq functions for CPU_THERMAL=n case are already available). Please note that this enables TI_THERMAL config option in the final config derived from omap2plus_defconfig (which enables CPU_THERMAL config option but without CPU_FREQ one so TI_THERMAL config option was not enabled previously in the final config). Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Kyungmin Park --- drivers/thermal/ti-soc-thermal/Kconfig | 1 - drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig index bd4c7be..bf5d6e4 100644 --- a/drivers/thermal/ti-soc-thermal/Kconfig +++ b/drivers/thermal/ti-soc-thermal/Kconfig @@ -13,7 +13,6 @@ config TI_SOC_THERMAL config TI_THERMAL bool "Texas Instruments SoCs thermal framework support" depends on TI_SOC_THERMAL - depends on CPU_THERMAL help If you say yes here you want to get support for generic thermal framework for the Texas Instruments on die bandgap temperature sensor. diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 4f8b9af..94d91af 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -357,10 +357,12 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) if (!data) return -EINVAL; +#ifdef CONFIG_CPU_FREQ if (!cpufreq_get_current_driver()) { dev_dbg(bgp->dev, "no cpufreq driver yet\n"); return -EPROBE_DEFER; } +#endif /* Register cooling device */ data->cool_dev = cpufreq_cooling_register(cpu_present_mask);