diff mbox series

musb-new: Use predefined configuration data for SUN50I_H6

Message ID 20200508122937.2284562-1-r.stratiienko@gmail.com
State New
Delegated to: Marek Vasut
Headers show
Series musb-new: Use predefined configuration data for SUN50I_H6 | expand

Commit Message

Roman Stratiienko May 8, 2020, 12:29 p.m. UTC
Same was done in the kernel for all devices compatible with
'allwinner,sun8i-a33-musb' at [1] and [2].

Fixes musb initialization on H6 SOC.

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n726
[2] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n440

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
---
CC: Ondrej Jirman <megous@megous.com>
CC: Icenowy Zheng <icenowy@aosc.io>
CC: Marek Vasut <marex@denx.de>
CC: linux-sunxi@googlegroups.com

Hello community,

'$ fastboot usb 0' command works, but host still doesn't see any USB devices.
Does anyone have any suggestions where to look?
---
 drivers/usb/musb-new/musb_regs.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Roman Stratiienko May 14, 2020, 6:44 a.m. UTC | #1
CC: jagan@amarulasolutions.com

пт, 8 мая 2020 г. в 15:29, Roman Stratiienko <r.stratiienko@gmail.com>:
>
> Same was done in the kernel for all devices compatible with
> 'allwinner,sun8i-a33-musb' at [1] and [2].
>
> Fixes musb initialization on H6 SOC.
>
> [1] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n726
> [2] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n440
>
> Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
> ---
> CC: Ondrej Jirman <megous@megous.com>
> CC: Icenowy Zheng <icenowy@aosc.io>
> CC: Marek Vasut <marex@denx.de>
> CC: linux-sunxi@googlegroups.com
>
> Hello community,
>
> '$ fastboot usb 0' command works, but host still doesn't see any USB devices.
> Does anyone have any suggestions where to look?
> ---
>  drivers/usb/musb-new/musb_regs.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
> index c4d7203b85..5f012f3b41 100644
> --- a/drivers/usb/musb-new/musb_regs.h
> +++ b/drivers/usb/musb-new/musb_regs.h
> @@ -432,7 +432,9 @@ static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
>  static inline u8 musb_read_configdata(void __iomem *mbase)
>  {
>  #if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T || \
> -               defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I
> +       defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I || \
> +       defined CONFIG_MACH_SUN50I_H6
> +
>         /* <Sigh> allwinner saves a reg, and we need to hardcode this */
>         return 0xde;
>  #else
> --
> 2.25.1
>
Roman Stratiienko June 13, 2020, 7:33 p.m. UTC | #2
чт, 14 мая 2020 г. в 09:44, Roman Stratiienko <r.stratiienko@gmail.com>:
>
> CC: jagan@amarulasolutions.com
>
> пт, 8 мая 2020 г. в 15:29, Roman Stratiienko <r.stratiienko@gmail.com>:
> >
> > Same was done in the kernel for all devices compatible with
> > 'allwinner,sun8i-a33-musb' at [1] and [2].
> >
> > Fixes musb initialization on H6 SOC.
> >
> > [1] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n726
> > [2] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n440
> >
> > Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
> > ---
> > CC: Ondrej Jirman <megous@megous.com>
> > CC: Icenowy Zheng <icenowy@aosc.io>
> > CC: Marek Vasut <marex@denx.de>
> > CC: linux-sunxi@googlegroups.com
> >
> > Hello community,
> >
> > '$ fastboot usb 0' command works, but host still doesn't see any USB devices.
> > Does anyone have any suggestions where to look?

Hello,

Second issue was fixed with commit 462a9c7a9cce ("phy: sun4i-usb:
Align H6 initialization logic with the kernel") <merged>
This patch is required to fix download gadget support for H6 SOC.
Please review/merge.

> > ---
> >  drivers/usb/musb-new/musb_regs.h | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
> > index c4d7203b85..5f012f3b41 100644
> > --- a/drivers/usb/musb-new/musb_regs.h
> > +++ b/drivers/usb/musb-new/musb_regs.h
> > @@ -432,7 +432,9 @@ static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
> >  static inline u8 musb_read_configdata(void __iomem *mbase)
> >  {
> >  #if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T || \
> > -               defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I
> > +       defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I || \
> > +       defined CONFIG_MACH_SUN50I_H6
> > +
> >         /* <Sigh> allwinner saves a reg, and we need to hardcode this */
> >         return 0xde;
> >  #else
> > --
> > 2.25.1
> >
Roman Stratiienko Sept. 21, 2020, 9:06 a.m. UTC | #3
CC: linux-sunxi@googlegroups.com

сб, 13 июн. 2020 г. в 22:33, Roman Stratiienko <r.stratiienko@gmail.com>:
>
> чт, 14 мая 2020 г. в 09:44, Roman Stratiienko <r.stratiienko@gmail.com>:
> >
> > CC: jagan@amarulasolutions.com
> >
> > пт, 8 мая 2020 г. в 15:29, Roman Stratiienko <r.stratiienko@gmail.com>:
> > >
> > > Same was done in the kernel for all devices compatible with
> > > 'allwinner,sun8i-a33-musb' at [1] and [2].
> > >
> > > Fixes musb initialization on H6 SOC.
> > >
> > > [1] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n726
> > > [2] - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/usb/musb/sunxi.c?h=v5.6.11#n440
> > >
> > > Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
> > > ---
> > > CC: Ondrej Jirman <megous@megous.com>
> > > CC: Icenowy Zheng <icenowy@aosc.io>
> > > CC: Marek Vasut <marex@denx.de>
> > > CC: linux-sunxi@googlegroups.com
> > >
> > > Hello community,
> > >
> > > '$ fastboot usb 0' command works, but host still doesn't see any USB devices.
> > > Does anyone have any suggestions where to look?
>
> Hello,
>
> Second issue was fixed with commit 462a9c7a9cce ("phy: sun4i-usb:
> Align H6 initialization logic with the kernel") <merged>
> This patch is required to fix download gadget support for H6 SOC.
> Please review/merge.
>
> > > ---
> > >  drivers/usb/musb-new/musb_regs.h | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
> > > index c4d7203b85..5f012f3b41 100644
> > > --- a/drivers/usb/musb-new/musb_regs.h
> > > +++ b/drivers/usb/musb-new/musb_regs.h
> > > @@ -432,7 +432,9 @@ static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
> > >  static inline u8 musb_read_configdata(void __iomem *mbase)
> > >  {
> > >  #if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T || \
> > > -               defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I
> > > +       defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I || \
> > > +       defined CONFIG_MACH_SUN50I_H6
> > > +
> > >         /* <Sigh> allwinner saves a reg, and we need to hardcode this */
> > >         return 0xde;
> > >  #else
> > > --
> > > 2.25.1
> > >
diff mbox series

Patch

diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
index c4d7203b85..5f012f3b41 100644
--- a/drivers/usb/musb-new/musb_regs.h
+++ b/drivers/usb/musb-new/musb_regs.h
@@ -432,7 +432,9 @@  static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
 static inline u8 musb_read_configdata(void __iomem *mbase)
 {
 #if defined CONFIG_MACH_SUN8I_A33 || defined CONFIG_MACH_SUN8I_A83T || \
-		defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I
+	defined CONFIG_MACH_SUNXI_H3_H5 || defined CONFIG_MACH_SUN50I || \
+	defined CONFIG_MACH_SUN50I_H6
+
 	/* <Sigh> allwinner saves a reg, and we need to hardcode this */
 	return 0xde;
 #else