[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Daniel Lezcano]

All zynq platforms have this compatibility string and there is no any other
clone.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/cpuidle/cpuidle-zynq.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index 38e03a1..ab6c4b4 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -28,7 +28,6 @@
 #include <linux/init.h>
 #include <linux/cpu_pm.h>
 #include <linux/cpuidle.h>
-#include <linux/of.h>
 #include <asm/proc-fns.h>
 #include <asm/cpuidle.h>
 
@@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
 /* Initialize CPU idle by registering the idle states */
 static int __init zynq_cpuidle_init(void)
 {
-	if (!of_machine_is_compatible("xlnx,zynq-7000"))
-		return -ENODEV;
-
 	pr_info("Xilinx Zynq CpuIdle Driver started\n");
 
 	return cpuidle_register(&zynq_idle_driver, NULL);
-- 
1.7.9.5

[PATCH 2/2] ARM: zynq: cpuidle: convert to platform driver

[Daniel Lezcano]

As the ux500 and the kirkwood driver, make the zynq driver a platform driver

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 arch/arm/mach-zynq/common.c    |    6 ++++++
 drivers/cpuidle/cpuidle-zynq.c |   13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5f25256..9a7bd13 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -44,6 +44,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = {
 	{}
 };
 
+static struct platform_device zynq_cpuidle_device = {
+	.name = "cpuidle-zynq",
+};
+
 /**
  * zynq_init_machine - System specific initialization, intended to be
  *		       called from board specific initialization.
@@ -56,6 +60,8 @@ static void __init zynq_init_machine(void)
 	l2x0_of_init(0x02060000, 0xF0F0FFFF);
 
 	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
+
+	platform_device_register(&zynq_cpuidle_device);
 }
 
 static void __init zynq_timer_init(void)
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index ab6c4b4..2ea3ebe 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/cpu_pm.h>
 #include <linux/cpuidle.h>
+#include <linux/platform_device.h>
 #include <asm/proc-fns.h>
 #include <asm/cpuidle.h>
 
@@ -69,11 +70,19 @@ static struct cpuidle_driver zynq_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int __init zynq_cpuidle_init(void)
+static int __init zynq_cpuidle_probe(struct platform_device *pdev)
 {
 	pr_info("Xilinx Zynq CpuIdle Driver started\n");
 
 	return cpuidle_register(&zynq_idle_driver, NULL);
 }
 
-device_initcall(zynq_cpuidle_init);
+static struct platform_driver zynq_cpuidle_driver = {
+	.driver = {
+		.name = "cpuidle-zynq",
+		.owner = THIS_MODULE,
+	},
+	.probe = zynq_cpuidle_probe,
+};
+
+module_platform_driver(zynq_cpuidle_driver);
-- 
1.7.9.5

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Michal Simek]

On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> All zynq platforms have this compatibility string and there is no any other
> clone.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  drivers/cpuidle/cpuidle-zynq.c |    4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
> index 38e03a1..ab6c4b4 100644
> --- a/drivers/cpuidle/cpuidle-zynq.c
> +++ b/drivers/cpuidle/cpuidle-zynq.c
> @@ -28,7 +28,6 @@
>  #include <linux/init.h>
>  #include <linux/cpu_pm.h>
>  #include <linux/cpuidle.h>
> -#include <linux/of.h>
>  #include <asm/proc-fns.h>
>  #include <asm/cpuidle.h>
>  
> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>  /* Initialize CPU idle by registering the idle states */
>  static int __init zynq_cpuidle_init(void)
>  {
> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
> -		return -ENODEV;
> -
>  	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>  
>  	return cpuidle_register(&zynq_idle_driver, NULL);
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thx,
M

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Daniel Lezcano]

On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> All zynq platforms have this compatibility string and there is no any other
> clone.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

As I don't have the hardware, this patchset is just compile tested.

> ---
>   drivers/cpuidle/cpuidle-zynq.c |    4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
> index 38e03a1..ab6c4b4 100644
> --- a/drivers/cpuidle/cpuidle-zynq.c
> +++ b/drivers/cpuidle/cpuidle-zynq.c
> @@ -28,7 +28,6 @@
>   #include <linux/init.h>
>   #include <linux/cpu_pm.h>
>   #include <linux/cpuidle.h>
> -#include <linux/of.h>
>   #include <asm/proc-fns.h>
>   #include <asm/cpuidle.h>
>
> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>   /* Initialize CPU idle by registering the idle states */
>   static int __init zynq_cpuidle_init(void)
>   {
> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
> -		return -ENODEV;
> -
>   	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>
>   	return cpuidle_register(&zynq_idle_driver, NULL);
>


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 2/2] ARM: zynq: cpuidle: convert to platform driver

[Michal Simek]

On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> As the ux500 and the kirkwood driver, make the zynq driver a platform driver
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  arch/arm/mach-zynq/common.c    |    6 ++++++
>  drivers/cpuidle/cpuidle-zynq.c |   13 +++++++++++--
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 5f25256..9a7bd13 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -44,6 +44,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = {
>  	{}
>  };
>  
> +static struct platform_device zynq_cpuidle_device = {
> +	.name = "cpuidle-zynq",
> +};
> +
>  /**
>   * zynq_init_machine - System specific initialization, intended to be
>   *		       called from board specific initialization.
> @@ -56,6 +60,8 @@ static void __init zynq_init_machine(void)
>  	l2x0_of_init(0x02060000, 0xF0F0FFFF);
>  
>  	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
> +
> +	platform_device_register(&zynq_cpuidle_device);
>  }
>  
>  static void __init zynq_timer_init(void)
> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
> index ab6c4b4..2ea3ebe 100644
> --- a/drivers/cpuidle/cpuidle-zynq.c
> +++ b/drivers/cpuidle/cpuidle-zynq.c
> @@ -28,6 +28,7 @@
>  #include <linux/init.h>
>  #include <linux/cpu_pm.h>
>  #include <linux/cpuidle.h>
> +#include <linux/platform_device.h>
>  #include <asm/proc-fns.h>
>  #include <asm/cpuidle.h>
>  
> @@ -69,11 +70,19 @@ static struct cpuidle_driver zynq_idle_driver = {
>  };
>  
>  /* Initialize CPU idle by registering the idle states */
> -static int __init zynq_cpuidle_init(void)
> +static int __init zynq_cpuidle_probe(struct platform_device *pdev)
>  {
>  	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>  
>  	return cpuidle_register(&zynq_idle_driver, NULL);
>  }
>  
> -device_initcall(zynq_cpuidle_init);
> +static struct platform_driver zynq_cpuidle_driver = {
> +	.driver = {
> +		.name = "cpuidle-zynq",
> +		.owner = THIS_MODULE,
> +	},
> +	.probe = zynq_cpuidle_probe,
> +};
> +
> +module_platform_driver(zynq_cpuidle_driver);
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thx,
M

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Daniel Lezcano]

