diff mbox series

[RESEND,3/5] musb: sunxi: add support for the suniv MUSB controller

Message ID 20200309204326.27403-4-thirtythreeforty@gmail.com (mailing list archive)
State Superseded
Headers show
Series Support the Allwinner F1C100s USB stack | expand

Commit Message

George Hilliard March 9, 2020, 8:43 p.m. UTC 
The suniv SoC has a MUSB controller like the one in A33, but with a SRAM
region to be claimed.

Add support for it.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
---
 drivers/usb/musb/sunxi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Chen-Yu Tsai March 12, 2020, 6:55 a.m. UTC | #1 
On Tue, Mar 10, 2020 at 4:44 AM George Hilliard
<thirtythreeforty@gmail.com> wrote:
>
> The suniv SoC has a MUSB controller like the one in A33, but with a SRAM
> region to be claimed.
>
> Add support for it.
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>

Same thing about the SoB and author.

> Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
> ---
>  drivers/usb/musb/sunxi.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
> index f3f76f2ac63f..76806b781844 100644
> --- a/drivers/usb/musb/sunxi.c
> +++ b/drivers/usb/musb/sunxi.c
> @@ -714,14 +714,17 @@ static int sunxi_musb_probe(struct platform_device *pdev)
>         INIT_WORK(&glue->work, sunxi_musb_work);
>         glue->host_nb.notifier_call = sunxi_musb_host_notifier;
>
> -       if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb"))
> +       if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb") ||
> +           of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
>                 set_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags);
> +       }
>
>         if (of_device_is_compatible(np, "allwinner,sun6i-a31-musb"))
>                 set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
>
>         if (of_device_is_compatible(np, "allwinner,sun8i-a33-musb") ||
> -           of_device_is_compatible(np, "allwinner,sun8i-h3-musb")) {
> +           of_device_is_compatible(np, "allwinner,sun8i-h3-musb") ||
> +           of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
>                 set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
>                 set_bit(SUNXI_MUSB_FL_NO_CONFIGDATA, &glue->flags);
>         }
> @@ -814,6 +817,7 @@ static int sunxi_musb_remove(struct platform_device *pdev)
>  }
>
>  static const struct of_device_id sunxi_musb_match[] = {
> +       { .compatible = "allwinner,suniv-f1c100s-musb", },

And same thing about the ordering.

Once resolved,

Acked-by: Chen-Yu Tsai <wens@csie.org>

>         { .compatible = "allwinner,sun4i-a10-musb", },
>         { .compatible = "allwinner,sun6i-a31-musb", },
>         { .compatible = "allwinner,sun8i-a33-musb", },
> --
> 2.25.0
>
diff mbox series

Patch

diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index f3f76f2ac63f..76806b781844 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -714,14 +714,17 @@  static int sunxi_musb_probe(struct platform_device *pdev)
 	INIT_WORK(&glue->work, sunxi_musb_work);
 	glue->host_nb.notifier_call = sunxi_musb_host_notifier;
 
-	if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb"))
+	if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb") ||
+	    of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
 		set_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags);
+	}
 
 	if (of_device_is_compatible(np, "allwinner,sun6i-a31-musb"))
 		set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
 
 	if (of_device_is_compatible(np, "allwinner,sun8i-a33-musb") ||
-	    of_device_is_compatible(np, "allwinner,sun8i-h3-musb")) {
+	    of_device_is_compatible(np, "allwinner,sun8i-h3-musb") ||
+	    of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
 		set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
 		set_bit(SUNXI_MUSB_FL_NO_CONFIGDATA, &glue->flags);
 	}
@@ -814,6 +817,7 @@  static int sunxi_musb_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id sunxi_musb_match[] = {
+	{ .compatible = "allwinner,suniv-f1c100s-musb", },
 	{ .compatible = "allwinner,sun4i-a10-musb", },
 	{ .compatible = "allwinner,sun6i-a31-musb", },
 	{ .compatible = "allwinner,sun8i-a33-musb", },