diff mbox

[RFC] ARM: zynq: cpuidle: convert to platform driver

Message ID 1380212138-4020-1-git-send-email-daniel.lezcano@linaro.org (mailing list archive)
State RFC, archived
Headers show

Commit Message

Daniel Lezcano Sept. 26, 2013, 4:15 p.m. UTC
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    |    7 +++++++
 drivers/cpuidle/cpuidle-zynq.c |   15 ++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

Comments

Michal Simek Sept. 27, 2013, 5:12 a.m. UTC | #1
Hi Daniel,

On 09/26/2013 06:15 PM, 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    |    7 +++++++
>  drivers/cpuidle/cpuidle-zynq.c |   15 ++++++++++-----
>  2 files changed, 17 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 5f25256..0f0d88f 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,9 @@ static void __init zynq_init_machine(void)
>  	l2x0_of_init(0x02060000, 0xF0F0FFFF);
>  
>  	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
> +
> +	if (of_machine_is_compatible("xlnx,zynq-7000"))

This is not needed because all zynq platforms have this compatibility string
and there is no any other clone.

The rest is fine.

Thanks,
Michal


--
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
Daniel Lezcano Sept. 27, 2013, 7:21 a.m. UTC | #2
On 09/27/2013 07:12 AM, Michal Simek wrote:
> Hi Daniel,
>
> On 09/26/2013 06:15 PM, 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    |    7 +++++++
>>   drivers/cpuidle/cpuidle-zynq.c |   15 ++++++++++-----
>>   2 files changed, 17 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
>> index 5f25256..0f0d88f 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,9 @@ static void __init zynq_init_machine(void)
>>   	l2x0_of_init(0x02060000, 0xF0F0FFFF);
>>
>>   	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
>> +
>> +	if (of_machine_is_compatible("xlnx,zynq-7000"))
>
> This is not needed because all zynq platforms have this compatibility string
> and there is no any other clone.

Ah, ok. So it is not needed in the current code. I will write its 
removal in a separate patch.

Thanks
   -- Daniel
Michal Simek Sept. 27, 2013, 8:14 a.m. UTC | #3
On 09/27/2013 09:21 AM, Daniel Lezcano wrote:
> On 09/27/2013 07:12 AM, Michal Simek wrote:
>> Hi Daniel,
>>
>> On 09/26/2013 06:15 PM, 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    |    7 +++++++
>>>   drivers/cpuidle/cpuidle-zynq.c |   15 ++++++++++-----
>>>   2 files changed, 17 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
>>> index 5f25256..0f0d88f 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,9 @@ static void __init zynq_init_machine(void)
>>>       l2x0_of_init(0x02060000, 0xF0F0FFFF);
>>>
>>>       of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
>>> +
>>> +    if (of_machine_is_compatible("xlnx,zynq-7000"))
>>
>> This is not needed because all zynq platforms have this compatibility string
>> and there is no any other clone.
> 
> Ah, ok. So it is not needed in the current code. I will write its removal in a separate patch.

ok. Thanks.
Feel free to give there my ACK too.

Thanks,
Michal


--
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
diff mbox

Patch

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5f25256..0f0d88f 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,9 @@  static void __init zynq_init_machine(void)
 	l2x0_of_init(0x02060000, 0xF0F0FFFF);
 
 	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);
+
+	if (of_machine_is_compatible("xlnx,zynq-7000"))
+		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 38e03a1..c8bd261 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -70,14 +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(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);
 }
 
-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);