| Message ID | 20230111015332.172021-3-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: suniv: USB and two new boards support | expand |
On Wed, 11 Jan 2023 01:53:23 +0000 Andre Przywara <andre.przywara@arm.com> wrote: Hi Bin, Greg, > From: Icenowy Zheng <uwu@icenowy.me> > > The suniv SoC has a MUSB controller like the one in A33, but with a SRAM > region to be claimed. > > Add support for it. is there any chance you could take this patch (and the next one, ideally) through your tree? And not sure if the binding patch (01/11) should also go this way? Patch 03/11 is a cleanup, so is somewhat optional, but Jernej acked that recently. The original series [1] is now almost three years old, and the whole series was mostly ready in the previous cycle already, but got stuck in some dependency chain, which should now be solved, since the PHY patch series [2] made it into -next more than two weeks ago. This would help to unblock the rest of this series, which are DT patches only. Many thanks, and let me know if there is something left for me to do. Cheers, Andre [1] https://patchwork.kernel.org/project/linux-usb/cover/20200309204326.27403-1-thirtythreeforty@gmail.com/ [2] https://lore.kernel.org/linux-arm-kernel/Y8BFwPZ0DRGImo5O@matsya/ > > Signed-off-by: Icenowy Zheng <uwu@icenowy.me> > Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> > Signed-off-by: Andre Przywara <andre.przywara@arm.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 7f9a999cd5ff1..4b368d16a73ad 100644 > --- a/drivers/usb/musb/sunxi.c > +++ b/drivers/usb/musb/sunxi.c > @@ -722,14 +722,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); > } > @@ -815,6 +818,7 @@ static const struct of_device_id sunxi_musb_match[] = { > { .compatible = "allwinner,sun6i-a31-musb", }, > { .compatible = "allwinner,sun8i-a33-musb", }, > { .compatible = "allwinner,sun8i-h3-musb", }, > + { .compatible = "allwinner,suniv-f1c100s-musb", }, > {} > }; > MODULE_DEVICE_TABLE(of, sunxi_musb_match);
On Tue, Jan 31, 2023 at 10:52:53PM +0000, Andre Przywara wrote: > On Wed, 11 Jan 2023 01:53:23 +0000 > Andre Przywara <andre.przywara@arm.com> wrote: > > Hi Bin, Greg, > > > From: Icenowy Zheng <uwu@icenowy.me> > > > > The suniv SoC has a MUSB controller like the one in A33, but with a SRAM > > region to be claimed. > > > > Add support for it. > > is there any chance you could take this patch (and the next one, > ideally) through your tree? And not sure if the binding patch (01/11) > should also go this way? Please resend just the patches you want me to apply, picking them out of an old series is very difficult to do. thanks, greg k-h
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index 7f9a999cd5ff1..4b368d16a73ad 100644 --- a/drivers/usb/musb/sunxi.c +++ b/drivers/usb/musb/sunxi.c @@ -722,14 +722,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); } @@ -815,6 +818,7 @@ static const struct of_device_id sunxi_musb_match[] = { { .compatible = "allwinner,sun6i-a31-musb", }, { .compatible = "allwinner,sun8i-a33-musb", }, { .compatible = "allwinner,sun8i-h3-musb", }, + { .compatible = "allwinner,suniv-f1c100s-musb", }, {} }; MODULE_DEVICE_TABLE(of, sunxi_musb_match);