On 09/27/2013 10:19 AM, Michal Simek wrote:
> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>> All zynq platforms have this compatibility string and there is no any other
>> clone.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

The patchset is only compile-tested (I don't have the hardware).

Michal or someone else, if you have the time can you give it a try ?

Thanks in advance

   -- Daniel

>> ---
>>   drivers/cpuidle/cpuidle-zynq.c |    4 ----
>>   1 file changed, 4 deletions(-)
>>
>> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
>> index 38e03a1..ab6c4b4 100644
>> --- a/drivers/cpuidle/cpuidle-zynq.c
>> +++ b/drivers/cpuidle/cpuidle-zynq.c
>> @@ -28,7 +28,6 @@
>>   #include <linux/init.h>
>>   #include <linux/cpu_pm.h>
>>   #include <linux/cpuidle.h>
>> -#include <linux/of.h>
>>   #include <asm/proc-fns.h>
>>   #include <asm/cpuidle.h>
>>
>> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>>   /* Initialize CPU idle by registering the idle states */
>>   static int __init zynq_cpuidle_init(void)
>>   {
>> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
>> -		return -ENODEV;
>> -
>>   	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>>
>>   	return cpuidle_register(&zynq_idle_driver, NULL);
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>
>
> Thx,
> M
>
>


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Michal Simek]

On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> On 09/27/2013 10:19 AM, Michal Simek wrote:
>> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>>> All zynq platforms have this compatibility string and there is no any other
>>> clone.
>>>
>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> 
> The patchset is only compile-tested (I don't have the hardware).
> 
> Michal or someone else, if you have the time can you give it a try ?
> 

Soren: Can you please retest it on hw?

Thanks,
Michal

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Sören Brinkmann]

On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
> On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> > On 09/27/2013 10:19 AM, Michal Simek wrote:
> >> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> >>> All zynq platforms have this compatibility string and there is no any other
> >>> clone.
> >>>
> >>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> > 
> > The patchset is only compile-tested (I don't have the hardware).
> > 
> > Michal or someone else, if you have the time can you give it a try ?
> > 
> 
> Soren: Can you please retest it on hw?
Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
patchworks.

The series introduces new build warnings:
WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

  CC      kernel/trace/trace.o
  LD      drivers/built-in.o
WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

  LD      kernel/trace/built-in.o
  LD      kernel/built-in.o
  LINK    vmlinux
  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console


Other than that it looks good. I assume there is just some __init
annotation missing somewhere. Feel free to add my 'Tested-by'.

	S?ren

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Daniel Lezcano]

On 09/27/2013 05:58 PM, S?ren Brinkmann wrote:
> On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
>> On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
>>> On 09/27/2013 10:19 AM, Michal Simek wrote:
>>>> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>>>>> All zynq platforms have this compatibility string and there is no any other
>>>>> clone.
>>>>>
>>>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>
>>> The patchset is only compile-tested (I don't have the hardware).
>>>
>>> Michal or someone else, if you have the time can you give it a try ?
>>>
>>
>> Soren: Can you please retest it on hw?
> Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
> patchworks.
>
> The series introduces new build warnings:
> WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
>
>    CC      kernel/trace/trace.o
>    LD      drivers/built-in.o
> WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
>
>    LD      kernel/trace/built-in.o
>    LD      kernel/built-in.o
>    LINK    vmlinux
>    LD      vmlinux.o
>    MODPOST vmlinux.o
> WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

Oops, right, I missed the section mismatch. Thanks for pointing this out.

> Other than that it looks good. I assume there is just some __init
> annotation missing somewhere. Feel free to add my 'Tested-by'.

Cool ! Thanks Soren for testing.

I will take the patchn with the init section fixed, in my tree if you 
are ok with that.

   -- Daniel



-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 1/2] ARM: zynq: cpuidle: Remove useless compatibility string

[Sören Brinkmann]

On Fri, Sep 27, 2013 at 06:36:14PM +0200, Daniel Lezcano wrote:
> On 09/27/2013 05:58 PM, S?ren Brinkmann wrote:
> >On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
> >>On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> >>>On 09/27/2013 10:19 AM, Michal Simek wrote:
> >>>>On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> >>>>>All zynq platforms have this compatibility string and there is no any other
> >>>>>clone.
> >>>>>
> >>>>>Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> >>>
> >>>The patchset is only compile-tested (I don't have the hardware).
> >>>
> >>>Michal or someone else, if you have the time can you give it a try ?
> >>>
> >>
> >>Soren: Can you please retest it on hw?
> >Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
> >patchworks.
> >
> >The series introduces new build warnings:
> >WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> >
> >   CC      kernel/trace/trace.o
> >   LD      drivers/built-in.o
> >WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> >
> >   LD      kernel/trace/built-in.o
> >   LD      kernel/built-in.o
> >   LINK    vmlinux
> >   LD      vmlinux.o
> >   MODPOST vmlinux.o
> >WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> 
> Oops, right, I missed the section mismatch. Thanks for pointing this out.
> 
> >Other than that it looks good. I assume there is just some __init
> >annotation missing somewhere. Feel free to add my 'Tested-by'.
> 
> Cool ! Thanks Soren for testing.
> 
> I will take the patchn with the init section fixed, in my tree if
> you are ok with that.
Sounds good to me.

	S?ren