Message ID | 20180520190416.6473-1-ramon.fried@gmail.com |
---|---|
State | Superseded |
Delegated to: | Marek Vasut |
Headers | show |
Series | [U-Boot] ehci: msm: Replace board_prepare_usb with board_usb_init | expand |
Hi Ramon, On 20 May 2018 at 13:04, Ramon Fried <ramon.fried@gmail.com> wrote: > Use standard board_usb_init() instead of the specific board_prepare_usb. You should mention why... For any patch: - what the problem is / motivation - what your patch does > > Signed-off-by: Ramon Fried <ramon.fried@gmail.com> > --- > board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++-- > drivers/usb/host/ehci-msm.c | 11 ++++------- > 2 files changed, 6 insertions(+), 9 deletions(-) > Regards, Simon
On Wed, May 23, 2018 at 2:30 AM, Simon Glass <sjg@chromium.org> wrote: > Hi Ramon, > On 20 May 2018 at 13:04, Ramon Fried <ramon.fried@gmail.com> wrote: >> Use standard board_usb_init() instead of the specific board_prepare_usb. > > You should mention why... > > For any patch: > - what the problem is / motivation > - what your patch does Sure, thanks. I'll resend the updated patch shortly. Thanks, Ramon > >> >> Signed-off-by: Ramon Fried <ramon.fried@gmail.com> >> --- >> board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++-- >> drivers/usb/host/ehci-msm.c | 11 ++++------- >> 2 files changed, 6 insertions(+), 9 deletions(-) >> > > Regards, > Simon
diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index e7ead57f0d..679eab759a 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -41,7 +41,7 @@ int dram_init_banksize(void) return 0; } -int board_prepare_usb(enum usb_init_type type) +int board_usb_init(int index, enum usb_init_type init) { static struct udevice *pmic_gpio; static struct gpio_desc hub_reset, usb_sel; @@ -90,7 +90,7 @@ int board_prepare_usb(enum usb_init_type type) } } - if (type == USB_INIT_HOST) { + if (init == USB_INIT_HOST) { /* Start USB Hub */ dm_gpio_set_dir_flags(&hub_reset, GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE); diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 17bfa7c02f..9ecd8d6732 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -38,11 +38,6 @@ struct msm_ehci_priv { struct ulpi_viewport ulpi_vp; /* ULPI Viewport */ }; -int __weak board_prepare_usb(enum usb_init_type type) -{ - return 0; -} - static void setup_usb_phy(struct msm_ehci_priv *priv) { /* Select and enable external configuration with USB PHY */ @@ -102,7 +97,7 @@ static int ehci_usb_probe(struct udevice *dev) hcor = (struct ehci_hcor *)((phys_addr_t)hccr + HC_LENGTH(ehci_readl(&(hccr)->cr_capbase))); - ret = board_prepare_usb(USB_INIT_HOST); + ret = board_usb_init(0, USB_INIT_HOST); if (ret < 0) return ret; @@ -124,7 +119,7 @@ static int ehci_usb_remove(struct udevice *dev) reset_usb_phy(p); - ret = board_prepare_usb(USB_INIT_DEVICE); /* Board specific hook */ + ret = board_usb_init(0, USB_INIT_DEVICE); /* Board specific hook */ if (ret < 0) return ret; @@ -150,6 +145,8 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev) if (priv->ehci == (void *)FDT_ADDR_T_NONE) return -EINVAL; + dev->req_seq = 0; + /* Warning: this will not work if viewport address is > 64 bit due to * ULPI design. */
Use standard board_usb_init() instead of the specific board_prepare_usb. Signed-off-by: Ramon Fried <ramon.fried@gmail.com> --- board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++-- drivers/usb/host/ehci-msm.c | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-)