| Message ID | 20211108150554.4457-4-conor.dooley@microchip.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Update the icicle kit device tree | expand |
On 08/11/2021 16:05, conor.dooley@microchip.com wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Update 'compatible' strings for system controller drivers to the > approved Microchip name. > > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > .../bindings/mailbox/microchip,polarfire-soc-mailbox.yaml | 4 +++- > .../soc/microchip/microchip,polarfire-soc-sys-controller.yaml | 4 +++- > drivers/mailbox/mailbox-mpfs.c | 1 + > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > index bbb173ea483c..b08c8a158eea 100644 > --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > @@ -11,7 +11,9 @@ maintainers: > > properties: > compatible: > - const: microchip,polarfire-soc-mailbox > + enum: > + - microchip,polarfire-soc-mailbox > + - microchip,mpfs-mailbox > > reg: > items: > diff --git a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > index 2cd3bc6bd8d6..d6c953cd154b 100644 > --- a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > +++ b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > @@ -19,7 +19,9 @@ properties: > maxItems: 1 > > compatible: > - const: microchip,polarfire-soc-sys-controller > + enum: > + - microchip,polarfire-soc-sys-controller > + - microchip,mpfs-sys-controller > > required: > - compatible > diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c > index 0d6e2231a2c7..9d5e558a6ee6 100644 > --- a/drivers/mailbox/mailbox-mpfs.c > +++ b/drivers/mailbox/mailbox-mpfs.c > @@ -233,6 +233,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) > > static const struct of_device_id mpfs_mbox_of_match[] = { > {.compatible = "microchip,polarfire-soc-mailbox", }, > + {.compatible = "microchip,mpfs-mailbox", }, > {}, > }; > MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match); Please split the bindings from the code. Best regards, Krzysztof
Hi Conor, On Mon, Nov 8, 2021 at 4:06 PM <conor.dooley@microchip.com> wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Update 'compatible' strings for system controller drivers to the > approved Microchip name. > > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Thanks for your patch! > --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > @@ -11,7 +11,9 @@ maintainers: > > properties: > compatible: > - const: microchip,polarfire-soc-mailbox > + enum: > + - microchip,polarfire-soc-mailbox > + - microchip,mpfs-mailbox Is there any point in keeping the old compatible value? Are there any real users? Most of the MPFS upstream DT is still in flux. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 09/11/2021 08:33, Geert Uytterhoeven wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > Hi Conor, > > On Mon, Nov 8, 2021 at 4:06 PM <conor.dooley@microchip.com> wrote: >> From: Conor Dooley <conor.dooley@microchip.com> >> >> Update 'compatible' strings for system controller drivers to the >> approved Microchip name. >> >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > > Thanks for your patch! > >> --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml >> +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml >> @@ -11,7 +11,9 @@ maintainers: >> >> properties: >> compatible: >> - const: microchip,polarfire-soc-mailbox >> + enum: >> + - microchip,polarfire-soc-mailbox >> + - microchip,mpfs-mailbox > > Is there any point in keeping the old compatible value? > Are there any real users? Most of the MPFS upstream DT is still in flux. yeah, true. and now is as good a time as any to just outright change it. > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds >
On Mon, Nov 08, 2021 at 03:05:44PM +0000, conor.dooley@microchip.com wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > Update 'compatible' strings for system controller drivers to the > approved Microchip name. Why do I care what Microchip approved? You all picked identifiers (that's all it is) and now get to live with them. > > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > .../bindings/mailbox/microchip,polarfire-soc-mailbox.yaml | 4 +++- > .../soc/microchip/microchip,polarfire-soc-sys-controller.yaml | 4 +++- > drivers/mailbox/mailbox-mpfs.c | 1 + > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > index bbb173ea483c..b08c8a158eea 100644 > --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml > @@ -11,7 +11,9 @@ maintainers: > > properties: > compatible: > - const: microchip,polarfire-soc-mailbox > + enum: > + - microchip,polarfire-soc-mailbox > + - microchip,mpfs-mailbox > > reg: > items: > diff --git a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > index 2cd3bc6bd8d6..d6c953cd154b 100644 > --- a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > +++ b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml > @@ -19,7 +19,9 @@ properties: > maxItems: 1 > > compatible: > - const: microchip,polarfire-soc-sys-controller > + enum: > + - microchip,polarfire-soc-sys-controller > + - microchip,mpfs-sys-controller > > required: > - compatible > diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c > index 0d6e2231a2c7..9d5e558a6ee6 100644 > --- a/drivers/mailbox/mailbox-mpfs.c > +++ b/drivers/mailbox/mailbox-mpfs.c > @@ -233,6 +233,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) > > static const struct of_device_id mpfs_mbox_of_match[] = { > {.compatible = "microchip,polarfire-soc-mailbox", }, > + {.compatible = "microchip,mpfs-mailbox", }, > {}, > }; > MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match); > -- > 2.33.1 > >
On 29/11/2021 20:03, Rob Herring wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Mon, Nov 08, 2021 at 03:05:44PM +0000, conor.dooley@microchip.com wrote: >> From: Conor Dooley <conor.dooley@microchip.com> >> >> Update 'compatible' strings for system controller drivers to the >> approved Microchip name. > > Why do I care what Microchip approved? You all picked identifiers > (that's all it is) and now get to live with them. Hi Rob, You're speaking to the person who was perfectly happy with "polarfire-soc" when I wrote the binding last year, but I was asked to change it in order avoid having a different compatible string in the device tree for the soc and in the binding for a device that only exists in that soc. If the v2 was a complete rename from "polarfire-soc-*" to "mpfs-*", including the file name - as opposed to an addition and I changed the commit message to the following would you be happier with the patch? > Change "polarfire-soc-*" compatible strings to "mpfs-*" in its system > controller bindings in order to match the compatible string used in > the soc binding and device tree. Thanks, Conor. > >> >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >> --- >> .../bindings/mailbox/microchip,polarfire-soc-mailbox.yaml | 4 +++- >> .../soc/microchip/microchip,polarfire-soc-sys-controller.yaml | 4 +++- >> drivers/mailbox/mailbox-mpfs.c | 1 + >> 3 files changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml >> index bbb173ea483c..b08c8a158eea 100644 >> --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml >> +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml >> @@ -11,7 +11,9 @@ maintainers: >> >> properties: >> compatible: >> - const: microchip,polarfire-soc-mailbox >> + enum: >> + - microchip,polarfire-soc-mailbox >> + - microchip,mpfs-mailbox >> >> reg: >> items: >> diff --git a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml >> index 2cd3bc6bd8d6..d6c953cd154b 100644 >> --- a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml >> +++ b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml >> @@ -19,7 +19,9 @@ properties: >> maxItems: 1 >> >> compatible: >> - const: microchip,polarfire-soc-sys-controller >> + enum: >> + - microchip,polarfire-soc-sys-controller >> + - microchip,mpfs-sys-controller >> >> required: >> - compatible >> diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c >> index 0d6e2231a2c7..9d5e558a6ee6 100644 >> --- a/drivers/mailbox/mailbox-mpfs.c >> +++ b/drivers/mailbox/mailbox-mpfs.c >> @@ -233,6 +233,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) >> >> static const struct of_device_id mpfs_mbox_of_match[] = { >> {.compatible = "microchip,polarfire-soc-mailbox", }, >> + {.compatible = "microchip,mpfs-mailbox", }, >> {}, >> }; >> MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match); >> -- >> 2.33.1 >> >>
diff --git a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml index bbb173ea483c..b08c8a158eea 100644 --- a/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml @@ -11,7 +11,9 @@ maintainers: properties: compatible: - const: microchip,polarfire-soc-mailbox + enum: + - microchip,polarfire-soc-mailbox + - microchip,mpfs-mailbox reg: items: diff --git a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml index 2cd3bc6bd8d6..d6c953cd154b 100644 --- a/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml +++ b/Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml @@ -19,7 +19,9 @@ properties: maxItems: 1 compatible: - const: microchip,polarfire-soc-sys-controller + enum: + - microchip,polarfire-soc-sys-controller + - microchip,mpfs-sys-controller required: - compatible diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c index 0d6e2231a2c7..9d5e558a6ee6 100644 --- a/drivers/mailbox/mailbox-mpfs.c +++ b/drivers/mailbox/mailbox-mpfs.c @@ -233,6 +233,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) static const struct of_device_id mpfs_mbox_of_match[] = { {.compatible = "microchip,polarfire-soc-mailbox", }, + {.compatible = "microchip,mpfs-mailbox", }, {}, }; MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match);