[PATCH 0/2] ARM: imx: kconfig changes for cpufreq-cpu0

[PATCH 0/2] ARM: imx: kconfig changes for cpufreq-cpu0

[Markus Pargmann]

Hi,

the generic cpufreq-cpu0 cpufreq driver can be used by imx27
and imx5 with DT. At the moment there are some missing kconfig
selects. This patch adds them and removes imx-cpufreq if
imx27 or imx5 are compiled with cpufreq-cpu0 and DT support.

Regards,

Markus

[PATCH 1/2] ARM: imx27, imx5: Add kconfig selects for cpufreq-cpu0

[Markus Pargmann]

There are some config options not selected by imx27 and imx5 that are
necessary to use the cpufreq-cpu0 driver.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4c9c6f9..4144fdc 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -128,6 +128,8 @@ config SOC_IMX25
 
 config SOC_IMX27
 	bool
+	select ARCH_HAS_CPUFREQ
+	select ARCH_HAS_OPP
 	select COMMON_CLK
 	select CPU_ARM926T
 	select IMX_HAVE_IOMUX_V1
@@ -155,6 +157,7 @@ config SOC_IMX35
 config SOC_IMX5
 	bool
 	select ARCH_HAS_CPUFREQ
+	select ARCH_HAS_OPP
 	select ARCH_MX5
 	select ARCH_MXC_IOMUX_V3
 	select COMMON_CLK
-- 
1.8.1.5

[PATCH 2/2] ARM: imx: Disable imx-cpufreq when cpufreq-cpu0 used

[Markus Pargmann]

cpufreq-cpu0 has DT support. So if imx27 or imx51 is booted with DT
support, it should not use the old imx-cpufreq driver. Instead the
operating-points should be defined in the appropriate DT files.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b71469..1247fe5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2156,6 +2156,7 @@ source "drivers/cpufreq/Kconfig"
 config CPU_FREQ_IMX
 	tristate "CPUfreq driver for i.MX CPUs"
 	depends on ARCH_MXC && CPU_FREQ
+	depends on (!GENERIC_CPUFREQ_CPU0 || (!MACH_IMX51_DT && !MACH_IMX27_DT))
 	select CPU_FREQ_TABLE
 	help
 	  This enables the CPUfreq driver for i.MX CPUs.
-- 
1.8.1.5

[PATCH 2/2] ARM: imx: Disable imx-cpufreq when cpufreq-cpu0 used

[Sascha Hauer]

On Sun, Mar 10, 2013 at 05:53:27PM +0100, Markus Pargmann wrote:
> cpufreq-cpu0 has DT support. So if imx27 or imx51 is booted with DT
> support, it should not use the old imx-cpufreq driver. Instead the
> operating-points should be defined in the appropriate DT files.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
>  arch/arm/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 5b71469..1247fe5 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -2156,6 +2156,7 @@ source "drivers/cpufreq/Kconfig"
>  config CPU_FREQ_IMX
>  	tristate "CPUfreq driver for i.MX CPUs"
>  	depends on ARCH_MXC && CPU_FREQ
> +	depends on (!GENERIC_CPUFREQ_CPU0 || (!MACH_IMX51_DT && !MACH_IMX27_DT))

Does this driver work with multiplatform anyway? I mean it registers
a cpufreq driver without knowing that the kernel even runs on i.MX.
Maybe removing it is the better option?

Sascha

>  	select CPU_FREQ_TABLE
>  	help
>  	  This enables the CPUfreq driver for i.MX CPUs.
> -- 
> 1.8.1.5
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/2] ARM: imx: Disable imx-cpufreq when cpufreq-cpu0 used

[Shawn Guo]

On Sun, Mar 10, 2013 at 11:51:59PM +0100, Sascha Hauer wrote:
> On Sun, Mar 10, 2013 at 05:53:27PM +0100, Markus Pargmann wrote:
> > cpufreq-cpu0 has DT support. So if imx27 or imx51 is booted with DT
> > support, it should not use the old imx-cpufreq driver. Instead the
> > operating-points should be defined in the appropriate DT files.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> >  arch/arm/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 5b71469..1247fe5 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -2156,6 +2156,7 @@ source "drivers/cpufreq/Kconfig"
> >  config CPU_FREQ_IMX
> >  	tristate "CPUfreq driver for i.MX CPUs"
> >  	depends on ARCH_MXC && CPU_FREQ
> > +	depends on (!GENERIC_CPUFREQ_CPU0 || (!MACH_IMX51_DT && !MACH_IMX27_DT))
> 
> Does this driver work with multiplatform anyway? I mean it registers
> a cpufreq driver without knowing that the kernel even runs on i.MX.
> Maybe removing it is the better option?
> 
+1 on killing imx cpufreq driver.

Shawn

[PATCH 2/2] ARM: imx: Disable imx-cpufreq when cpufreq-cpu0 used

[Markus Pargmann]

On Sun, Mar 10, 2013 at 11:51:59PM +0100, Sascha Hauer wrote:
> On Sun, Mar 10, 2013 at 05:53:27PM +0100, Markus Pargmann wrote:
> > cpufreq-cpu0 has DT support. So if imx27 or imx51 is booted with DT
> > support, it should not use the old imx-cpufreq driver. Instead the
> > operating-points should be defined in the appropriate DT files.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> > ---
> >  arch/arm/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 5b71469..1247fe5 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -2156,6 +2156,7 @@ source "drivers/cpufreq/Kconfig"
> >  config CPU_FREQ_IMX
> >  	tristate "CPUfreq driver for i.MX CPUs"
> >  	depends on ARCH_MXC && CPU_FREQ
> > +	depends on (!GENERIC_CPUFREQ_CPU0 || (!MACH_IMX51_DT && !MACH_IMX27_DT))
> 
> Does this driver work with multiplatform anyway? I mean it registers
> a cpufreq driver without knowing that the kernel even runs on i.MX.
> Maybe removing it is the better option?

It works with multiplatform builds. imx-cpufreq has a global get_cpu_op
function pointer that is set by the board init code. If it is not set,
the driver fails with EINVAL.

But when using cpufreq-cpu0 and platform specific code that still sets
the get_cpu_op function both drivers could run. So I thought it's
better to remove imx-cpufreq when cpufreq-cpu0 is used.

And +1 for removing imx-cpufreq.

Regards,

Markus

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |