[PATCH] mfd/cpuidle: ux500: Rename driver symbol

[PATCH] mfd/cpuidle: ux500: Rename driver symbol

[Linus Walleij]

The PRCMU driver defines this as a DT node but there are no bindings
for it and it needs no data from the device tree. Just spawn the
device directly in the same way as the watchdog.

Name it "db8500-cpuidle" since there are no ambitions to support any
more SoCs than this one.

This rids this annoying boot message:
[    0.032610] cpuidle-dbx500: Failed to locate of_node [id: 0]

However I think the device still spawns and work just fine, despite
not finding a device tree node.

Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Rafael/Daniel: it would be perfect if one of you could ACK
this so that Lee can just merge this into the MFD tree as
a non-urgent fix.
---
 drivers/cpuidle/cpuidle-ux500.c | 2 +-
 drivers/mfd/db8500-prcmu.c      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
index a2d34be17a09..f7d778580e9b 100644
--- a/drivers/cpuidle/cpuidle-ux500.c
+++ b/drivers/cpuidle/cpuidle-ux500.c
@@ -117,7 +117,7 @@ static int dbx500_cpuidle_probe(struct platform_device *pdev)
 
 static struct platform_driver dbx500_cpuidle_plat_driver = {
 	.driver = {
-		.name = "cpuidle-dbx500",
+		.name = "db8500-cpuidle",
 	},
 	.probe = dbx500_cpuidle_probe,
 };
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 75049cf38832..64dd4f9a1e49 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2951,14 +2951,16 @@ static const struct mfd_cell common_prcmu_devs[] = {
 		.pdata_size = sizeof(db8500_wdt_pdata),
 		.id = -1,
 	},
+	{
+		.name = "db8500-cpuidle",
+		.id = -1,
+	},
 };
 
 static const struct mfd_cell db8500_prcmu_devs[] = {
 	MFD_CELL_OF("db8500-prcmu-regulators", NULL,
 		    &db8500_regulators, sizeof(db8500_regulators), 0,
 		    "stericsson,db8500-prcmu-regulator"),
-	MFD_CELL_OF("cpuidle-dbx500",
-		    NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),
 	MFD_CELL_OF("db8500-thermal",
 		    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
 };
-- 
2.31.1

Re: [PATCH] mfd/cpuidle: ux500: Rename driver symbol

[Daniel Lezcano]

On 02/08/2021 11:08, Linus Walleij wrote:
> The PRCMU driver defines this as a DT node but there are no bindings
> for it and it needs no data from the device tree. Just spawn the
> device directly in the same way as the watchdog.
> 
> Name it "db8500-cpuidle" since there are no ambitions to support any
> more SoCs than this one.
> 
> This rids this annoying boot message:
> [    0.032610] cpuidle-dbx500: Failed to locate of_node [id: 0]
> 
> However I think the device still spawns and work just fine, despite
> not finding a device tree node.
> 
> Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

> ---
> Rafael/Daniel: it would be perfect if one of you could ACK
> this so that Lee can just merge this into the MFD tree as
> a non-urgent fix.
> ---
>  drivers/cpuidle/cpuidle-ux500.c | 2 +-
>  drivers/mfd/db8500-prcmu.c      | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
> index a2d34be17a09..f7d778580e9b 100644
> --- a/drivers/cpuidle/cpuidle-ux500.c
> +++ b/drivers/cpuidle/cpuidle-ux500.c
> @@ -117,7 +117,7 @@ static int dbx500_cpuidle_probe(struct platform_device *pdev)
>  
>  static struct platform_driver dbx500_cpuidle_plat_driver = {
>  	.driver = {
> -		.name = "cpuidle-dbx500",
> +		.name = "db8500-cpuidle",
>  	},
>  	.probe = dbx500_cpuidle_probe,
>  };
> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index 75049cf38832..64dd4f9a1e49 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -2951,14 +2951,16 @@ static const struct mfd_cell common_prcmu_devs[] = {
>  		.pdata_size = sizeof(db8500_wdt_pdata),
>  		.id = -1,
>  	},
> +	{
> +		.name = "db8500-cpuidle",
> +		.id = -1,
> +	},
>  };
>  
>  static const struct mfd_cell db8500_prcmu_devs[] = {
>  	MFD_CELL_OF("db8500-prcmu-regulators", NULL,
>  		    &db8500_regulators, sizeof(db8500_regulators), 0,
>  		    "stericsson,db8500-prcmu-regulator"),
> -	MFD_CELL_OF("cpuidle-dbx500",
> -		    NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),
>  	MFD_CELL_OF("db8500-thermal",
>  		    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
>  };
> 


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

Re: [PATCH] mfd/cpuidle: ux500: Rename driver symbol

[Lee Jones]

On Mon, 02 Aug 2021, Linus Walleij wrote:

> The PRCMU driver defines this as a DT node but there are no bindings
> for it and it needs no data from the device tree. Just spawn the
> device directly in the same way as the watchdog.
> 
> Name it "db8500-cpuidle" since there are no ambitions to support any
> more SoCs than this one.
> 
> This rids this annoying boot message:
> [    0.032610] cpuidle-dbx500: Failed to locate of_node [id: 0]
> 
> However I think the device still spawns and work just fine, despite
> not finding a device tree node.
> 
> Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Rafael/Daniel: it would be perfect if one of you could ACK
> this so that Lee can just merge this into the MFD tree as
> a non-urgent fix.
> ---
>  drivers/cpuidle/cpuidle-ux500.c | 2 +-
>  drivers/mfd/db8500-prcmu.c      | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/cpuidle/cpuidle-ux500.c b/drivers/cpuidle/cpuidle-ux500.c
> index a2d34be17a09..f7d778580e9b 100644
> --- a/drivers/cpuidle/cpuidle-ux500.c
> +++ b/drivers/cpuidle/cpuidle-ux500.c
> @@ -117,7 +117,7 @@ static int dbx500_cpuidle_probe(struct platform_device *pdev)
>  
>  static struct platform_driver dbx500_cpuidle_plat_driver = {
>  	.driver = {
> -		.name = "cpuidle-dbx500",
> +		.name = "db8500-cpuidle",
>  	},
>  	.probe = dbx500_cpuidle_probe,
>  };
> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index 75049cf38832..64dd4f9a1e49 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -2951,14 +2951,16 @@ static const struct mfd_cell common_prcmu_devs[] = {
>  		.pdata_size = sizeof(db8500_wdt_pdata),
>  		.id = -1,
>  	},
> +	{
> +		.name = "db8500-cpuidle",
> +		.id = -1,
> +	},
>  };
>  
>  static const struct mfd_cell db8500_prcmu_devs[] = {
>  	MFD_CELL_OF("db8500-prcmu-regulators", NULL,
>  		    &db8500_regulators, sizeof(db8500_regulators), 0,
>  		    "stericsson,db8500-prcmu-regulator"),
> -	MFD_CELL_OF("cpuidle-dbx500",
> -		    NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),

Probably neater (with less semantic changes) if you just used:

  MFD_CELL_NAME()

>  	MFD_CELL_OF("db8500-thermal",
>  		    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
>  };

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog