| Message ID | 1291854755-25103-1-git-send-email-tmarri@apm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hello. On 09-12-2010 3:32, tmarri@apm.com wrote: > From: Tirumala Marri<tmarri@apm.com> > Enable gadget support > Signed-off-by: Tirumala R Marri<tmarri@apm.com> > Signed-off-by: Fushen Chen<fchen@apm.com> > Signed-off-by: Mark Miesfeld<mmiesfeld@apm.com> [...] > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index 747b0d3..b2bcc4e 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -365,6 +365,28 @@ config USB_GADGET_MUSB_HDRC [...] > +config USB_OTG > + boolean "OTG Support" This symbol is already defined in drivers/usb/core/Kconfig. WBR, Sergei
On Thu, Dec 9, 2010 at 5:24 AM, Sergei Shtylyov <sshtylyov@mvista.com> wrote: > Hello. > > On 09-12-2010 3:32, tmarri@apm.com wrote: > >> From: Tirumala Marri<tmarri@apm.com> > >> Enable gadget support > >> Signed-off-by: Tirumala R Marri<tmarri@apm.com> >> Signed-off-by: Fushen Chen<fchen@apm.com> >> Signed-off-by: Mark Miesfeld<mmiesfeld@apm.com> > > [...] > >> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig >> index 747b0d3..b2bcc4e 100644 >> --- a/drivers/usb/gadget/Kconfig >> +++ b/drivers/usb/gadget/Kconfig >> @@ -365,6 +365,28 @@ config USB_GADGET_MUSB_HDRC > > [...] >> >> +config USB_OTG >> + boolean "OTG Support" > > This symbol is already defined in drivers/usb/core/Kconfig. > > WBR, Sergei > Sure I will fix that. Thx, Marri
On Thu, Dec 09, 2010 at 08:52:45AM -0800, Tirumala Marri wrote: > On Thu, Dec 9, 2010 at 5:24 AM, Sergei Shtylyov <sshtylyov@mvista.com> wrote: > > Hello. > > > > On 09-12-2010 3:32, tmarri@apm.com wrote: > > > >> From: Tirumala Marri<tmarri@apm.com> > > > >> Enable gadget support > > > >> Signed-off-by: Tirumala R Marri<tmarri@apm.com> > >> Signed-off-by: Fushen Chen<fchen@apm.com> > >> Signed-off-by: Mark Miesfeld<mmiesfeld@apm.com> > > > > [...] > > > >> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > >> index 747b0d3..b2bcc4e 100644 > >> --- a/drivers/usb/gadget/Kconfig > >> +++ b/drivers/usb/gadget/Kconfig > >> @@ -365,6 +365,28 @@ config USB_GADGET_MUSB_HDRC > > > > [...] > >> > >> +config USB_OTG > >> + boolean "OTG Support" > > > > This symbol is already defined in drivers/usb/core/Kconfig. > > > > WBR, Sergei > > > Sure I will fix that. Other than this minor thing, the patches look good. I'll go apply patches 1-8 for now, care to resend 9 and 10 with this change made? thanks, greg k-h
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 747b0d3..b2bcc4e 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -365,6 +365,28 @@ config USB_GADGET_MUSB_HDRC This OTG-capable silicon IP is used in dual designs including the TI DaVinci, OMAP 243x, OMAP 343x, TUSB 6010, and ADI Blackfin +# dwc_otg builds in ../dwc_otg along with host support +config USB_GADGET_DWC_HDRC + boolean "DesignWare USB Peripheral" + depends on DWC_OTG_MODE || DWC_DEVICE_ONLY + select USB_GADGET_DUALSPEED + select USB_GADGET_SELECTED + select USB_OTG + help + This OTG-capable Designware USB IP + +config USB_OTG + boolean "OTG Support" + depends on USB_GADGET_DWC_HDRC + help + The most notable feature of USB OTG is support for a + "Dual-Role" device, which can act as either a device + or a host. The initial role choice can be changed + later, when two dual-role devices talk to each other. + Select this only if your board has a Mini-AB connector. + + + config USB_GADGET_M66592 boolean "Renesas M66592 USB Peripheral Controller" select USB_GADGET_DUALSPEED diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index d7b3bbe..e008e07 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -142,6 +142,12 @@ #define gadget_is_s3c_hsotg(g) 0 #endif +#if defined(CONFIG_DWC_OTG_MODE) || defined(CONFIG_DWC_DEVICE_ONLY) +#define gadget_is_dwc_otg_pcd(g) (!strcmp("dwc_otg_pcd", (g)->name)) +#else +#define gadget_is_dwc_otg_pcd(g) 0 +#endif + #ifdef CONFIG_USB_GADGET_EG20T #define gadget_is_pch(g) (!strcmp("pch_udc", (g)->name)) #else @@ -207,6 +213,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) return 0x26; else if (gadget_is_pch(gadget)) return 0x27; + else if (gadget_is_dwc_otg_pcd(gadget)) + return 0x28; return -ENOENT; }