[PATCH v2 0/2] Update Auvitek au0828 quirks

[PATCH v2 0/2] Update Auvitek au0828 quirks

[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

-

v2: Fix SOB, au0828 driver reference and add a warning at au0828-cards.c.

Mauro Carvalho Chehab (2):
  [media] sound: simplify au0828 quirk table
  [media] sound: Update au0828 quirks table

 drivers/media/usb/au0828/au0828-cards.c |   5 +
 sound/usb/quirks-table.h                | 166 ++++++++------------------------
 2 files changed, 44 insertions(+), 127 deletions(-)

-- 
1.9.3

[PATCH v2 1/2] [media] sound: simplify au0828 quirk table

[Mauro Carvalho Chehab]

Add a macro to simplify au0828 quirk table. That makes easier
to check it against the USB IDs at drivers/media/usb/au0828/au0828-cards.c.

Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index 9eb77ac2153b..da87f1cc31a9 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -36,6 +36,11 @@ static void hvr950q_cs5340_audio(void *priv, int enable)
 		au0828_clear(dev, REG_000, 0x10);
 }
 
+/*
+ * WARNING: There's a quirks table at sound/usb/quirks-table.h
+ * that should also be updated every time a new device with V4L2 support
+ * is added here.
+ */
 struct au0828_board au0828_boards[] = {
 	[AU0828_BOARD_UNKNOWN] = {
 		.name	= "Unknown board",
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c657752a420c..8f3e2bf100eb 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/au0828-cards.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

[PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Mauro Carvalho Chehab]

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 8f3e2bf100eb..83bddbdb90e9 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

Re: [PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Devin Heitmueller]

Hi Mauro,

> 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.

The MXL and Woodbury boards don't support analog under Linux, so
probably shouldn't be included in the list of quirks.

That said, the MXL and Woodbury versions of the PCBs were prototypes
that never made it into production (and since the Auvitek chips are
EOL, they never will).  I wouldn't object to a patch which removed the
board profiles entirely in the interest of removing dead code.

It was certainly nice of Mike Krufky to work to get support into the
open source driver before the product was released, but after four
years it probably makes sense to remove the entries for products that
never actually shipped.

Devin

-- 
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com

Re: [PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Mauro Carvalho Chehab]

Hi Devin,

Em Thu, 30 Oct 2014 09:15:31 -0400
Devin Heitmueller <dheitmueller@kernellabs.com> escreveu:

> Hi Mauro,
> 
> > 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.
> 
> The MXL and Woodbury boards don't support analog under Linux, so
> probably shouldn't be included in the list of quirks.

True.
> 
> That said, the MXL and Woodbury versions of the PCBs were prototypes
> that never made it into production (and since the Auvitek chips are
> EOL, they never will).  I wouldn't object to a patch which removed the
> board profiles entirely in the interest of removing dead code.
> 
> It was certainly nice of Mike Krufky to work to get support into the
> open source driver before the product was released, but after four
> years it probably makes sense to remove the entries for products that
> never actually shipped.

Yeah, if nobody is using such devices, then we should get rid of them,
but I prefer to have this on a separate patch, in order to give
people the opportunity to complain.

So, if I'm understanding well, you're suggesting to add a patch
removing those 5 entries (and the corresponding quirks on alsa),
right?

	{ USB_DEVICE(0x2040, 0x7201),
		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
	{ USB_DEVICE(0x2040, 0x7211),
		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
	{ USB_DEVICE(0x2040, 0x7281),
		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
	{ USB_DEVICE(0x05e1, 0x0480),
		.driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
	{ USB_DEVICE(0x2040, 0x8200),
		.driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
	{ USB_DEVICE(0x2040, 0x7260),

Regards,
Mauro

Re: [PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Devin Heitmueller]

On Thu, Oct 30, 2014 at 9:37 AM, Mauro Carvalho Chehab
<mchehab@osg.samsung.com> wrote:
> Yeah, if nobody is using such devices, then we should get rid of them,
> but I prefer to have this on a separate patch, in order to give
> people the opportunity to complain.

Yes, I would definitely suggest a separate patch.  There's no reason
it should be mixed in with your general cleanup of the ALSA quirks.

> So, if I'm understanding well, you're suggesting to add a patch
> removing those 5 entries (and the corresponding quirks on alsa),
> right?
>
>         { USB_DEVICE(0x2040, 0x7201),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x2040, 0x7211),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x2040, 0x7281),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x05e1, 0x0480),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>         { USB_DEVICE(0x2040, 0x8200),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>         { USB_DEVICE(0x2040, 0x7260),

Exactly.

Devin

-- 
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com

Re: [PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Michael Ira Krufky]

On Thu, Oct 30, 2014 at 9:37 AM, Mauro Carvalho Chehab
<mchehab@osg.samsung.com> wrote:
> Hi Devin,
>
> Em Thu, 30 Oct 2014 09:15:31 -0400
> Devin Heitmueller <dheitmueller@kernellabs.com> escreveu:
>
>> Hi Mauro,
>>
>> > 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.
>>
>> The MXL and Woodbury boards don't support analog under Linux, so
>> probably shouldn't be included in the list of quirks.
>
> True.
>>
>> That said, the MXL and Woodbury versions of the PCBs were prototypes
>> that never made it into production (and since the Auvitek chips are
>> EOL, they never will).  I wouldn't object to a patch which removed the
>> board profiles entirely in the interest of removing dead code.
>>
>> It was certainly nice of Mike Krufky to work to get support into the
>> open source driver before the product was released, but after four
>> years it probably makes sense to remove the entries for products that
>> never actually shipped.
>
> Yeah, if nobody is using such devices, then we should get rid of them,
> but I prefer to have this on a separate patch, in order to give
> people the opportunity to complain.
>
> So, if I'm understanding well, you're suggesting to add a patch
> removing those 5 entries (and the corresponding quirks on alsa),
> right?
>
>         { USB_DEVICE(0x2040, 0x7201),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x2040, 0x7211),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x2040, 0x7281),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>         { USB_DEVICE(0x05e1, 0x0480),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>         { USB_DEVICE(0x2040, 0x8200),
>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>         { USB_DEVICE(0x2040, 0x7260),
>
> Regards,
> Mauro
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


Let's *not* remove DTV support for WOODBURY board -- it is not the
business of the public whether or not the board shipped in
mass-production.  The board profile is in fact being used for some
reference designs, and I still use my woodbury prototype to test the
MXL tuner.

I am not the only person using this profile -- no not remove it, please.

Re: [PATCH v2 2/2] [media] sound: Update au0828 quirks table

[Michael Ira Krufky]

On Thu, Oct 30, 2014 at 3:52 PM, Michael Ira Krufky <mkrufky@linuxtv.org> wrote:
> On Thu, Oct 30, 2014 at 9:37 AM, Mauro Carvalho Chehab
> <mchehab@osg.samsung.com> wrote:
>> Hi Devin,
>>
>> Em Thu, 30 Oct 2014 09:15:31 -0400
>> Devin Heitmueller <dheitmueller@kernellabs.com> escreveu:
>>
>>> Hi Mauro,
>>>
>>> > 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.
>>>
>>> The MXL and Woodbury boards don't support analog under Linux, so
>>> probably shouldn't be included in the list of quirks.
>>
>> True.
>>>
>>> That said, the MXL and Woodbury versions of the PCBs were prototypes
>>> that never made it into production (and since the Auvitek chips are
>>> EOL, they never will).  I wouldn't object to a patch which removed the
>>> board profiles entirely in the interest of removing dead code.
>>>
>>> It was certainly nice of Mike Krufky to work to get support into the
>>> open source driver before the product was released, but after four
>>> years it probably makes sense to remove the entries for products that
>>> never actually shipped.
>>
>> Yeah, if nobody is using such devices, then we should get rid of them,
>> but I prefer to have this on a separate patch, in order to give
>> people the opportunity to complain.
>>
>> So, if I'm understanding well, you're suggesting to add a patch
>> removing those 5 entries (and the corresponding quirks on alsa),
>> right?
>>
>>         { USB_DEVICE(0x2040, 0x7201),
>>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>>         { USB_DEVICE(0x2040, 0x7211),
>>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>>         { USB_DEVICE(0x2040, 0x7281),
>>                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
>>         { USB_DEVICE(0x05e1, 0x0480),
>>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>>         { USB_DEVICE(0x2040, 0x8200),
>>                 .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
>>         { USB_DEVICE(0x2040, 0x7260),
>>
>> Regards,
>> Mauro
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-media" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
> Let's *not* remove DTV support for WOODBURY board -- it is not the
> business of the public whether or not the board shipped in
> mass-production.  The board profile is in fact being used for some
> reference designs, and I still use my woodbury prototype to test the
> MXL tuner.
>
> I am not the only person using this profile -- no not remove it, please.

correction:  I still use both the woodbury prototype (to test the
reference design) *and* the MXL version for testing the mxl tuner.

There is no reason to remove these profiles, the USB IDs will not be recycled