[v3,03/15] mailbox: change mailbox-mpfs compatible string

Commit Message

Conor Dooley Jan. 14, 2022, 3:17 p.m. UTC

From: Conor Dooley <[e-mail]>

The Polarfire SoC is currently using two different compatible string
prefixes. Fix this by changing "polarfire-soc-*" strings to "mpfs-*" in
its system controller in order to match the compatible string used in
the soc binding and device tree.

Reviewed-by: Geert Uytterhoeven <[e-mail]>
Signed-off-by: Conor Dooley <[e-mail]>
---
 drivers/mailbox/mailbox-mpfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Geert Uytterhoeven Jan. 14, 2022, 3:40 p.m. UTC | #1

Hi Conor,

On Fri, Jan 14, 2022 at 4:16 PM <[e-mail]> wrote:
> From: Conor Dooley <[e-mail]>
>
> The Polarfire SoC is currently using two different compatible string
> prefixes. Fix this by changing "polarfire-soc-*" strings to "mpfs-*" in
> its system controller in order to match the compatible string used in
> the soc binding and device tree.
>
> Reviewed-by: Geert Uytterhoeven <[e-mail]>
> Signed-off-by: Conor Dooley <[e-mail]>

This is already upstream, commit f10b1fc0161cd99e ("mailbox: change
mailbox-mpfs compatible string").

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

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

Conor Dooley Jan. 14, 2022, 4:15 p.m. UTC | #2

> Hi Conor,
>
> On Fri, Jan 14, 2022 at 4:16 PM <[e-mail]> wrote:
> > From: Conor Dooley <[e-mail]>
> >
> > The Polarfire SoC is currently using two different compatible string
> > prefixes. Fix this by changing "polarfire-soc-*" strings to "mpfs-*" in
> > its system controller in order to match the compatible string used in
> > the soc binding and device tree.
> >
> > Reviewed-by: Geert Uytterhoeven <[e-mail]>
> > Signed-off-by: Conor Dooley <[e-mail]>
>
> This is already upstream, commit f10b1fc0161cd99e ("mailbox: change
> mailbox-mpfs compatible string").

I would say great, but that means the new string is now in the driver
but the new dt-binding is not (and I just noticed contains an error).
Conor.

>
> Gr{oetje,eeting}s,
>
>                         Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]
>
> 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
>
> _______________________________________________
> linux-riscv mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Patch

diff --git a/drivers/mailbox/mailbox-mpfs.c b/drivers/mailbox/mailbox-mpfs.c
index 0d6e2231a2c7..4e34854d1238 100644
--- a/drivers/mailbox/mailbox-mpfs.c
+++ b/drivers/mailbox/mailbox-mpfs.c
@@ -232,7 +232,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);