| Message ID | 20190818134255.7135-3-b.galvani@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | [U-Boot,1/2] phy: meson: add GXBB PHY driver | expand |
On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote: > Enable the second USB controller, which is connected to a hub with 4 > ports. The first controller is for the OTG port and is currently not > supported. > > Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> > --- > arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++ > configs/odroid-c2_defconfig | 7 +++++++ > include/configs/meson64.h | 5 +++++ > 3 files changed, 20 insertions(+) > > diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi > index c35158d7e9..484b40504d 100644 > --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi > +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi > @@ -5,3 +5,11 @@ > */ > > #include "meson-gx-u-boot.dtsi" > + > +&usb0 { > + status = "disabled"; > +}; > + > +&usb1 { > + hnp-srp-disable; > +}; > diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig > index 8849058d33..366ea125af 100644 > --- a/configs/odroid-c2_defconfig > +++ b/configs/odroid-c2_defconfig > @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_I2C=y > # CONFIG_CMD_LOADS is not set > CONFIG_CMD_MMC=y > +CONFIG_CMD_USB=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_REGULATOR=y > CONFIG_OF_CONTROL=y > @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y > CONFIG_PHY_REALTEK=y > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > +CONFIG_PHY=y > +CONFIG_MESON_GXBB_USB_PHY=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_MESON_GXBB=y > CONFIG_DM_REGULATOR=y > CONFIG_DM_REGULATOR_FIXED=y > +CONFIG_DM_REGULATOR_GPIO=y > CONFIG_DM_RESET=y > CONFIG_DEBUG_UART_MESON=y > CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_DEBUG_UART_SKIP_INIT=y > CONFIG_MESON_SERIAL=y > +CONFIG_USB=y > +CONFIG_DM_USB=y > +CONFIG_USB_DWC2=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/include/configs/meson64.h b/include/configs/meson64.h > index f8d3eee292..483a8f567c 100644 > --- a/include/configs/meson64.h > +++ b/include/configs/meson64.h > @@ -16,6 +16,11 @@ > #define GICC_BASE 0xc4302000 > #endif > > +/* USB */ > +#if defined(CONFIG_MESON_GXBB) > +#define CONFIG_DWC2_UTMI_WIDTH 16 > +#endif Hi Neil, I noticed this change to the bus width configuration isn't actually needed. The USB port works with or without it. The kernel driver doesn't set 16bit mode, so can you please remove these 4 lines from the commit before sending the pull request? Thanks, Beniamino
Hi, On 10/05/2020 16:08, Beniamino Galvani wrote: > On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote: >> Enable the second USB controller, which is connected to a hub with 4 >> ports. The first controller is for the OTG port and is currently not >> supported. >> >> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> >> --- >> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++ >> configs/odroid-c2_defconfig | 7 +++++++ >> include/configs/meson64.h | 5 +++++ >> 3 files changed, 20 insertions(+) >> >> diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi >> index c35158d7e9..484b40504d 100644 >> --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi >> +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi >> @@ -5,3 +5,11 @@ >> */ >> >> #include "meson-gx-u-boot.dtsi" >> + >> +&usb0 { >> + status = "disabled"; >> +}; >> + >> +&usb1 { >> + hnp-srp-disable; >> +}; >> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig >> index 8849058d33..366ea125af 100644 >> --- a/configs/odroid-c2_defconfig >> +++ b/configs/odroid-c2_defconfig >> @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y >> CONFIG_CMD_I2C=y >> # CONFIG_CMD_LOADS is not set >> CONFIG_CMD_MMC=y >> +CONFIG_CMD_USB=y >> # CONFIG_CMD_SETEXPR is not set >> CONFIG_CMD_REGULATOR=y >> CONFIG_OF_CONTROL=y >> @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y >> CONFIG_PHY_REALTEK=y >> CONFIG_DM_ETH=y >> CONFIG_ETH_DESIGNWARE=y >> +CONFIG_PHY=y >> +CONFIG_MESON_GXBB_USB_PHY=y >> CONFIG_PINCTRL=y >> CONFIG_PINCTRL_MESON_GXBB=y >> CONFIG_DM_REGULATOR=y >> CONFIG_DM_REGULATOR_FIXED=y >> +CONFIG_DM_REGULATOR_GPIO=y >> CONFIG_DM_RESET=y >> CONFIG_DEBUG_UART_MESON=y >> CONFIG_DEBUG_UART_ANNOUNCE=y >> CONFIG_DEBUG_UART_SKIP_INIT=y >> CONFIG_MESON_SERIAL=y >> +CONFIG_USB=y >> +CONFIG_DM_USB=y >> +CONFIG_USB_DWC2=y >> CONFIG_OF_LIBFDT_OVERLAY=y >> diff --git a/include/configs/meson64.h b/include/configs/meson64.h >> index f8d3eee292..483a8f567c 100644 >> --- a/include/configs/meson64.h >> +++ b/include/configs/meson64.h >> @@ -16,6 +16,11 @@ >> #define GICC_BASE 0xc4302000 >> #endif >> >> +/* USB */ >> +#if defined(CONFIG_MESON_GXBB) >> +#define CONFIG_DWC2_UTMI_WIDTH 16 >> +#endif > > Hi Neil, > > I noticed this change to the bus width configuration isn't actually > needed. The USB port works with or without it. The kernel driver > doesn't set 16bit mode, so can you please remove these 4 lines from > the commit before sending the pull request? > > Thanks, > Beniamino > Thanks, I altered the commit removing this. Neil
diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi index c35158d7e9..484b40504d 100644 --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi @@ -5,3 +5,11 @@ */ #include "meson-gx-u-boot.dtsi" + +&usb0 { + status = "disabled"; +}; + +&usb1 { + hnp-srp-disable; +}; diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 8849058d33..366ea125af 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y CONFIG_PHY_REALTEK=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y +CONFIG_PHY=y +CONFIG_MESON_GXBB_USB_PHY=y CONFIG_PINCTRL=y CONFIG_PINCTRL_MESON_GXBB=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_MESON=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/include/configs/meson64.h b/include/configs/meson64.h index f8d3eee292..483a8f567c 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -16,6 +16,11 @@ #define GICC_BASE 0xc4302000 #endif +/* USB */ +#if defined(CONFIG_MESON_GXBB) +#define CONFIG_DWC2_UTMI_WIDTH 16 +#endif + /* For splashscreen */ #ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8
Enable the second USB controller, which is connected to a hub with 4 ports. The first controller is for the OTG port and is currently not supported. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++ configs/odroid-c2_defconfig | 7 +++++++ include/configs/meson64.h | 5 +++++ 3 files changed, 20 insertions(+)