Hi Patrick

On 6/18/19 4:57 PM, Patrick Delaunay wrote:

Remove the override for usbotg_hs on g-tx-fifo-size as the correct binding, used in the kernel device tree, is now supported in dwc2 device driver.

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com

Changes in v2:

• move dt update in a separate patch

arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 5b19e44..994092a 100644 --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi @@ -56,10 +56,6 @@ }; };

-&usbotg_hs {

• g-tx-fifo-size = <576>;

-};

&v3v3 { regulator-always-on; };

Applied to uboot-stm

Thanks

On 6/18/19 4:57 PM, Patrick Delaunay wrote:

Allow device mode in DWC2 driver when device tree select the dr_mode "peripheral" or "otg".

The device mode is not allowed when dr_mode = "host" in device tree.

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com

Reviewed-by: Marek Vasut marex@denx.de

---

Changes in v2: None

drivers/usb/gadget/dwc2_udc_otg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 023439c..35f4147 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1041,7 +1041,8 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) void (*set_params)(struct dwc2_plat_otg_data *data); int ret;

• if (usb_get_dr_mode(node) != USB_DR_MODE_PERIPHERAL) {

• if (usb_get_dr_mode(node) != USB_DR_MODE_PERIPHERAL &&

•    usb_get_dr_mode(node) != USB_DR_MODE_OTG) {
  

  dev_dbg(dev, "Invalid mode\n"); return -ENODEV; }

Hi Patrick

On 6/18/19 6:46 PM, Marek Vasut wrote:

On 6/18/19 4:57 PM, Patrick Delaunay wrote:

...

Manage g-tx-fifo-size as a array as specify in the binding.

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com

Reviewed-by: Marek Vasut marex@denx.de

I'm missing 2/3 , although I think it might be better if you take this whole series through u-boot-stm .

Applied to uboot-stm

Thanks

...

---

Changes in v2:

• move dt update in a separate patch
• remove unecessary temporary variable

drivers/usb/gadget/dwc2_udc_otg.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 494ab53..023439c 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1039,6 +1039,7 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) int node = dev_of_offset(dev); ulong drvdata; void (*set_params)(struct dwc2_plat_otg_data *data);

• int ret;

  if (usb_get_dr_mode(node) != USB_DR_MODE_PERIPHERAL) { dev_dbg(dev, "Invalid mode\n");

@@ -1050,7 +1051,18 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) platdata->rx_fifo_sz = dev_read_u32_default(dev, "g-rx-fifo-size", 0); platdata->np_tx_fifo_sz = dev_read_u32_default(dev, "g-np-tx-fifo-size", 0);

• platdata->tx_fifo_sz = dev_read_u32_default(dev, "g-tx-fifo-size", 0);

• platdata->tx_fifo_sz_nb =

• dev_read_size(dev, "g-tx-fifo-size") / sizeof(u32);
  

• if (platdata->tx_fifo_sz_nb > DWC2_MAX_HW_ENDPOINTS)

• platdata->tx_fifo_sz_nb = DWC2_MAX_HW_ENDPOINTS;
  

• if (platdata->tx_fifo_sz_nb) {

• ret = dev_read_u32_array(dev, "g-tx-fifo-size",
  

• 			 platdata->tx_fifo_sz_array,
  

• 			 platdata->tx_fifo_sz_nb);
  

• if (ret)
  

• 	return ret;
  

• }

  platdata->force_b_session_valid = dev_read_bool(dev, "u-boot,force-b-session-valid");