2020-01-08 10:07:32

by Marco Felsch

[permalink] [raw]
Subject: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>
---
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


2020-01-11 16:48:17

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>

Acked-by: Guenter Roeck <[email protected]>

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

2020-01-14 16:20:33

by Adam Thomson

[permalink] [raw]
Subject: RE: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>
> ---
> 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

2020-01-14 16:25:28

by Marco Felsch

[permalink] [raw]
Subject: Re: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>
> > ---
> > 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 |

2020-01-14 16:29:49

by Adam Thomson

[permalink] [raw]
Subject: RE: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>

>
> Regards,
> Marco
>
> > > Fixes: 9b40b030c4ad ("mfd: da9062: Supply core driver")
> > > Signed-off-by: Marco Felsch <[email protected]>
> > > ---
> > > 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 |

2020-01-16 13:37:08

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH 1/3] mfd: da9062: fix watchdog compatible string

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 <[email protected]>
> ---
> drivers/mfd/da9062-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

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