Skip to contentSkip to conversation

ehci: msm: Replace board_prepare_usb with board_usb_init

PATCH Superseded Ramon Fried 2 participants 3 messages May 20, 2018 – May 24, 2018

Subsystems (2)
USB USB ehci driver

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Ramon Fried

author
#0 lore raw

PATCH 1/1 ehci: msm: Replace board_prepare_usb with board_usb_init

Use standard board_usb_init() instead of the specific board_prepare_usb.

Signed-off-by Ramon Fried <[email protected]>
---
 board/qualcomm/dragonboard410c/dragonboard410c.c |  4 ++--
 drivers/usb/host/ehci-msm.c                      | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)
board/qualcomm/dragonboard410c/dragonboard410c.c +2 -2
index e7ead57f0d..679eab759a 100644
@@ -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);
drivers/usb/host/ehci-msm.c +4 -7
index 17bfa7c02f..9ecd8d6732 100644
@@ -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.
 	 */
Signature · 1 line
2.17.0
#1 lore raw

PATCH 1/1 ehci: msm: Replace board_prepare_usb with board_usb_init

Hi Ramon,

Quoted 1 line · Ramon Fried

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

Quoted 7 lines
Signed-off-by Ramon Fried <[email protected]>
---
 board/qualcomm/dragonboard410c/dragonboard410c.c |  4 ++--
 drivers/usb/host/ehci-msm.c                      | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

Regards,
Simon

author
#2 lore raw

PATCH 1/1 ehci: msm: Replace board_prepare_usb with board_usb_init

Quoted 9 lines · Simon Glass

Hi Ramon,

Quoted 1 line · Ramon Fried

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

Quoted 11 lines
Quoted 8 lines
Signed-off-by Ramon Fried <[email protected]>
---
 board/qualcomm/dragonboard410c/dragonboard410c.c |  4 ++--
 drivers/usb/host/ehci-msm.c                      | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

Regards,
Simon