From patchwork Tue Jul 1 16:32:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 32919 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B0A7E20672 for ; Tue, 1 Jul 2014 16:35:46 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id eb12sf61887376oac.11 for ; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) 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:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=60Ewu96MhvH8kqtAs//eFNVLDneDchUtRld8ajvm9EE=; b=Ll1E1yWFo5SfvQ8px5w3BhlIQHoMQiQ43Hby3cBXVjp0LN8/5KXblDdbasDYTyQBXT RbcVmmrjz2JXymAFm/nDUOF4vbUH9ySZNlvmqTolfkU819AcEAZarN/ijuhPE3Y6PABh 0yMADBeNQRpo3BoGEilkee3kjJhy3r8nGgN2Uok1/fPUg/hyXQq2rp11rWOAcqadfTps dDcmYqhD3N3I2LxskCOeFgJhWIkmCjFJ7bpeP5qg2V3q1pWETZsABzfmeuGyhrVIxdYO Epi3G1Z//IAsMRfq008BDmFPEfgc9LZRiIHN8SMRqrpXsCtI0t5+7FDYlID5p7Q4axHi CgAQ== X-Gm-Message-State: ALoCoQmmzVvLpF8CgjegH+1lDBXRyunkh6doC/TF37AfZkij0QNbIE5EGg9tIGABOmUBr2BcUE0m X-Received: by 10.182.68.16 with SMTP id r16mr24741259obt.26.1404232546313; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.6 with SMTP id j6ls2229601qge.89.gmail; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) X-Received: by 10.52.69.133 with SMTP id e5mr1316163vdu.66.1404232546202; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id k3si11642307vcg.20.2014.07.01.09.35.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Jul 2014 09:35:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so9057785vcb.7 for ; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) X-Received: by 10.220.95.2 with SMTP id b2mr1555269vcn.61.1404232546107; Tue, 01 Jul 2014 09:35:46 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp228440vcb; Tue, 1 Jul 2014 09:35:45 -0700 (PDT) X-Received: by 10.68.133.7 with SMTP id oy7mr63188664pbb.43.1404232544929; Tue, 01 Jul 2014 09:35:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qz9si27488962pab.152.2014.07.01.09.35.44; Tue, 01 Jul 2014 09:35:44 -0700 (PDT) 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 S1758115AbaGAQfi (ORCPT + 13 others); Tue, 1 Jul 2014 12:35:38 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:41802 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758316AbaGAQff (ORCPT ); Tue, 1 Jul 2014 12:35:35 -0400 Received: by mail-pa0-f41.google.com with SMTP id fb1so10916771pad.28 for ; Tue, 01 Jul 2014 09:35:34 -0700 (PDT) X-Received: by 10.68.222.196 with SMTP id qo4mr62856328pbc.14.1404232534706; Tue, 01 Jul 2014 09:35:34 -0700 (PDT) Received: from localhost ([122.166.172.22]) by mx.google.com with ESMTPSA id gq4sm33412638pbc.64.2014.07.01.09.35.28 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Jul 2014 09:35:34 -0700 (PDT) From: Viresh Kumar To: rjw@rjwysocki.net, shawn.guo@linaro.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, arvind.chauhan@arm.com, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, spk.linux@gmail.com, thomas.ab@samsung.com, nm@ti.com, t.figa@samsung.com, Viresh Kumar Subject: [PATCH 13/14] cpufreq: cpu0: rename driver and internals to 'cpufreq_generic' Date: Tue, 1 Jul 2014 22:02:42 +0530 Message-Id: <17e1db05f7884b059a64ad7896be6a9ab4bc7fc8.1404231535.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: References: In-Reply-To: References: 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.220.176 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: , This is not a cpu0 driver anymore as it supports any number of clusters with separate clock/voltage lines. Lets rename it to 'cpufreq_generic' from 'cpufreq_cpu0'. '.name' field of platform driver/devices isn't renamed yet, would be done separately. Signed-off-by: Viresh Kumar --- .../{cpufreq-cpu0.txt => cpufreq-generic.txt} | 0 drivers/cpufreq/Kconfig | 10 +++--- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpufreq/Makefile | 2 +- .../cpufreq/{cpufreq-cpu0.c => cpufreq-generic.c} | 36 +++++++++++----------- 5 files changed, 25 insertions(+), 25 deletions(-) rename Documentation/devicetree/bindings/cpufreq/{cpufreq-cpu0.txt => cpufreq-generic.txt} (100%) rename drivers/cpufreq/{cpufreq-cpu0.c => cpufreq-generic.c} (91%) diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-generic.txt similarity index 100% rename from Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt rename to Documentation/devicetree/bindings/cpufreq/cpufreq-generic.txt diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index ffe350f..22b42d5 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -183,16 +183,16 @@ config CPU_FREQ_GOV_CONSERVATIVE If in doubt, say N. -config GENERIC_CPUFREQ_CPU0 - tristate "Generic CPU0 cpufreq driver" +config CPUFREQ_GENERIC + tristate "Generic cpufreq driver" depends on HAVE_CLK && OF - # if CPU_THERMAL is on and THERMAL=m, CPU0 cannot be =y: + # if CPU_THERMAL is on and THERMAL=m, GENERIC cannot be =y: depends on !CPU_THERMAL || THERMAL select PM_OPP help - This adds a generic cpufreq driver for CPU0 frequency management. + This adds a generic cpufreq driver for frequency management. It supports both uniprocessor (UP) and symmetric multiprocessor (SMP) - systems which share clock and voltage across all CPUs. + systems which may or maynot share clock and voltage across all CPUs. If in doubt, say N. diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index ebac671..16bdd31 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -92,7 +92,7 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW config ARM_HIGHBANK_CPUFREQ tristate "Calxeda Highbank-based" - depends on ARCH_HIGHBANK && GENERIC_CPUFREQ_CPU0 && REGULATOR + depends on ARCH_HIGHBANK && CPUFREQ_GENERIC && REGULATOR default m help This adds the CPUFreq driver for Calxeda Highbank SoC diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 738c8b7..0d0cddc 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o -obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o +obj-$(CONFIG_CPUFREQ_GENERIC) += cpufreq-generic.o ################################################################################## # x86 drivers. diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-generic.c similarity index 91% rename from drivers/cpufreq/cpufreq-cpu0.c rename to drivers/cpufreq/cpufreq-generic.c index b3f2bf0..ac8fd9f 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-generic.c @@ -4,7 +4,7 @@ * Copyright (C) 2014 Linaro. * Viresh Kumar * - * The OPP code in function cpu0_set_target() is reused from + * The OPP code in function set_target() is reused from * drivers/cpufreq/omap-cpufreq.c * * This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ struct private_data { unsigned int voltage_tolerance; /* in percentage */ }; -static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index) +static int set_target(struct cpufreq_policy *policy, unsigned int index) { struct dev_pm_opp *opp; struct cpufreq_frequency_table *freq_table = policy->freq_table; @@ -201,7 +201,7 @@ static void find_siblings(struct cpufreq_policy *policy) } } -static int cpu0_cpufreq_init(struct cpufreq_policy *policy) +static int cpufreq_init(struct cpufreq_policy *policy) { struct cpufreq_frequency_table *freq_table; struct thermal_cooling_device *cdev; @@ -318,7 +318,7 @@ out_put_reg_clk: return ret; } -static int cpu0_cpufreq_exit(struct cpufreq_policy *policy) +static int cpufreq_exit(struct cpufreq_policy *policy) { struct private_data *priv = policy->driver_data; @@ -332,18 +332,18 @@ static int cpu0_cpufreq_exit(struct cpufreq_policy *policy) return 0; } -static struct cpufreq_driver cpu0_cpufreq_driver = { +static struct cpufreq_driver generic_cpufreq_driver = { .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK, .verify = cpufreq_generic_frequency_table_verify, - .target_index = cpu0_set_target, + .target_index = set_target, .get = cpufreq_generic_get, - .init = cpu0_cpufreq_init, - .exit = cpu0_cpufreq_exit, - .name = "generic_cpu0", + .init = cpufreq_init, + .exit = cpufreq_exit, + .name = "cpufreq-generic", .attr = cpufreq_generic_attr, }; -static int cpu0_cpufreq_probe(struct platform_device *pdev) +static int generic_cpufreq_probe(struct platform_device *pdev) { struct device *cpu_dev; struct regulator *cpu_reg; @@ -365,30 +365,30 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) if (!IS_ERR(cpu_reg)) regulator_put(cpu_reg); - ret = cpufreq_register_driver(&cpu0_cpufreq_driver); + ret = cpufreq_register_driver(&generic_cpufreq_driver); if (ret) dev_err(cpu_dev, "failed register driver: %d\n", ret); return ret; } -static int cpu0_cpufreq_remove(struct platform_device *pdev) +static int generic_cpufreq_remove(struct platform_device *pdev) { - cpufreq_unregister_driver(&cpu0_cpufreq_driver); + cpufreq_unregister_driver(&generic_cpufreq_driver); return 0; } -static struct platform_driver cpu0_cpufreq_platdrv = { +static struct platform_driver generic_cpufreq_platdrv = { .driver = { .name = "cpufreq-cpu0", .owner = THIS_MODULE, }, - .probe = cpu0_cpufreq_probe, - .remove = cpu0_cpufreq_remove, + .probe = generic_cpufreq_probe, + .remove = generic_cpufreq_remove, }; -module_platform_driver(cpu0_cpufreq_platdrv); +module_platform_driver(generic_cpufreq_platdrv); MODULE_AUTHOR("Viresh Kumar "); MODULE_AUTHOR("Shawn Guo "); -MODULE_DESCRIPTION("Generic CPU0 cpufreq driver"); +MODULE_DESCRIPTION("Generic cpufreq driver"); MODULE_LICENSE("GPL");