diff mbox series

[1/3] mfd: da9062: fix watchdog compatible string

Message ID 20200108095704.23233-2-m.felsch@pengutronix.de (mailing list archive)
State Not Applicable
Headers show
Series Explicit disable da9062 watchdog during suspend | expand

Commit Message

Marco Felsch Jan. 8, 2020, 9:57 a.m. UTC
The watchdog driver compatible is "dlg,da9062-watchdog" and not
"dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
fwnode. As result the watchdog driver can't parse the devicetree.

Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 drivers/mfd/da9062-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Guenter Roeck Jan. 11, 2020, 4:47 p.m. UTC | #1
On Wed, Jan 08, 2020 at 10:57:02AM +0100, Marco Felsch wrote:
> The watchdog driver compatible is "dlg,da9062-watchdog" and not
> "dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
> fwnode. As result the watchdog driver can't parse the devicetree.
> 
> Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/mfd/da9062-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
> index e69626867c26..9143de7b77b8 100644
> --- a/drivers/mfd/da9062-core.c
> +++ b/drivers/mfd/da9062-core.c
> @@ -248,7 +248,7 @@ static const struct mfd_cell da9062_devs[] = {
>  		.name		= "da9062-watchdog",
>  		.num_resources	= ARRAY_SIZE(da9062_wdt_resources),
>  		.resources	= da9062_wdt_resources,
> -		.of_compatible  = "dlg,da9062-wdt",
> +		.of_compatible  = "dlg,da9062-watchdog",
>  	},
>  	{
>  		.name		= "da9062-thermal",
Adam Thomson Jan. 14, 2020, 4:19 p.m. UTC | #2
On 08 January 2020 09:57, Marco Felsch wrote:

> The watchdog driver compatible is "dlg,da9062-watchdog" and not
> "dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
> fwnode. As result the watchdog driver can't parse the devicetree.
> 

I do agree there's a mismatch between the documentation and the MFD code.
So in your DT are you specifying 'dlg,da9062-watchdog' and not 'dlg,da9062-wdt'
hence the issue? Are there any existing users who are using 'dlg,da9062-wdt' in
their DT instead?

> Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  drivers/mfd/da9062-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
> index e69626867c26..9143de7b77b8 100644
> --- a/drivers/mfd/da9062-core.c
> +++ b/drivers/mfd/da9062-core.c
> @@ -248,7 +248,7 @@ static const struct mfd_cell da9062_devs[] = {
>  		.name		= "da9062-watchdog",
>  		.num_resources	= ARRAY_SIZE(da9062_wdt_resources),
>  		.resources	= da9062_wdt_resources,
> -		.of_compatible  = "dlg,da9062-wdt",
> +		.of_compatible  = "dlg,da9062-watchdog",
>  	},
>  	{
>  		.name		= "da9062-thermal",
> --
> 2.20.1
Marco Felsch Jan. 14, 2020, 4:23 p.m. UTC | #3
On 20-01-14 16:19, Adam Thomson wrote:
> On 08 January 2020 09:57, Marco Felsch wrote:
> 
> > The watchdog driver compatible is "dlg,da9062-watchdog" and not
> > "dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
> > fwnode. As result the watchdog driver can't parse the devicetree.
> > 
> 
> I do agree there's a mismatch between the documentation and the MFD code.
> So in your DT are you specifying 'dlg,da9062-watchdog' and not 'dlg,da9062-wdt'
> hence the issue? Are there any existing users who are using 'dlg,da9062-wdt' in
> their DT instead?

Yes the upstream available DT I'm currently using is:
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi.

I grep the code and found no _upstream_ user of 'dlg,da9062-wdt' also
using this compatible would be a missmatch with the binding
documentation. So those DT's assuming a wrong binding. Therefore I fixed
it here and not within the watchdog driver.

Regards,
  Marco

> > Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > ---
> >  drivers/mfd/da9062-core.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
> > index e69626867c26..9143de7b77b8 100644
> > --- a/drivers/mfd/da9062-core.c
> > +++ b/drivers/mfd/da9062-core.c
> > @@ -248,7 +248,7 @@ static const struct mfd_cell da9062_devs[] = {
> >  		.name		= "da9062-watchdog",
> >  		.num_resources	= ARRAY_SIZE(da9062_wdt_resources),
> >  		.resources	= da9062_wdt_resources,
> > -		.of_compatible  = "dlg,da9062-wdt",
> > +		.of_compatible  = "dlg,da9062-watchdog",
> >  	},
> >  	{
> >  		.name		= "da9062-thermal",
> > --
> > 2.20.1
> 
>
Adam Thomson Jan. 14, 2020, 4:28 p.m. UTC | #4
On 14 January 2020 16:24, Marco Felsch wrote:

> On 20-01-14 16:19, Adam Thomson wrote:
> > On 08 January 2020 09:57, Marco Felsch wrote:
> >
> > > The watchdog driver compatible is "dlg,da9062-watchdog" and not
> > > "dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
> > > fwnode. As result the watchdog driver can't parse the devicetree.
> > >
> >
> > I do agree there's a mismatch between the documentation and the MFD code.
> > So in your DT are you specifying 'dlg,da9062-watchdog' and not 'dlg,da9062-wdt'
> > hence the issue? Are there any existing users who are using 'dlg,da9062-wdt' in
> > their DT instead?
> 
> Yes the upstream available DT I'm currently using is:
> arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi.
> 
> I grep the code and found no _upstream_ user of 'dlg,da9062-wdt' also
> using this compatible would be a missmatch with the binding
> documentation. So those DT's assuming a wrong binding. Therefore I fixed
> it here and not within the watchdog driver.

Ok, no problem. Just wanted to be clear. In which case:

Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>

> 
> Regards,
>   Marco
> 
> > > Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > > ---
> > >  drivers/mfd/da9062-core.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
> > > index e69626867c26..9143de7b77b8 100644
> > > --- a/drivers/mfd/da9062-core.c
> > > +++ b/drivers/mfd/da9062-core.c
> > > @@ -248,7 +248,7 @@ static const struct mfd_cell da9062_devs[] = {
> > >  		.name		= "da9062-watchdog",
> > >  		.num_resources	= ARRAY_SIZE(da9062_wdt_resources),
> > >  		.resources	= da9062_wdt_resources,
> > > -		.of_compatible  = "dlg,da9062-wdt",
> > > +		.of_compatible  = "dlg,da9062-watchdog",
> > >  	},
> > >  	{
> > >  		.name		= "da9062-thermal",
> > > --
> > > 2.20.1
> >
> >
> 
> --
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
Lee Jones Jan. 16, 2020, 1:35 p.m. UTC | #5
On Wed, 08 Jan 2020, Marco Felsch wrote:

> The watchdog driver compatible is "dlg,da9062-watchdog" and not
> "dlg,da9062-wdt". Therefore the mfd-core can't populate the of_node and
> fwnode. As result the watchdog driver can't parse the devicetree.
> 
> Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  drivers/mfd/da9062-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.
diff mbox series

Patch

diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
index e69626867c26..9143de7b77b8 100644
--- a/drivers/mfd/da9062-core.c
+++ b/drivers/mfd/da9062-core.c
@@ -248,7 +248,7 @@  static const struct mfd_cell da9062_devs[] = {
 		.name		= "da9062-watchdog",
 		.num_resources	= ARRAY_SIZE(da9062_wdt_resources),
 		.resources	= da9062_wdt_resources,
-		.of_compatible  = "dlg,da9062-wdt",
+		.of_compatible  = "dlg,da9062-watchdog",
 	},
 	{
 		.name		= "da9062-thermal",