diff mbox

[3.5,057/103] HID: add quirk for Freescale i.MX23 ROM recovery

Message ID 1387304012-23805-58-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques Dec. 17, 2013, 6:12 p.m. UTC
3.5.7.28 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Marek Vasut <marex@denx.de>

commit 436136cec650d661eb662fcb508a99878606d050 upstream.

The USB recovery mode present in i.MX23 ROM emulates USB HID.  It needs this
quirk to behave properly.

Even if the official branding of the chip is Freescale i.MX23, I named it
Sigmatel STMP3780 since that's what the chip really is and it even reports
itself as STMP3780.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/hid/hid-ids.h           | 3 +++
 drivers/hid/usbhid/hid-quirks.c | 1 +
 2 files changed, 4 insertions(+)

Comments

Marek Vasut Dec. 17, 2013, 7:39 p.m. UTC | #1
On Tuesday, December 17, 2013 at 07:12:46 PM, Luis Henriques wrote:
> 3.5.7.28 -stable review patch.  If anyone has any objections, please let me
> know.

Hi,

while I cannot test this anymore as I don't have these machines with ubuntu 
12.04.3 available anymore (I won't do a distro war, don't worry :) ), I have two 
simple questions:

a) Will you be able to pick the other two patches from [1] ?
b) Will these patches make it into ubuntu 12.03.n ?

I will have these machines available in january again, so I will be able to 
test.

Thank you!

[1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1258332

Best regards,
Marek Vasut
Luis Henriques Dec. 18, 2013, 4:16 p.m. UTC | #2
Hi Marek,

On Tue, Dec 17, 2013 at 08:39:03PM +0100, Marek Vasut wrote:
> On Tuesday, December 17, 2013 at 07:12:46 PM, Luis Henriques wrote:
> > 3.5.7.28 -stable review patch.  If anyone has any objections, please let me
> > know.
> 
> Hi,
> 
> while I cannot test this anymore as I don't have these machines with ubuntu 
> 12.04.3 available anymore (I won't do a distro war, don't worry :) ), I have two 
> simple questions:
> 
> a) Will you be able to pick the other two patches from [1] ?

Sure, if you believe these 2 patches are applicable to the 3.5 extended
stable kernel, I can queue them for the next release.

> b) Will these patches make it into ubuntu 12.03.n ?

Please note that this is the 3.5 extended stable kernel, not an Ubuntu
kernel -- it follows the same rules as the official stable kernels.
Eventually, this kernel release will be picked by the Ubuntu Quantal kernel
(which is based on 3.5).

> 
> I will have these machines available in january again, so I will be able to 
> test.
> 
> Thank you!
> 
> [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1258332
> 
> Best regards,
> Marek Vasut

Cheers,
--
Luis
Luis Henriques Dec. 18, 2013, 4:28 p.m. UTC | #3
(replying to kernel-team mailing-list only)

On Tue, Dec 17, 2013 at 08:39:03PM +0100, Marek Vasut wrote:
> On Tuesday, December 17, 2013 at 07:12:46 PM, Luis Henriques wrote:
> > 3.5.7.28 -stable review patch.  If anyone has any objections, please let me
> > know.
> 
> Hi,
> 
> while I cannot test this anymore as I don't have these machines with ubuntu 
> 12.04.3 available anymore (I won't do a distro war, don't worry :) ), I have two 
> simple questions:
> 
> a) Will you be able to pick the other two patches from [1] ?
> b) Will these patches make it into ubuntu 12.03.n ?

The next 12.04 (assuming the '12.03' is a typo) will be 12.04.4 that is
currently scheduled for Feb 6.  Since the kernel that will be shipping with
this release is a Saucy kernel (based on 3.11), I believe it already
contains all the patches you're requesting in your bug report.

> I will have these machines available in january again, so I will be able to 
> test.

Great, please feel free to provide us any feedback on these (or any other)
patches.

Cheers,
--
Luis

> 
> Thank you!
> 
> [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1258332
> 
> Best regards,
> Marek Vasut
Marek Vasut Dec. 18, 2013, 5:13 p.m. UTC | #4
On Wednesday, December 18, 2013 at 05:16:13 PM, Luis Henriques wrote:
> Hi Marek,
> 
> On Tue, Dec 17, 2013 at 08:39:03PM +0100, Marek Vasut wrote:
> > On Tuesday, December 17, 2013 at 07:12:46 PM, Luis Henriques wrote:
> > > 3.5.7.28 -stable review patch.  If anyone has any objections, please
> > > let me know.
> > 
> > Hi,
> > 
> > while I cannot test this anymore as I don't have these machines with
> > ubuntu 12.04.3 available anymore (I won't do a distro war, don't worry
> > :) ), I have two simple questions:
> > 
> > a) Will you be able to pick the other two patches from [1] ?
> 
> Sure, if you believe these 2 patches are applicable to the 3.5 extended
> stable kernel, I can queue them for the next release.

Thank you!

> > b) Will these patches make it into ubuntu 12.03.n ?
> 
> Please note that this is the 3.5 extended stable kernel, not an Ubuntu
> kernel -- it follows the same rules as the official stable kernels.
> Eventually, this kernel release will be picked by the Ubuntu Quantal kernel
> (which is based on 3.5).

Sure, I am not an ubuntu expert so sorry about the misplaced question.

> > I will have these machines available in january again, so I will be able
> > to test.
> > 
> > Thank you!
> > 
> > [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1258332
> > 
> > Best regards,
> > Marek Vasut
> 
> Cheers,
> --
> Luis

Best regards,
Marek Vasut
Marek Vasut Dec. 18, 2013, 5:14 p.m. UTC | #5
On Wednesday, December 18, 2013 at 05:28:52 PM, Luis Henriques wrote:
> (replying to kernel-team mailing-list only)
> 
> On Tue, Dec 17, 2013 at 08:39:03PM +0100, Marek Vasut wrote:
> > On Tuesday, December 17, 2013 at 07:12:46 PM, Luis Henriques wrote:
> > > 3.5.7.28 -stable review patch.  If anyone has any objections, please
> > > let me know.
> > 
> > Hi,
> > 
> > while I cannot test this anymore as I don't have these machines with
> > ubuntu 12.04.3 available anymore (I won't do a distro war, don't worry
> > :) ), I have two simple questions:
> > 
> > a) Will you be able to pick the other two patches from [1] ?
> > b) Will these patches make it into ubuntu 12.03.n ?
> 
> The next 12.04 (assuming the '12.03' is a typo) will be 12.04.4 that is
> currently scheduled for Feb 6.  Since the kernel that will be shipping with
> this release is a Saucy kernel (based on 3.11), I believe it already
> contains all the patches you're requesting in your bug report.

Oh, I didn't know the 'LTS' version would be getting such kind of kernel 
updates. Thanks for explaining.

Yes, 12.04.n was a typo, sorry.

> > I will have these machines available in january again, so I will be able
> > to test.
> 
> Great, please feel free to provide us any feedback on these (or any other)
> patches.

Will test and will do.

Thanks!

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 16641fd..0e59c28 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -686,6 +686,9 @@ 
 #define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
 #define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
 
+#define USB_VENDOR_ID_SIGMATEL		0x066F
+#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780
+
 #define USB_VENDOR_ID_SKYCABLE			0x1223
 #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 4c37560..bb09319 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -82,6 +82,7 @@  static const struct hid_blacklist {
 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
+	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },