| Message ID | d12fef0c09645ba1cd56dd011b5090cc8bde4b4b.1314704558.git.pratyush.anand@st.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Aug 30, 2011 at 6:31 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote: > > Hello. > > On 08/30/2011 03:57 PM, Pratyush Anand 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> >> Signed-off-by: Pratyush Anand<pratyush.anand@st.com> >> --- >> drivers/usb/gadget/gadget_chips.h | 18 +++++++++++++++++- >> 1 files changed, 17 insertions(+), 1 deletions(-) > >> diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h >> index 0978103..66b8018 100644 >> --- a/drivers/usb/gadget/gadget_chips.h >> +++ b/drivers/usb/gadget/gadget_chips.h >> @@ -148,6 +148,19 @@ >> #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_CI13XXX_MSM >> +#define gadget_is_ci13xxx_msm(g) (!strcmp("ci13xxx_msm", (g)->name)) >> +#else >> +#define gadget_is_ci13xxx_msm(g) 0 >> +#endif >> + >> + > > Too many newlines. > will correct it. >> >> /** >> * usb_gadget_controller_number - support bcdDevice id convention >> @@ -208,10 +221,13 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) >> return 0x26; >> else if (gadget_is_designware(gadget)) >> return 0x27; >> + else if (gadget_is_ci13xxx_msm(gadget)) >> + return 0x28; >> + else if (gadget_is_dwc_otg_pcd(gadget)) >> + return 0x29; > > Hm, why are you adding 2 gadgets? Yes, I also do not see reason for ci13xxx_msm. This was added by original auther Tirumala. @Tirumala , Please reply. > >> return -ENOENT; >> } >> >> - > > Unrelated white space change. will correct. > >> /** >> * gadget_supports_altsettings - return true if altsettings work >> * @gadget: the gadget in question > > WBR, Sergei > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index 0978103..66b8018 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -148,6 +148,19 @@ #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_CI13XXX_MSM +#define gadget_is_ci13xxx_msm(g) (!strcmp("ci13xxx_msm", (g)->name)) +#else +#define gadget_is_ci13xxx_msm(g) 0 +#endif + + /** * usb_gadget_controller_number - support bcdDevice id convention @@ -208,10 +221,13 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) return 0x26; else if (gadget_is_designware(gadget)) return 0x27; + else if (gadget_is_ci13xxx_msm(gadget)) + return 0x28; + else if (gadget_is_dwc_otg_pcd(gadget)) + return 0x29; return -ENOENT; } - /** * gadget_supports_altsettings - return true if altsettings work * @gadget: the gadget in question