| Message ID | 20221012055602.1544944-6-uwu@icenowy.me (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d4b2c2852091c9e1c1fa03553e81f5712471578c |
| Headers | show |
| Series | SUNIV USB and PopStick support (and updating mailmap) | expand |
Hi Icenowy, Dne sreda, 12. oktober 2022 ob 07:55:57 CEST je Icenowy Zheng napisal(a): > 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 <uwu@icenowy.me> > --- > No changes since v1. > > 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 7f9a999cd5ff..4b368d16a73a 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")) { All that should be eventually converted to quirks. But for now: Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > 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); > -- > 2.37.1
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c index 7f9a999cd5ff..4b368d16a73a 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);
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 <uwu@icenowy.me> --- No changes since v1. drivers/usb/musb/sunxi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)