| Message ID | 20200522064801.16822-2-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v2,1/3] regulator: max14577: Add proper dt-compatible strings | expand |
On 5/22/20 3:48 PM, Marek Szyprowski wrote: > Add device tree compatible strings and create proper modalias structures > to let this driver load automatically if compiled as module, because > max14577 MFD driver creates MFD cells with such compatible strings. > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > v2: > - added .of_match_table pointer > --- > drivers/extcon/extcon-max14577.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c > index 32f663436e6e..03af678ddeba 100644 > --- a/drivers/extcon/extcon-max14577.c > +++ b/drivers/extcon/extcon-max14577.c > @@ -782,9 +782,19 @@ static const struct platform_device_id max14577_muic_id[] = { > }; > MODULE_DEVICE_TABLE(platform, max14577_muic_id); > > +static const struct of_device_id of_max14577_muic_dt_match[] = { > + { .compatible = "maxim,max77836-muic", > + .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, > + { .compatible = "maxim,max14577-muic", > + .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, > + { }, How about changing the order between max77836 and max14577 as already added structure like platform_device_id if there are no specific reason as following:? static const struct of_device_id of_max14577_muic_dt_match[] = { { .compatible = "maxim,max14577-muic", .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, { .compatible = "maxim,max77836-muic", .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, { }, > +}; > +MODULE_DEVICE_TABLE(of, of_max14577_muic_dt_match); > + > static struct platform_driver max14577_muic_driver = { > .driver = { > .name = "max14577-muic", > + .of_match_table = of_max14577_muic_dt_match, > }, > .probe = max14577_muic_probe, > .remove = max14577_muic_remove, >
Hi Chanwoo, On 22.05.2020 09:08, Chanwoo Choi wrote: > On 5/22/20 3:48 PM, Marek Szyprowski wrote: >> Add device tree compatible strings and create proper modalias structures >> to let this driver load automatically if compiled as module, because >> max14577 MFD driver creates MFD cells with such compatible strings. >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >> --- >> v2: >> - added .of_match_table pointer >> --- >> drivers/extcon/extcon-max14577.c | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c >> index 32f663436e6e..03af678ddeba 100644 >> --- a/drivers/extcon/extcon-max14577.c >> +++ b/drivers/extcon/extcon-max14577.c >> @@ -782,9 +782,19 @@ static const struct platform_device_id max14577_muic_id[] = { >> }; >> MODULE_DEVICE_TABLE(platform, max14577_muic_id); >> >> +static const struct of_device_id of_max14577_muic_dt_match[] = { >> + { .compatible = "maxim,max77836-muic", >> + .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, >> + { .compatible = "maxim,max14577-muic", >> + .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, >> + { }, > How about changing the order between max77836 and max14577 as already added structure > like platform_device_id if there are no specific reason as following:? > > > static const struct of_device_id of_max14577_muic_dt_match[] = { > { .compatible = "maxim,max14577-muic", > .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, > { .compatible = "maxim,max77836-muic", > .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, > { }, Sure. I will swap them and send updated patch. This order comes from drivers/power/supply/max14577_charger.c, which also lacks .of_match_table, so I will also fix it. Best regards
Hi On 22.05.2020 10:30, Marek Szyprowski wrote: > Hi Chanwoo, > > On 22.05.2020 09:08, Chanwoo Choi wrote: >> On 5/22/20 3:48 PM, Marek Szyprowski wrote: >>> Add device tree compatible strings and create proper modalias >>> structures >>> to let this driver load automatically if compiled as module, because >>> max14577 MFD driver creates MFD cells with such compatible strings. >>> >>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >>> --- >>> v2: >>> - added .of_match_table pointer >>> --- >>> drivers/extcon/extcon-max14577.c | 10 ++++++++++ >>> 1 file changed, 10 insertions(+) >>> >>> diff --git a/drivers/extcon/extcon-max14577.c >>> b/drivers/extcon/extcon-max14577.c >>> index 32f663436e6e..03af678ddeba 100644 >>> --- a/drivers/extcon/extcon-max14577.c >>> +++ b/drivers/extcon/extcon-max14577.c >>> @@ -782,9 +782,19 @@ static const struct platform_device_id >>> max14577_muic_id[] = { >>> }; >>> MODULE_DEVICE_TABLE(platform, max14577_muic_id); >>> +static const struct of_device_id of_max14577_muic_dt_match[] = { >>> + { .compatible = "maxim,max77836-muic", >>> + .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, >>> + { .compatible = "maxim,max14577-muic", >>> + .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, >>> + { }, >> How about changing the order between max77836 and max14577 as already >> added structure >> like platform_device_id if there are no specific reason as following:? >> >> >> static const struct of_device_id of_max14577_muic_dt_match[] = { >> { .compatible = "maxim,max14577-muic", >> .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, >> { .compatible = "maxim,max77836-muic", >> .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, >> { }, > > Sure. I will swap them and send updated patch. This order comes from > drivers/power/supply/max14577_charger.c, which also lacks > .of_match_table, so I will also fix it. It looks that I've checked a wrong tree. I will send v3 with of_match_table sorted. I have no idea why the order is reversed. Best regards
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c index 32f663436e6e..03af678ddeba 100644 --- a/drivers/extcon/extcon-max14577.c +++ b/drivers/extcon/extcon-max14577.c @@ -782,9 +782,19 @@ static const struct platform_device_id max14577_muic_id[] = { }; MODULE_DEVICE_TABLE(platform, max14577_muic_id); +static const struct of_device_id of_max14577_muic_dt_match[] = { + { .compatible = "maxim,max77836-muic", + .data = (void *)MAXIM_DEVICE_TYPE_MAX77836, }, + { .compatible = "maxim,max14577-muic", + .data = (void *)MAXIM_DEVICE_TYPE_MAX14577, }, + { }, +}; +MODULE_DEVICE_TABLE(of, of_max14577_muic_dt_match); + static struct platform_driver max14577_muic_driver = { .driver = { .name = "max14577-muic", + .of_match_table = of_max14577_muic_dt_match, }, .probe = max14577_muic_probe, .remove = max14577_muic_remove,
Add device tree compatible strings and create proper modalias structures to let this driver load automatically if compiled as module, because max14577 MFD driver creates MFD cells with such compatible strings. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- v2: - added .of_match_table pointer --- drivers/extcon/extcon-max14577.c | 10 ++++++++++ 1 file changed, 10 insertions(+)