* [PATCH 0/2] Update Auvitek au0828 quirks
@ 2014-10-30 10:53 Mauro Carvalho Chehab
2014-10-30 10:53 ` [PATCH 1/2] [media] sound: simplify au0828 quirk table Mauro Carvalho Chehab
2014-10-30 10:53 ` [PATCH 2/2] [media] sound: Update au0828 quirks table Mauro Carvalho Chehab
0 siblings, 2 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-30 10:53 UTC (permalink / raw)
To: Linux Media Mailing List; +Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab
There are several Auvitek au0828 listed at sound quirks. However,
the table there is incomplete. Simplify the table using a macro
for au0828 devices and update it to reflect the devices currently
supported at the Linux Kernel by drivers/media/usb/au0828 driver.
Mauro Carvalho Chehab (2):
[media] sound: simplify au0828 quirk table
[media] sound: Update au0828 quirks table
sound/usb/quirks-table.h | 166 +++++++++++------------------------------------
1 file changed, 39 insertions(+), 127 deletions(-)
--
1.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] [media] sound: simplify au0828 quirk table
2014-10-30 10:53 [PATCH 0/2] Update Auvitek au0828 quirks Mauro Carvalho Chehab
@ 2014-10-30 10:53 ` Mauro Carvalho Chehab
2014-10-30 11:09 ` Takashi Iwai
2014-10-30 11:16 ` [alsa-devel] " Clemens Ladisch
2014-10-30 10:53 ` [PATCH 2/2] [media] sound: Update au0828 quirks table Mauro Carvalho Chehab
1 sibling, 2 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-30 10:53 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jaroslav Kysela,
Takashi Iwai, Clemens Ladisch, Eduard Gilmutdinov, Daniel Mack,
Vlad Catoi, alsa-devel, stable, Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Add a macro to simplify au0828 quirk table. That makes easier
to check it against the USB IDs at drivers/media/usb/au0828-card.c
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c657752a420c..5ae1d02d17a3 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2804,133 +2804,37 @@ YAMAHA_DEVICE(0x7010, "UB99"),
}
},
-/* Hauppauge HVR-950Q and HVR-850 */
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-850",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
-{
- USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008),
- .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
- USB_DEVICE_ID_MATCH_INT_CLASS |
- USB_DEVICE_ID_MATCH_INT_SUBCLASS,
- .bInterfaceClass = USB_CLASS_AUDIO,
- .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
- .vendor_name = "Hauppauge",
- .product_name = "HVR-950Q",
- .ifnum = QUIRK_ANY_INTERFACE,
- .type = QUIRK_AUDIO_ALIGN_TRANSFER,
- }
-},
+/*
+ * Auvitek au0828 devices with audio interface.
+ * This should be kept in sync with drivers/media/usb/au0828-card.c
+ * Please notice that some drivers are DVB only, and don't need to be
+ * here. That's the case, for example, of DVICO_FUSIONHDTV7.
+ */
+
+#define AU0828_DEVICE(vid, pid, vname, pname) { \
+ USB_DEVICE_VENDOR_SPEC(vid, pid), \
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
+ USB_DEVICE_ID_MATCH_INT_CLASS | \
+ USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
+ .bInterfaceClass = USB_CLASS_AUDIO, \
+ .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \
+ .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \
+ .vendor_name = vname, \
+ .product_name = pname, \
+ .ifnum = QUIRK_ANY_INTERFACE, \
+ .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
+ } \
+}
+
+AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
+AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),
/* Digidesign Mbox */
{
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] [media] sound: Update au0828 quirks table
2014-10-30 10:53 [PATCH 0/2] Update Auvitek au0828 quirks Mauro Carvalho Chehab
2014-10-30 10:53 ` [PATCH 1/2] [media] sound: simplify au0828 quirk table Mauro Carvalho Chehab
@ 2014-10-30 10:53 ` Mauro Carvalho Chehab
1 sibling, 0 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-30 10:53 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jaroslav Kysela,
Takashi Iwai, Clemens Ladisch, Vlad Catoi, Eduard Gilmutdinov,
Daniel Mack, alsa-devel, stable, Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <m.chehab@samsung.com>
The au0828 quirks table is currently not in sync with the au0828
media driver.
Syncronize it and put them on the same order as found at au0828
driver, as all the au0828 devices with analog TV need the
same quirks.
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 5ae1d02d17a3..8a6b366f2925 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2827,14 +2827,22 @@ YAMAHA_DEVICE(0x7010, "UB99"),
}
AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),
AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),
AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),
AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),
AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),
-AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),
AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7201, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x2040, 0x7211, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x2040, 0x7281, "Hauppauge", "HVR-950Q-MXL"),
+AU0828_DEVICE(0x05e1, 0x0480, "Hauppauge", "Woodbury"),
+AU0828_DEVICE(0x2040, 0x8200, "Hauppauge", "Woodbury"),
+AU0828_DEVICE(0x2040, 0x7260, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7213, "Hauppauge", "HVR-950Q"),
+AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
/* Digidesign Mbox */
{
--
1.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] [media] sound: simplify au0828 quirk table
2014-10-30 10:53 ` [PATCH 1/2] [media] sound: simplify au0828 quirk table Mauro Carvalho Chehab
@ 2014-10-30 11:09 ` Takashi Iwai
2014-10-30 11:15 ` Mauro Carvalho Chehab
2014-10-30 11:16 ` [alsa-devel] " Clemens Ladisch
1 sibling, 1 reply; 7+ messages in thread
From: Takashi Iwai @ 2014-10-30 11:09 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Mauro Carvalho Chehab,
Mauro Carvalho Chehab, Jaroslav Kysela, Clemens Ladisch,
Eduard Gilmutdinov, Daniel Mack, Vlad Catoi, alsa-devel, stable
At Thu, 30 Oct 2014 08:53:04 -0200,
Mauro Carvalho Chehab wrote:
>
> From: Mauro Carvalho Chehab <m.chehab@samsung.com>
>
> Add a macro to simplify au0828 quirk table. That makes easier
> to check it against the USB IDs at drivers/media/usb/au0828-card.c
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Which sign-off should I take? Judging from the author line, the
former one? The second patch had only s-o-b from @samsung.com.
thanks,
Takashi
>
> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> index c657752a420c..5ae1d02d17a3 100644
> --- a/sound/usb/quirks-table.h
> +++ b/sound/usb/quirks-table.h
> @@ -2804,133 +2804,37 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> }
> },
>
> -/* Hauppauge HVR-950Q and HVR-850 */
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-850",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> -{
> - USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008),
> - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> - USB_DEVICE_ID_MATCH_INT_CLASS |
> - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> - .bInterfaceClass = USB_CLASS_AUDIO,
> - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> - .vendor_name = "Hauppauge",
> - .product_name = "HVR-950Q",
> - .ifnum = QUIRK_ANY_INTERFACE,
> - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> - }
> -},
> +/*
> + * Auvitek au0828 devices with audio interface.
> + * This should be kept in sync with drivers/media/usb/au0828-card.c
> + * Please notice that some drivers are DVB only, and don't need to be
> + * here. That's the case, for example, of DVICO_FUSIONHDTV7.
> + */
> +
> +#define AU0828_DEVICE(vid, pid, vname, pname) { \
> + USB_DEVICE_VENDOR_SPEC(vid, pid), \
> + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
> + USB_DEVICE_ID_MATCH_INT_CLASS | \
> + USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
> + .bInterfaceClass = USB_CLASS_AUDIO, \
> + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \
> + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \
> + .vendor_name = vname, \
> + .product_name = pname, \
> + .ifnum = QUIRK_ANY_INTERFACE, \
> + .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
> + } \
> +}
> +
> +AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
> +AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),
> +AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),
>
> /* Digidesign Mbox */
> {
> --
> 1.9.3
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] [media] sound: simplify au0828 quirk table
2014-10-30 11:09 ` Takashi Iwai
@ 2014-10-30 11:15 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-30 11:15 UTC (permalink / raw)
To: Takashi Iwai
Cc: Linux Media Mailing List, Mauro Carvalho Chehab,
Mauro Carvalho Chehab, Jaroslav Kysela, Clemens Ladisch,
Eduard Gilmutdinov, Daniel Mack, Vlad Catoi, alsa-devel, stable
Em Thu, 30 Oct 2014 12:09:07 +0100
Takashi Iwai <tiwai@suse.de> escreveu:
> At Thu, 30 Oct 2014 08:53:04 -0200,
> Mauro Carvalho Chehab wrote:
> >
> > From: Mauro Carvalho Chehab <m.chehab@samsung.com>
> >
> > Add a macro to simplify au0828 quirk table. That makes easier
> > to check it against the USB IDs at drivers/media/usb/au0828-card.c
> >
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
>
> Which sign-off should I take? Judging from the author line, the
> former one?
Gah, that's the problem with rebased patches ;)
I started using mchehab@osg.samsung.com for upstream submission
a few months ago.
Both emails are valid, but I prefer if you use this one:
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
> The second patch had only s-o-b from @samsung.com.
Yeah, I remembered to remove the extra SOB on the second patch,
but didn't notice it on the first one.
>
>
> thanks,
>
> Takashi
>
> >
> > diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> > index c657752a420c..5ae1d02d17a3 100644
> > --- a/sound/usb/quirks-table.h
> > +++ b/sound/usb/quirks-table.h
> > @@ -2804,133 +2804,37 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> > }
> > },
> >
> > -/* Hauppauge HVR-950Q and HVR-850 */
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7200),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7210),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7217),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721b),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721e),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x721f),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7240),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-850",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x2040, 0x7280),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > -{
> > - USB_DEVICE_VENDOR_SPEC(0x0fd9, 0x0008),
> > - .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
> > - USB_DEVICE_ID_MATCH_INT_CLASS |
> > - USB_DEVICE_ID_MATCH_INT_SUBCLASS,
> > - .bInterfaceClass = USB_CLASS_AUDIO,
> > - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
> > - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > - .vendor_name = "Hauppauge",
> > - .product_name = "HVR-950Q",
> > - .ifnum = QUIRK_ANY_INTERFACE,
> > - .type = QUIRK_AUDIO_ALIGN_TRANSFER,
> > - }
> > -},
> > +/*
> > + * Auvitek au0828 devices with audio interface.
> > + * This should be kept in sync with drivers/media/usb/au0828-card.c
> > + * Please notice that some drivers are DVB only, and don't need to be
> > + * here. That's the case, for example, of DVICO_FUSIONHDTV7.
> > + */
> > +
> > +#define AU0828_DEVICE(vid, pid, vname, pname) { \
> > + USB_DEVICE_VENDOR_SPEC(vid, pid), \
> > + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
> > + USB_DEVICE_ID_MATCH_INT_CLASS | \
> > + USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
> > + .bInterfaceClass = USB_CLASS_AUDIO, \
> > + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, \
> > + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { \
> > + .vendor_name = vname, \
> > + .product_name = pname, \
> > + .ifnum = QUIRK_ANY_INTERFACE, \
> > + .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
> > + } \
> > +}
> > +
> > +AU0828_DEVICE(0x2040, 0x7200, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x7210, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x7217, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x721b, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x721e, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x721f, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x2040, 0x7240, "Hauppauge", "HVR-850"),
> > +AU0828_DEVICE(0x2040, 0x7280, "Hauppauge", "HVR-950Q"),
> > +AU0828_DEVICE(0x0fd9, 0x0008, "Hauppauge", "HVR-950Q"),
> >
> > /* Digidesign Mbox */
> > {
> > --
> > 1.9.3
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [alsa-devel] [PATCH 1/2] [media] sound: simplify au0828 quirk table
2014-10-30 10:53 ` [PATCH 1/2] [media] sound: simplify au0828 quirk table Mauro Carvalho Chehab
2014-10-30 11:09 ` Takashi Iwai
@ 2014-10-30 11:16 ` Clemens Ladisch
2014-10-30 11:28 ` Mauro Carvalho Chehab
1 sibling, 1 reply; 7+ messages in thread
From: Clemens Ladisch @ 2014-10-30 11:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Linux Media Mailing List
Cc: alsa-devel, Takashi Iwai, stable, Daniel Mack,
Mauro Carvalho Chehab, Eduard Gilmutdinov, Vlad Catoi,
Mauro Carvalho Chehab
Mauro Carvalho Chehab wrote:
> Add a macro to simplify au0828 quirk table. That makes easier
> to check it against the USB IDs at drivers/media/usb/au0828-card.c
>
> +++ b/sound/usb/quirks-table.h
> ...
> + * This should be kept in sync with drivers/media/usb/au0828-card.c
The file does not exist in that directory. And when you want to
keep two files in sync, you need such reminders in both of them.
Regards,
Clemens
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [alsa-devel] [PATCH 1/2] [media] sound: simplify au0828 quirk table
2014-10-30 11:16 ` [alsa-devel] " Clemens Ladisch
@ 2014-10-30 11:28 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2014-10-30 11:28 UTC (permalink / raw)
To: Clemens Ladisch
Cc: Linux Media Mailing List, alsa-devel, Takashi Iwai, stable,
Daniel Mack, Mauro Carvalho Chehab, Eduard Gilmutdinov,
Vlad Catoi, Mauro Carvalho Chehab
Em Thu, 30 Oct 2014 12:16:13 +0100
Clemens Ladisch <clemens@ladisch.de> escreveu:
> Mauro Carvalho Chehab wrote:
> > Add a macro to simplify au0828 quirk table. That makes easier
> > to check it against the USB IDs at drivers/media/usb/au0828-card.c
> >
> > +++ b/sound/usb/quirks-table.h
> > ...
> > + * This should be kept in sync with drivers/media/usb/au0828-card.c
>
> The file does not exist in that directory. And when you want to
> keep two files in sync, you need such reminders in both of them.
Thanks for reviewing it.
I'm sending an updated version with those fixes.
Regards,
Mauro
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-10-30 11:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-30 10:53 [PATCH 0/2] Update Auvitek au0828 quirks Mauro Carvalho Chehab
2014-10-30 10:53 ` [PATCH 1/2] [media] sound: simplify au0828 quirk table Mauro Carvalho Chehab
2014-10-30 11:09 ` Takashi Iwai
2014-10-30 11:15 ` Mauro Carvalho Chehab
2014-10-30 11:16 ` [alsa-devel] " Clemens Ladisch
2014-10-30 11:28 ` Mauro Carvalho Chehab
2014-10-30 10:53 ` [PATCH 2/2] [media] sound: Update au0828 quirks table Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).