| Message ID | 54ff6f4e8fe495d9a859a7a7aa61ac2e79f08551.1441083292.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 09/01, Viresh Kumar wrote: > OPP code is expanding and is already present in multiple directories > (cpufreq and power). Lets move it to its own directory, to manage it > better. > > This also moves/renames the cpufreq_opp file to cpu.c, as it will > contain helpers for cpu device. Its not just about cpufreq, other > frameworks can use OPPs as well. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> > diff --git a/drivers/base/power/opp/Makefile b/drivers/base/power/opp/Makefile > new file mode 100644 > index 000000000000..33c1e18c41a4 > --- /dev/null > +++ b/drivers/base/power/opp/Makefile > @@ -0,0 +1,2 @@ > +ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG It's odd that we use CONFIG_DEBUG_DRIVER here when that's talking about debugging the driver core. I wonder why this wouldn't be some OPP specific debug config option instead. But that was already there before so this topic is for another patch.
On 01-09-15, 15:51, Stephen Boyd wrote: > It's odd that we use CONFIG_DEBUG_DRIVER here when that's talking > about debugging the driver core. I wonder why this wouldn't be > some OPP specific debug config option instead. But that was > already there before so this topic is for another patch. I agree.. Maybe a separate patch to add Kconfig for both drivers/base/power and drivers/base/power/opp directories.
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index f94a6ccfe787..5998c53280f5 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile @@ -1,7 +1,7 @@ obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o obj-$(CONFIG_PM_TRACE_RTC) += trace.o -obj-$(CONFIG_PM_OPP) += opp.o +obj-$(CONFIG_PM_OPP) += opp/ obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o obj-$(CONFIG_HAVE_CLK) += clock_ops.o diff --git a/drivers/base/power/opp/Makefile b/drivers/base/power/opp/Makefile new file mode 100644 index 000000000000..33c1e18c41a4 --- /dev/null +++ b/drivers/base/power/opp/Makefile @@ -0,0 +1,2 @@ +ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG +obj-y += core.o cpu.o diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp/core.c similarity index 100% rename from drivers/base/power/opp.c rename to drivers/base/power/opp/core.c diff --git a/drivers/cpufreq/cpufreq_opp.c b/drivers/base/power/opp/cpu.c similarity index 97% rename from drivers/cpufreq/cpufreq_opp.c rename to drivers/base/power/opp/cpu.c index 0f5e6d5f6da0..0dd033016e9d 100644 --- a/drivers/cpufreq/cpufreq_opp.c +++ b/drivers/base/power/opp/cpu.c @@ -1,5 +1,5 @@ /* - * Generic OPP helper interface for CPUFreq drivers + * Generic OPP helper interface for CPU device * * Copyright (C) 2009-2014 Texas Instruments Incorporated. * Nishanth Menon @@ -20,6 +20,7 @@ #include <linux/rcupdate.h> #include <linux/slab.h> +#ifdef CONFIG_CPU_FREQ /** * dev_pm_opp_init_cpufreq_table() - create a cpufreq table for a device * @dev: device for which we do this operation @@ -112,3 +113,4 @@ void dev_pm_opp_free_cpufreq_table(struct device *dev, *table = NULL; } EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table); +#endif /* CONFIG_CPU_FREQ */ diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 9c75fafd2901..a66b6f13969b 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -1,6 +1,5 @@ # CPUfreq core obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o -obj-$(CONFIG_PM_OPP) += cpufreq_opp.o # CPUfreq stats obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o
OPP code is expanding and is already present in multiple directories (cpufreq and power). Lets move it to its own directory, to manage it better. This also moves/renames the cpufreq_opp file to cpu.c, as it will contain helpers for cpu device. Its not just about cpufreq, other frameworks can use OPPs as well. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/base/power/Makefile | 2 +- drivers/base/power/opp/Makefile | 2 ++ drivers/base/power/{opp.c => opp/core.c} | 0 drivers/{cpufreq/cpufreq_opp.c => base/power/opp/cpu.c} | 4 +++- drivers/cpufreq/Makefile | 1 - 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 drivers/base/power/opp/Makefile rename drivers/base/power/{opp.c => opp/core.c} (100%) rename drivers/{cpufreq/cpufreq_opp.c => base/power/opp/cpu.c} (97%)