| Message ID | 20190627155344.4064-1-jjhiblot@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [U-Boot] usb: dwc3: Fix default dr_mode setting | expand |
On 6/27/19 5:53 PM, Jean-Jacques Hiblot wrote: > The IS_ENABLED() macro requires the complete CONFIG option including the > 'CONFIG_' prefix. Use CONFIG_IS_ENABLED to make it work with SPL ? > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> > --- > To be applied on top of usb/next > > drivers/usb/dwc3/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 9f7f053265..10b3f837f2 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) > return -ENOMEM; > } > > - if (!IS_ENABLED(USB_DWC3_GADGET)) > + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) > dwc->dr_mode = USB_DR_MODE_HOST; > else if (!IS_ENABLED(CONFIG_USB_HOST)) > dwc->dr_mode = USB_DR_MODE_PERIPHERAL; >
On 27/06/2019 18:12, Marek Vasut wrote: > On 6/27/19 5:53 PM, Jean-Jacques Hiblot wrote: >> The IS_ENABLED() macro requires the complete CONFIG option including the >> 'CONFIG_' prefix. > Use CONFIG_IS_ENABLED to make it work with SPL ? There is no SPL variant of this variable. JJ > >> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> >> --- >> To be applied on top of usb/next >> >> drivers/usb/dwc3/core.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 9f7f053265..10b3f837f2 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) >> return -ENOMEM; >> } >> >> - if (!IS_ENABLED(USB_DWC3_GADGET)) >> + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) >> dwc->dr_mode = USB_DR_MODE_HOST; >> else if (!IS_ENABLED(CONFIG_USB_HOST)) >> dwc->dr_mode = USB_DR_MODE_PERIPHERAL; >> >
On 6/27/19 6:17 PM, Jean-Jacques Hiblot wrote: > > On 27/06/2019 18:12, Marek Vasut wrote: >> On 6/27/19 5:53 PM, Jean-Jacques Hiblot wrote: >>> The IS_ENABLED() macro requires the complete CONFIG option including the >>> 'CONFIG_' prefix. >> Use CONFIG_IS_ENABLED to make it work with SPL ? > > There is no SPL variant of this variable. Shouldn't there be one ? > JJ > >> >>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> >>> --- >>> To be applied on top of usb/next >>> >>> drivers/usb/dwc3/core.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >>> index 9f7f053265..10b3f837f2 100644 >>> --- a/drivers/usb/dwc3/core.c >>> +++ b/drivers/usb/dwc3/core.c >>> @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) >>> return -ENOMEM; >>> } >>> - if (!IS_ENABLED(USB_DWC3_GADGET)) >>> + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) >>> dwc->dr_mode = USB_DR_MODE_HOST; >>> else if (!IS_ENABLED(CONFIG_USB_HOST)) >>> dwc->dr_mode = USB_DR_MODE_PERIPHERAL; >>> >>
On 27/06/2019 18:30, Marek Vasut wrote: > On 6/27/19 6:17 PM, Jean-Jacques Hiblot wrote: >> On 27/06/2019 18:12, Marek Vasut wrote: >>> On 6/27/19 5:53 PM, Jean-Jacques Hiblot wrote: >>>> The IS_ENABLED() macro requires the complete CONFIG option including the >>>> 'CONFIG_' prefix. >>> Use CONFIG_IS_ENABLED to make it work with SPL ? >> There is no SPL variant of this variable. > Shouldn't there be one ? There is already CONFIG_SPL_USB_GADGET to include/exclude gadget support from SPL Since there is usually only one kind of gadget controller on a SOC, I don't think it is a necessary to also have CONFIG_SPL_USB_DWC3_GADGET > >> JJ >> >>>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> >>>> --- >>>> To be applied on top of usb/next >>>> >>>> drivers/usb/dwc3/core.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >>>> index 9f7f053265..10b3f837f2 100644 >>>> --- a/drivers/usb/dwc3/core.c >>>> +++ b/drivers/usb/dwc3/core.c >>>> @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) >>>> return -ENOMEM; >>>> } >>>> - if (!IS_ENABLED(USB_DWC3_GADGET)) >>>> + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) >>>> dwc->dr_mode = USB_DR_MODE_HOST; >>>> else if (!IS_ENABLED(CONFIG_USB_HOST)) >>>> dwc->dr_mode = USB_DR_MODE_PERIPHERAL; >>>> >
On 6/28/19 10:00 AM, Jean-Jacques Hiblot wrote: > > On 27/06/2019 18:30, Marek Vasut wrote: >> On 6/27/19 6:17 PM, Jean-Jacques Hiblot wrote: >>> On 27/06/2019 18:12, Marek Vasut wrote: >>>> On 6/27/19 5:53 PM, Jean-Jacques Hiblot wrote: >>>>> The IS_ENABLED() macro requires the complete CONFIG option >>>>> including the >>>>> 'CONFIG_' prefix. >>>> Use CONFIG_IS_ENABLED to make it work with SPL ? >>> There is no SPL variant of this variable. >> Shouldn't there be one ? > > There is already CONFIG_SPL_USB_GADGET to include/exclude gadget support > from SPL > > Since there is usually only one kind of gadget controller on a SOC, I > don't think it is a necessary to also have CONFIG_SPL_USB_DWC3_GADGET JZ4780 has musb and ci-hdrc for example, so that's not true. There are other SoCs with OHCI and EHCI combination too.
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9f7f053265..10b3f837f2 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -707,7 +707,7 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) return -ENOMEM; } - if (!IS_ENABLED(USB_DWC3_GADGET)) + if (!IS_ENABLED(CONFIG_USB_DWC3_GADGET)) dwc->dr_mode = USB_DR_MODE_HOST; else if (!IS_ENABLED(CONFIG_USB_HOST)) dwc->dr_mode = USB_DR_MODE_PERIPHERAL;
The IS_ENABLED() macro requires the complete CONFIG option including the 'CONFIG_' prefix. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> --- To be applied on top of usb/next drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)