From patchwork Sat Nov 15 03:20:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 40871 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BEAFB240ED for ; Sat, 15 Nov 2014 03:21:08 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id t10sf245565eei.4 for ; Fri, 14 Nov 2014 19:21:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=uNfpeXiopm+4uQSxWI8coZQqrbPEuF9bNZGSFywPqnA=; b=G7qqJIx2ZSUk2FyOZyoYnyZ0ZdD8E+4e7XBA6Hov7+9oUDRdN4MNhwnpZ2wenNTHqr fPZZGdbFwXOVtmE31hzyUfb0WcubQ/fRggKrMHkYT5esBzgDGvcjsHaCs3XwXfaOO0a1 WRJu5bTtBCGO+U2S09zINBl26Pv+3eAQC2bY7Fu/TdgkPgceE1OgmfHw9Kg8lYZ+TiN6 LjTMLggESufys4dcTxR965iOMj0icl9bp7NYovYuFLiO+opRvghQYvUG2/ZVMlXpld7U LFBIAQBKNqFJ3mTGVJmDnDBvDI5oG7Gc5JwCFMYIdp4kNWIIxnvwi6IsfJJY1qxI4Kxr SnBg== X-Gm-Message-State: ALoCoQkV1dd92dlFNqcIJtfy4gj2pN4U7pVHQHFkUWrDvv8RgQKCwS1EXvC5YqlD4MZryx+Wz6hE X-Received: by 10.112.166.102 with SMTP id zf6mr12322lbb.12.1416021667905; Fri, 14 Nov 2014 19:21:07 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.130 with SMTP id d2ls1107150laf.32.gmail; Fri, 14 Nov 2014 19:21:07 -0800 (PST) X-Received: by 10.152.206.11 with SMTP id lk11mr11923866lac.42.1416021667023; Fri, 14 Nov 2014 19:21:07 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id jj7si43539448lbc.65.2014.11.14.19.21.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Nov 2014 19:21:06 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id 10so13749647lbg.14 for ; Fri, 14 Nov 2014 19:21:06 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr11712612lbc.34.1416021666524; Fri, 14 Nov 2014 19:21:06 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp880159lbc; Fri, 14 Nov 2014 19:21:05 -0800 (PST) X-Received: by 10.66.124.136 with SMTP id mi8mr14553013pab.105.1416021664550; Fri, 14 Nov 2014 19:21:04 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zt3si16028410pbc.97.2014.11.14.19.21.03 for ; Fri, 14 Nov 2014 19:21:04 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934387AbaKODVC (ORCPT + 12 others); Fri, 14 Nov 2014 22:21:02 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36926 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934378AbaKODVB (ORCPT ); Fri, 14 Nov 2014 22:21:01 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so5122622pab.21 for ; Fri, 14 Nov 2014 19:21:01 -0800 (PST) X-Received: by 10.70.63.9 with SMTP id c9mr14500102pds.104.1416021660890; Fri, 14 Nov 2014 19:21:00 -0800 (PST) Received: from localhost ([122.166.94.182]) by mx.google.com with ESMTPSA id h1sm28970524pat.6.2014.11.14.19.20.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 14 Nov 2014 19:21:00 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, scottwood@freescale.com, Yuantian.Tang@freescale.com, Viresh Kumar Subject: [PATCH V2] cpufreq: Remove architecture specific menu entries Date: Sat, 15 Nov 2014 08:50:44 +0530 Message-Id: <5fa0e88cfecffe8ae45f2bde0aceb96cd65407e7.1416021588.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , CPUFreq driver's Kconfig entries are added in Kconfig. files and they are all included from the main Kconfig file using a menu entry. This creates another level of (unnecessary) hierarchy within the menuconfig entries. The problem occurs when there are drivers usable across architectures. Either their config entry is duplicated in all the supported architectures or is put into the main Kconfig entry. With the later one, we have menuconfig entries for drivers at two levels then. Fix these issues by getting rid of another level of menuconfig hierarchy and populate all drivers within the main cpufreq menu. To clearly distinguish where the drivers start from, also add a comment that will appear in menuconfig. Reported-by: Tang Yuantian Suggested-by: Scott Wood Signed-off-by: Viresh Kumar --- V2: Add: comment "CPU frequency scaling drivers" drivers/cpufreq/Kconfig | 50 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 3489f8f..230a912 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -183,6 +183,8 @@ config CPU_FREQ_GOV_CONSERVATIVE If in doubt, say N. +comment "CPU frequency scaling drivers" + config CPUFREQ_DT tristate "Generic DT based cpufreq driver" depends on HAVE_CLK && OF @@ -196,19 +198,19 @@ config CPUFREQ_DT If in doubt, say N. -menu "x86 CPU frequency scaling drivers" -depends on X86 +if X86 source "drivers/cpufreq/Kconfig.x86" -endmenu +endif -menu "ARM CPU frequency scaling drivers" -depends on ARM || ARM64 +if ARM || ARM64 source "drivers/cpufreq/Kconfig.arm" -endmenu +endif -menu "AVR32 CPU frequency scaling drivers" -depends on AVR32 +if PPC32 || PPC64 +source "drivers/cpufreq/Kconfig.powerpc" +endif +if AVR32 config AVR32_AT32AP_CPUFREQ bool "CPU frequency driver for AT32AP" depends on PLATFORM_AT32AP @@ -216,12 +218,9 @@ config AVR32_AT32AP_CPUFREQ help This enables the CPU frequency driver for AT32AP processors. If in doubt, say N. +endif -endmenu - -menu "CPUFreq processor drivers" -depends on IA64 - +if IA64 config IA64_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" depends on ACPI_PROCESSOR @@ -232,12 +231,9 @@ config IA64_ACPI_CPUFREQ For details, take a look at . If in doubt, say N. +endif -endmenu - -menu "MIPS CPUFreq processor drivers" -depends on MIPS - +if MIPS config LOONGSON2_CPUFREQ tristate "Loongson2 CPUFreq Driver" help @@ -249,16 +245,9 @@ config LOONGSON2_CPUFREQ For details, take a look at . If in doubt, say N. +endif -endmenu - -menu "PowerPC CPU frequency scaling drivers" -depends on PPC32 || PPC64 -source "drivers/cpufreq/Kconfig.powerpc" -endmenu - -menu "SPARC CPU frequency scaling drivers" -depends on SPARC64 +if SPARC64 config SPARC_US3_CPUFREQ tristate "UltraSPARC-III CPU Frequency driver" help @@ -276,10 +265,9 @@ config SPARC_US2E_CPUFREQ For details, take a look at . If in doubt, say N. -endmenu +endif -menu "SH CPU Frequency scaling" -depends on SUPERH +if SUPERH config SH_CPU_FREQ tristate "SuperH CPU Frequency driver" help @@ -293,7 +281,7 @@ config SH_CPU_FREQ For details, take a look at . If unsure, say N. -endmenu +endif endif endmenu