| Message ID | 1355407206-17100-225-git-send-email-herton.krzesinski@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Thu, 2012-12-13 at 11:59 -0200, Herton Ronaldo Krzesinski wrote: > 3.5.7.2 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Marek Vasut <marex@denx.de> > > commit 2843b673d03421e0e73cf061820d1db328f7c8eb upstream. > > The USB recovery mode present in i.MX28 ROM emulates USB HID. > It needs this quirk to behave properly. Greg, this is missing from 3.0 and 3.4 but should be applicable. Ben. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Chen Peter <B29397@freescale.com> > Cc: Greg KH <greg@kroah.com> > Cc: Jiri Kosina <jkosina@suse.cz> > [jkosina@suse.cz: fix alphabetical ordering] > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > [ herton: adjust context ] > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> > --- > drivers/hid/hid-ids.h | 3 +++ > drivers/hid/usbhid/hid-quirks.c | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 9d9bb9a..5ddfcc7 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -296,6 +296,9 @@ > #define USB_VENDOR_ID_EZKEY 0x0518 > #define USB_DEVICE_ID_BTC_8193 0x0002 > > +#define USB_VENDOR_ID_FREESCALE 0x15A2 > +#define USB_DEVICE_ID_FREESCALE_MX28 0x004F > + > #define USB_VENDOR_ID_FRUCTEL 0x25B6 > #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002 > > diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c > index 991e85c..8865fa3 100644 > --- a/drivers/hid/usbhid/hid-quirks.c > +++ b/drivers/hid/usbhid/hid-quirks.c > @@ -70,6 +70,7 @@ static const struct hid_blacklist { > { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, > { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, > { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, > + { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, > { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, > { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, > { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 9d9bb9a..5ddfcc7 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -296,6 +296,9 @@ #define USB_VENDOR_ID_EZKEY 0x0518 #define USB_DEVICE_ID_BTC_8193 0x0002 +#define USB_VENDOR_ID_FREESCALE 0x15A2 +#define USB_DEVICE_ID_FREESCALE_MX28 0x004F + #define USB_VENDOR_ID_FRUCTEL 0x25B6 #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 991e85c..8865fa3 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -70,6 +70,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },