* [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init
@ 2018-05-20 19:15 Ramon Fried
2018-05-20 19:34 ` Marek Vasut
0 siblings, 1 reply; 4+ messages in thread
From: Ramon Fried @ 2018-05-20 19:15 UTC (permalink / raw)
To: u-boot
Use standard board_usb_init() instead of the specific board_prepare_usb.
Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
---
v2: remove a line that sneaked in by mistake
board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++--
drivers/usb/host/ehci-msm.c | 9 ++-------
2 files changed, 4 insertions(+), 9 deletions(-)
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..db982624dc 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;
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init
2018-05-20 19:15 [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init Ramon Fried
@ 2018-05-20 19:34 ` Marek Vasut
2018-05-20 20:12 ` Ramon Fried
0 siblings, 1 reply; 4+ messages in thread
From: Marek Vasut @ 2018-05-20 19:34 UTC (permalink / raw)
To: u-boot
On 05/20/2018 09:15 PM, Ramon Fried wrote:
> Use standard board_usb_init() instead of the specific board_prepare_usb.
>
> Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
> ---
> v2: remove a line that sneaked in by mistake
> board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++--
> drivers/usb/host/ehci-msm.c | 9 ++-------
> 2 files changed, 4 insertions(+), 9 deletions(-)
>
> 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);
Obvious question -- can this not be started by some regulator ? Then
this board hook can go away altogether.
[...]
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init
2018-05-20 19:34 ` Marek Vasut
@ 2018-05-20 20:12 ` Ramon Fried
2018-05-20 22:45 ` Marek Vasut
0 siblings, 1 reply; 4+ messages in thread
From: Ramon Fried @ 2018-05-20 20:12 UTC (permalink / raw)
To: u-boot
On Sun, May 20, 2018 at 10:34 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> On 05/20/2018 09:15 PM, Ramon Fried wrote:
>> Use standard board_usb_init() instead of the specific board_prepare_usb.
>>
>> Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
>> ---
>> v2: remove a line that sneaked in by mistake
>> board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++--
>> drivers/usb/host/ehci-msm.c | 9 ++-------
>> 2 files changed, 4 insertions(+), 9 deletions(-)
>>
>> 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);
>
> Obvious question -- can this not be started by some regulator ? Then
> this board hook can go away altogether.
By regulator do you mean pinctrl framework ?
>
> [...]
>
> --
> Best regards,
> Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init
2018-05-20 20:12 ` Ramon Fried
@ 2018-05-20 22:45 ` Marek Vasut
0 siblings, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2018-05-20 22:45 UTC (permalink / raw)
To: u-boot
On 05/20/2018 10:12 PM, Ramon Fried wrote:
> On Sun, May 20, 2018 at 10:34 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
>> On 05/20/2018 09:15 PM, Ramon Fried wrote:
>>> Use standard board_usb_init() instead of the specific board_prepare_usb.
>>>
>>> Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
>>> ---
>>> v2: remove a line that sneaked in by mistake
>>> board/qualcomm/dragonboard410c/dragonboard410c.c | 4 ++--
>>> drivers/usb/host/ehci-msm.c | 9 ++-------
>>> 2 files changed, 4 insertions(+), 9 deletions(-)
>>>
>>> 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);
>>
>> Obvious question -- can this not be started by some regulator ? Then
>> this board hook can go away altogether.
> By regulator do you mean pinctrl framework ?
Yes, something which would allow you to get rid of this board stuff
altogether.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-20 22:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-20 19:15 [U-Boot] [PATCH v2] ehci: Replace board_prepare_usb with board_usb_init Ramon Fried
2018-05-20 19:34 ` Marek Vasut
2018-05-20 20:12 ` Ramon Fried
2018-05-20 22:45 ` Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.