Like other peripherals important for booting, do not rely on ti-sysc compatibility alone

Signed-off-by: Andreas Kemnade andreas@kemnade.info --- arch/arm/dts/omap4-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/arch/arm/dts/omap4-u-boot.dtsi b/arch/arm/dts/omap4-u-boot.dtsi index e33b3722e1..49e388caa5 100644 --- a/arch/arm/dts/omap4-u-boot.dtsi +++ b/arch/arm/dts/omap4-u-boot.dtsi @@ -17,6 +17,14 @@ compatible = "simple-bus"; }; }; + + segment@80000 { + /* USB OTG */ + target-module@2b000 { + compatible = "simple-bus"; + }; + }; + };

&l4_per {

Host mode structures were accessed but not initialized and gadget dm did not compile at all.

Signed-off-by: Andreas Kemnade andreas@kemnade.info --- drivers/usb/musb-new/omap2430.c | 42 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 7d15b94a6c..607592a1d0 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -46,6 +46,13 @@ static inline void omap2430_low_level_init(struct musb *musb) musb_writel(musb->mregs, OTG_FORCESTDBY, l); }

+int dm_usb_gadget_handle_interrupts(struct udevice *dev) +{ + struct musb_host_data *host = dev_get_priv(dev); + + host->host->isr(0, host->host); + return 0; +}

static int omap2430_musb_init(struct musb *musb) { @@ -214,37 +221,38 @@ static int omap2430_musb_of_to_plat(struct udevice *dev)

static int omap2430_musb_probe(struct udevice *dev) { -#ifdef CONFIG_USB_MUSB_HOST struct musb_host_data *host = dev_get_priv(dev); -#else - struct musb *musbp; -#endif + struct omap2430_musb_plat *plat = dev_get_plat(dev); - struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; int ret = 0; void *base = dev_read_addr_ptr(dev);

- priv->desc_before_addr = true;

otg_board_data = &plat->otg_board_data;

-#ifdef CONFIG_USB_MUSB_HOST + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) { + struct usb_bus_priv *priv = dev_get_uclass_priv(dev); + + priv->desc_before_addr = true; + host->host = musb_init_controller(&plat->plat, + (struct device *)otg_board_data, + plat->base); + if (!host->host) + return -EIO; + + return musb_lowlevel_init(host); + } + + /* OTG still not supported, so forcing peripheral */ + plat->plat.mode = MUSB_PERIPHERAL; host->host = musb_init_controller(&plat->plat, (struct device *)otg_board_data, plat->base); - if (!host->host) { + if (!host->host) return -EIO; - }

- ret = musb_lowlevel_init(host); -#else - musbp = musb_register(&plat->plat, (struct device *)otg_board_data, - plat->base); - if (IS_ERR_OR_NULL(musbp)) - return -EINVAL; -#endif - return ret; + return usb_add_gadget_udc((struct device *)otg_board_data, &host->host->g); }

static int omap2430_musb_remove(struct udevice *dev)