| Message ID | 1393208877-15797-1-git-send-email-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Monday, February 24, 2014 11:27:57 AM Mark Brown wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Enable cpufreq and power kconfig menus on arm64 along with arm cpufreq > drivers. The power menu is needed for OPP support. At least on Calxeda > systems, the same cpufreq driver is used for arm and arm64 based > systems. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Signed-off-by: Mark Brown <broonie@linaro.org> Queued up for 3.15, thanks! > --- > arch/arm64/Kconfig | 8 ++++++++ > drivers/cpufreq/Kconfig | 2 +- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index fea7b47..939e95a 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -327,6 +327,14 @@ source "drivers/cpuidle/Kconfig" > > endmenu > > +menu "Power management options" > + > +source "kernel/power/Kconfig" > + > +source "drivers/cpufreq/Kconfig" > + > +endmenu > + > source "net/Kconfig" > > source "drivers/Kconfig" > diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig > index 4b029c0..1fbe11f 100644 > --- a/drivers/cpufreq/Kconfig > +++ b/drivers/cpufreq/Kconfig > @@ -200,7 +200,7 @@ source "drivers/cpufreq/Kconfig.x86" > endmenu > > menu "ARM CPU frequency scaling drivers" > -depends on ARM > +depends on ARM || ARM64 > source "drivers/cpufreq/Kconfig.arm" > endmenu > >
Hi Mark, Sorry for late response, looks like Rafael has pulled this change, but ... On 24/02/14 02:27, Mark Brown wrote: > From: Rob Herring <rob.herring@calxeda.com> > > Enable cpufreq and power kconfig menus on arm64 along with arm cpufreq > drivers. The power menu is needed for OPP support. At least on Calxeda > systems, the same cpufreq driver is used for arm and arm64 based > systems. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Signed-off-by: Mark Brown <broonie@linaro.org> > --- > arch/arm64/Kconfig | 8 ++++++++ > drivers/cpufreq/Kconfig | 2 +- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index fea7b47..939e95a 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -327,6 +327,14 @@ source "drivers/cpuidle/Kconfig" > > endmenu > > +menu "Power management options" > + > +source "kernel/power/Kconfig" > + > +source "drivers/cpufreq/Kconfig" > + > +endmenu > + Is this patch based on recent kernels ? If so, either it should have caused conflicts or silently duplicated the entries. "Power management options" are already present. Also to be more consistent it with menu options, I would prefer this to be placed under "CPU Power Management" like CPUIdle. Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Mar 11, 2014 at 12:27:01PM +0000, Sudeep Holla wrote: > Sorry for late response, looks like Rafael has pulled this change, but ... > >+menu "Power management options" > >+ > >+source "kernel/power/Kconfig" > >+ > >+source "drivers/cpufreq/Kconfig" > >+ > >+endmenu > Is this patch based on recent kernels ? If so, either it should have caused > conflicts or silently duplicated the entries. "Power management options" are > already present. Yes, it was against -next. It looks like either the original patch had the duplication or it crept in there during the rather lengthy time between submission and acceptance. > Also to be more consistent it with menu options, I would prefer this to be > placed under "CPU Power Management" like CPUIdle. I'll submit an incremental patch for this; in general the best thing to do once things have been applied is to send a patch.
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fea7b47..939e95a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -327,6 +327,14 @@ source "drivers/cpuidle/Kconfig" endmenu +menu "Power management options" + +source "kernel/power/Kconfig" + +source "drivers/cpufreq/Kconfig" + +endmenu + source "net/Kconfig" source "drivers/Kconfig" diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 4b029c0..1fbe11f 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -200,7 +200,7 @@ source "drivers/cpufreq/Kconfig.x86" endmenu menu "ARM CPU frequency scaling drivers" -depends on ARM +depends on ARM || ARM64 source "drivers/cpufreq/Kconfig.arm" endmenu