| Message ID | 1406120453-29291-13-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 07/23/2014 03:00 PM, Thomas Petazzoni wrote: > This commit adds the list of cpuidle states supported by the Armada > 370 SoC in the cpuidle-mvebu-v7 driver, as well as the necessary logic > around it to support this SoC. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > drivers/cpuidle/cpuidle-mvebu-v7.c | 35 +++++++++++++++++++++++++++++++++-- > 1 file changed, 33 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c > index 7252fd8..d23597f 100644 > --- a/drivers/cpuidle/cpuidle-mvebu-v7.c > +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c > @@ -70,11 +70,32 @@ static struct cpuidle_driver armadaxp_idle_driver = { > .state_count = 3, > }; > > +static struct cpuidle_driver armada370_idle_driver = { > + .name = "armada_370_idle", > + .states[0] = ARM_CPUIDLE_WFI_STATE, > + .states[1] = { > + .enter = mvebu_v7_enter_idle, > + .exit_latency = 100, > + .power_usage = 5, > + .target_residency = 1000, > + .flags = (CPUIDLE_FLAG_TIME_VALID | > + MVEBU_V7_FLAG_DEEP_IDLE), > + .name = "Deep Idle", > + .desc = "CPU and L2 Fabric power down", > + }, > + .state_count = 2, > +}; > + > static int mvebu_v7_cpuidle_probe(struct platform_device *pdev) > { > - > mvebu_v7_cpu_suspend = pdev->dev.platform_data; > - return cpuidle_register(&armadaxp_idle_driver, NULL); > + > + if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-xp")) > + return cpuidle_register(&armadaxp_idle_driver, NULL); > + else if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-370")) > + return cpuidle_register(&armada370_idle_driver, NULL); > + else > + return -EINVAL; > } > > static struct platform_driver armadaxp_cpuidle_plat_driver = { > @@ -87,6 +108,16 @@ static struct platform_driver armadaxp_cpuidle_plat_driver = { > > module_platform_driver(armadaxp_cpuidle_plat_driver); > > +static struct platform_driver armada370_cpuidle_plat_driver = { > + .driver = { > + .name = "cpuidle-armada-370", > + .owner = THIS_MODULE, > + }, > + .probe = mvebu_v7_cpuidle_probe, > +}; > + > +module_platform_driver(armada370_cpuidle_plat_driver); > + > MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>"); > MODULE_DESCRIPTION("Marvell EBU v7 cpuidle driver"); > MODULE_LICENSE("GPL"); >
diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-mvebu-v7.c index 7252fd8..d23597f 100644 --- a/drivers/cpuidle/cpuidle-mvebu-v7.c +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c @@ -70,11 +70,32 @@ static struct cpuidle_driver armadaxp_idle_driver = { .state_count = 3, }; +static struct cpuidle_driver armada370_idle_driver = { + .name = "armada_370_idle", + .states[0] = ARM_CPUIDLE_WFI_STATE, + .states[1] = { + .enter = mvebu_v7_enter_idle, + .exit_latency = 100, + .power_usage = 5, + .target_residency = 1000, + .flags = (CPUIDLE_FLAG_TIME_VALID | + MVEBU_V7_FLAG_DEEP_IDLE), + .name = "Deep Idle", + .desc = "CPU and L2 Fabric power down", + }, + .state_count = 2, +}; + static int mvebu_v7_cpuidle_probe(struct platform_device *pdev) { - mvebu_v7_cpu_suspend = pdev->dev.platform_data; - return cpuidle_register(&armadaxp_idle_driver, NULL); + + if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-xp")) + return cpuidle_register(&armadaxp_idle_driver, NULL); + else if (!strcmp(pdev->dev.driver->name, "cpuidle-armada-370")) + return cpuidle_register(&armada370_idle_driver, NULL); + else + return -EINVAL; } static struct platform_driver armadaxp_cpuidle_plat_driver = { @@ -87,6 +108,16 @@ static struct platform_driver armadaxp_cpuidle_plat_driver = { module_platform_driver(armadaxp_cpuidle_plat_driver); +static struct platform_driver armada370_cpuidle_plat_driver = { + .driver = { + .name = "cpuidle-armada-370", + .owner = THIS_MODULE, + }, + .probe = mvebu_v7_cpuidle_probe, +}; + +module_platform_driver(armada370_cpuidle_plat_driver); + MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>"); MODULE_DESCRIPTION("Marvell EBU v7 cpuidle driver"); MODULE_LICENSE("GPL");
This commit adds the list of cpuidle states supported by the Armada 370 SoC in the cpuidle-mvebu-v7 driver, as well as the necessary logic around it to support this SoC. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- drivers/cpuidle/cpuidle-mvebu-v7.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-)