[media] cx23885: Add Leadtek Winfast PxPVR2200
Commit Message
Tested:
Composite: http://imgur.com/Rb1TCF3
TV: http://imgur.com/KNrfsmv
Firmware used: xc3028-v27.fw
Not tested: audio, component, s-video, mpeg2 encoder, FM radio.
For audio it uses an CD style cable to connect to the analog "CD_IN" on the motherboard.
I didn't found how to unmute it (alsamixer do not show an CD or AUX channel).
Signed-off-by: Anca Emanuel <anca.emanuel@gmail.com>
---
drivers/media/pci/cx23885/cx23885-cards.c | 41 +++++++++++++++++++++++++++++++
drivers/media/pci/cx23885/cx23885-video.c | 3 ++-
drivers/media/pci/cx23885/cx23885.h | 1 +
3 files changed, 44 insertions(+), 1 deletion(-)
Comments
Hello
I dont know if my emails are beeing flagged as spam, but device number Fourty
has been reserved by me
You can see in my emails adding the avermedia 306 ...
If you dont see it PLEASE tell me, in that case , i'd ll love to know what is
happening !!!
OR, am I doing it the wrong way ? if so, NOONE advised me !! no one even
AKNOLEGED it .
If You are having some kind of reactions, please Advise me, and tell me what you
did, Or who you
are that made it happend .
I am a linux user since the last century adapting drivers and kernels ...without
so no pretentions i didnt
send anypatches anywere ... but spending hours or even days getting a Product
that is beeing sold and baught by
users kinda getting harder and harder, and for once I said : gee what if it was
a new comer to Linux, he'll run away
his hardware is not supported, and guess what, that what makes Linux or anyother
OS , get actually run and installed
on a machine, and hence, make YOU v4l team use an OS that actually other pepeol
use too ! isnt the goal ?
if not, dont give public access to this list, you (linux-media) make me think
it's a forgery of some commecial linux
corporation, LoL just joking ... but see, I we "give" you a "supported" new
product ... and you seem ... like you dont care :p
Best regards
> Le 13 septembre 2013 à 16:28, Anca Emanuel <anca.emanuel@gmail.com> a écrit :
>
>
> Tested:
> Composite: http://imgur.com/Rb1TCF3
> TV: http://imgur.com/KNrfsmv
> Firmware used: xc3028-v27.fw
>
> Not tested: audio, component, s-video, mpeg2 encoder, FM radio.
> For audio it uses an CD style cable to connect to the analog "CD_IN" on the
> motherboard.
> I didn't found how to unmute it (alsamixer do not show an CD or AUX channel).
>
> Signed-off-by: Anca Emanuel <anca.emanuel@gmail.com>
> ---
> drivers/media/pci/cx23885/cx23885-cards.c | 41
>+++++++++++++++++++++++++++++++
> drivers/media/pci/cx23885/cx23885-video.c | 3 ++-
> drivers/media/pci/cx23885/cx23885.h | 1 +
> 3 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/pci/cx23885/cx23885-cards.c
> b/drivers/media/pci/cx23885/cx23885-cards.c
> index 6a71a96..4bbb126 100644
> --- a/drivers/media/pci/cx23885/cx23885-cards.c
> +++ b/drivers/media/pci/cx23885/cx23885-cards.c
> @@ -223,6 +223,39 @@ struct cx23885_board cx23885_boards[] = {
> .name = "Leadtek Winfast PxDVR3200 H",
> .portc = CX23885_MPEG_DVB,
> },
> + [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
> + .name = "Leadtek Winfast PxPVR2200",
> + .porta = CX23885_ANALOG_VIDEO,
> + .tuner_type = TUNER_XC2028,
> + .tuner_addr = 0x61,
> + .tuner_bus = 1,
> + .input = {{
> + .type = CX23885_VMUX_TELEVISION,
> + .vmux = CX25840_VIN2_CH1 |
> + CX25840_VIN5_CH2,
> + .amux = CX25840_AUDIO8,
> + .gpio0 = 0x704040,
> + }, {
> + .type = CX23885_VMUX_COMPOSITE1,
> + .vmux = CX25840_COMPOSITE1,
> + .amux = CX25840_AUDIO7,
> + .gpio0 = 0x704040,
> + }, {
> + .type = CX23885_VMUX_SVIDEO,
> + .vmux = CX25840_SVIDEO_LUMA3 |
> + CX25840_SVIDEO_CHROMA4,
> + .amux = CX25840_AUDIO7,
> + .gpio0 = 0x704040,
> + }, {
> + .type = CX23885_VMUX_COMPONENT,
> + .vmux = CX25840_VIN7_CH1 |
> + CX25840_VIN6_CH2 |
> + CX25840_VIN8_CH3 |
> + CX25840_COMPONENT_ON,
> + .amux = CX25840_AUDIO7,
> + .gpio0 = 0x704040,
> + } },
> + },
> [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000] = {
> .name = "Leadtek Winfast PxDVR3200 H XC4000",
> .porta = CX23885_ANALOG_VIDEO,
> @@ -688,6 +721,10 @@ struct cx23885_subid cx23885_subids[] = {
> .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
> }, {
> .subvendor = 0x107d,
> + .subdevice = 0x6f21,
> + .card = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
> + }, {
> + .subvendor = 0x107d,
> .subdevice = 0x6f39,
> .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000,
> }, {
> @@ -1043,6 +1080,7 @@ int cx23885_tuner_callback(void *priv, int component,
> int command, int arg)
> case CX23885_BOARD_HAUPPAUGE_HVR1500:
> case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
> @@ -1208,6 +1246,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
> cx_set(GP0_IO, 0x000f000f);
> break;
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
> @@ -1704,6 +1743,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> case CX23885_BOARD_HAUPPAUGE_HVR1700:
> case CX23885_BOARD_HAUPPAUGE_HVR1400:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> case CX23885_BOARD_HAUPPAUGE_HVR1270:
> @@ -1733,6 +1773,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
> case CX23885_BOARD_HAUPPAUGE_HVR1700:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
> diff --git a/drivers/media/pci/cx23885/cx23885-video.c
> b/drivers/media/pci/cx23885/cx23885-video.c
> index 1616868..7891f34 100644
> --- a/drivers/media/pci/cx23885/cx23885-video.c
> +++ b/drivers/media/pci/cx23885/cx23885-video.c
> @@ -1865,7 +1865,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
>
> v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
>
> - if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
> + if ((dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200)
> ||
> + (dev->board ==
> CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200)) {
> struct xc2028_ctrl ctrl = {
> .fname = XC2028_DEFAULT_FIRMWARE,
> .max_len = 64
> diff --git a/drivers/media/pci/cx23885/cx23885.h
> b/drivers/media/pci/cx23885/cx23885.h
> index 038caf5..b0b47a6 100644
> --- a/drivers/media/pci/cx23885/cx23885.h
> +++ b/drivers/media/pci/cx23885/cx23885.h
> @@ -93,6 +93,7 @@
> #define CX23885_BOARD_PROF_8000 37
> #define CX23885_BOARD_HAUPPAUGE_HVR4400 38
> #define CX23885_BOARD_AVERMEDIA_HC81R 39
> +#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 40
>
> #define GPIO_0 0x00000001
> #define GPIO_1 0x00000002
> --
> 1.8.3.2
>
> --
> 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
--
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
Hi Remi,
Em Sun, 15 Sep 2013 08:22:14 +0200 (CEST)
remi <remi@remis.cc> escreveu:
> Hello
>
>
> I dont know if my emails are beeing flagged as spam, but device number Fourty
> has been reserved by me
You should not be concerned about numbering conflicts there. I'll fix
any such conflict when merging patches, if there are two ones using the
very same number.
>
> You can see in my emails adding the avermedia 306 ...
>
>
> If you dont see it PLEASE tell me, in that case , i'd ll love to know what is
> happening !!!
>
> OR, am I doing it the wrong way ? if so, NOONE advised me !! no one even
> AKNOLEGED it .
Well, the right thing to do is to check if the patches are caught by patchwork:
http://patchwork.linuxtv.org/project/linux-media/list/
Or, if you want to see all your patches, on all states (including the already handled one):
https://patchwork.linuxtv.org/project/linux-media/list/?submitter=remi&state=*
>
>
> If You are having some kind of reactions, please Advise me, and tell me what you
> did, Or who you
> are that made it happend .
In the specific case of this patch:
https://patchwork.linuxtv.org/patch/19894/
You're not modifying the file in the right place:
--- media_build/v4l/cx23885-cards.c 2012-12-28 00:04:05.000000000 +0100
+++ media_build.remi/v4l/cx23885-cards.c 2013-08-21 14:15:54.173195979
it should be, instead:
The patch, in -p1 format, should be, instead, something like:
a/drivers/media/.../cx23885-cards.c
When a patch doesn't apply for reasons like that, I generally either delay it
for when I have some time to either manually fix it or to reply to the author
requesting for him to fix it.
As since July I'm being too much busy (employee change, lots of speeches to
prepare and several long international travels), I just focused on the patches
sent via one of the sub-maintainers tree. For the ones that weren't sent via
those trees, I delayed all individual patches that fail to apply.
>
>
> I am a linux user since the last century adapting drivers and kernels ...without
> so no pretentions i didnt
>
> send anypatches anywere ... but spending hours or even days getting a Product
> that is beeing sold and baught by
>
> users kinda getting harder and harder, and for once I said : gee what if it was
> a new comer to Linux, he'll run away
>
> his hardware is not supported, and guess what, that what makes Linux or anyother
> OS , get actually run and installed
>
> on a machine, and hence, make YOU v4l team use an OS that actually other pepeol
> use too ! isnt the goal ?
>
> if not, dont give public access to this list, you (linux-media) make me think
> it's a forgery of some commecial linux
>
> corporation, LoL just joking ... but see, I we "give" you a "supported" new
> product ... and you seem ... like you dont care :p
>
>
>
>
>
>
> Best regards
>
>
>
> > Le 13 septembre 2013 à 16:28, Anca Emanuel <anca.emanuel@gmail.com> a écrit :
> >
> >
> > Tested:
> > Composite: http://imgur.com/Rb1TCF3
> > TV: http://imgur.com/KNrfsmv
> > Firmware used: xc3028-v27.fw
> >
> > Not tested: audio, component, s-video, mpeg2 encoder, FM radio.
> > For audio it uses an CD style cable to connect to the analog "CD_IN" on the
> > motherboard.
> > I didn't found how to unmute it (alsamixer do not show an CD or AUX channel).
> >
> > Signed-off-by: Anca Emanuel <anca.emanuel@gmail.com>
> > ---
> > drivers/media/pci/cx23885/cx23885-cards.c | 41
> >+++++++++++++++++++++++++++++++
> > drivers/media/pci/cx23885/cx23885-video.c | 3 ++-
> > drivers/media/pci/cx23885/cx23885.h | 1 +
> > 3 files changed, 44 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/pci/cx23885/cx23885-cards.c
> > b/drivers/media/pci/cx23885/cx23885-cards.c
> > index 6a71a96..4bbb126 100644
> > --- a/drivers/media/pci/cx23885/cx23885-cards.c
> > +++ b/drivers/media/pci/cx23885/cx23885-cards.c
> > @@ -223,6 +223,39 @@ struct cx23885_board cx23885_boards[] = {
> > .name = "Leadtek Winfast PxDVR3200 H",
> > .portc = CX23885_MPEG_DVB,
> > },
> > + [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
> > + .name = "Leadtek Winfast PxPVR2200",
> > + .porta = CX23885_ANALOG_VIDEO,
> > + .tuner_type = TUNER_XC2028,
> > + .tuner_addr = 0x61,
> > + .tuner_bus = 1,
> > + .input = {{
> > + .type = CX23885_VMUX_TELEVISION,
> > + .vmux = CX25840_VIN2_CH1 |
> > + CX25840_VIN5_CH2,
> > + .amux = CX25840_AUDIO8,
> > + .gpio0 = 0x704040,
> > + }, {
> > + .type = CX23885_VMUX_COMPOSITE1,
> > + .vmux = CX25840_COMPOSITE1,
> > + .amux = CX25840_AUDIO7,
> > + .gpio0 = 0x704040,
> > + }, {
> > + .type = CX23885_VMUX_SVIDEO,
> > + .vmux = CX25840_SVIDEO_LUMA3 |
> > + CX25840_SVIDEO_CHROMA4,
> > + .amux = CX25840_AUDIO7,
> > + .gpio0 = 0x704040,
> > + }, {
> > + .type = CX23885_VMUX_COMPONENT,
> > + .vmux = CX25840_VIN7_CH1 |
> > + CX25840_VIN6_CH2 |
> > + CX25840_VIN8_CH3 |
> > + CX25840_COMPONENT_ON,
> > + .amux = CX25840_AUDIO7,
> > + .gpio0 = 0x704040,
> > + } },
> > + },
> > [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000] = {
> > .name = "Leadtek Winfast PxDVR3200 H XC4000",
> > .porta = CX23885_ANALOG_VIDEO,
> > @@ -688,6 +721,10 @@ struct cx23885_subid cx23885_subids[] = {
> > .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
> > }, {
> > .subvendor = 0x107d,
> > + .subdevice = 0x6f21,
> > + .card = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
> > + }, {
> > + .subvendor = 0x107d,
> > .subdevice = 0x6f39,
> > .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000,
> > }, {
> > @@ -1043,6 +1080,7 @@ int cx23885_tuner_callback(void *priv, int component,
> > int command, int arg)
> > case CX23885_BOARD_HAUPPAUGE_HVR1500:
> > case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> > + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
> > @@ -1208,6 +1246,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
> > cx_set(GP0_IO, 0x000f000f);
> > break;
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> > + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
> > @@ -1704,6 +1743,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> > case CX23885_BOARD_HAUPPAUGE_HVR1700:
> > case CX23885_BOARD_HAUPPAUGE_HVR1400:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> > + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> > case CX23885_BOARD_HAUPPAUGE_HVR1270:
> > @@ -1733,6 +1773,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> > case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
> > case CX23885_BOARD_HAUPPAUGE_HVR1700:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> > + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> > case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> > case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
> > case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
> > diff --git a/drivers/media/pci/cx23885/cx23885-video.c
> > b/drivers/media/pci/cx23885/cx23885-video.c
> > index 1616868..7891f34 100644
> > --- a/drivers/media/pci/cx23885/cx23885-video.c
> > +++ b/drivers/media/pci/cx23885/cx23885-video.c
> > @@ -1865,7 +1865,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
> >
> > v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
> >
> > - if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
> > + if ((dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200)
> > ||
> > + (dev->board ==
> > CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200)) {
> > struct xc2028_ctrl ctrl = {
> > .fname = XC2028_DEFAULT_FIRMWARE,
> > .max_len = 64
> > diff --git a/drivers/media/pci/cx23885/cx23885.h
> > b/drivers/media/pci/cx23885/cx23885.h
> > index 038caf5..b0b47a6 100644
> > --- a/drivers/media/pci/cx23885/cx23885.h
> > +++ b/drivers/media/pci/cx23885/cx23885.h
> > @@ -93,6 +93,7 @@
> > #define CX23885_BOARD_PROF_8000 37
> > #define CX23885_BOARD_HAUPPAUGE_HVR4400 38
> > #define CX23885_BOARD_AVERMEDIA_HC81R 39
> > +#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 40
> >
> > #define GPIO_0 0x00000001
> > #define GPIO_1 0x00000002
> > --
> > 1.8.3.2
> >
> > --
> > 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
> --
> 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
@@ -223,6 +223,39 @@ struct cx23885_board cx23885_boards[] = {
.name = "Leadtek Winfast PxDVR3200 H",
.portc = CX23885_MPEG_DVB,
},
+ [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
+ .name = "Leadtek Winfast PxPVR2200",
+ .porta = CX23885_ANALOG_VIDEO,
+ .tuner_type = TUNER_XC2028,
+ .tuner_addr = 0x61,
+ .tuner_bus = 1,
+ .input = {{
+ .type = CX23885_VMUX_TELEVISION,
+ .vmux = CX25840_VIN2_CH1 |
+ CX25840_VIN5_CH2,
+ .amux = CX25840_AUDIO8,
+ .gpio0 = 0x704040,
+ }, {
+ .type = CX23885_VMUX_COMPOSITE1,
+ .vmux = CX25840_COMPOSITE1,
+ .amux = CX25840_AUDIO7,
+ .gpio0 = 0x704040,
+ }, {
+ .type = CX23885_VMUX_SVIDEO,
+ .vmux = CX25840_SVIDEO_LUMA3 |
+ CX25840_SVIDEO_CHROMA4,
+ .amux = CX25840_AUDIO7,
+ .gpio0 = 0x704040,
+ }, {
+ .type = CX23885_VMUX_COMPONENT,
+ .vmux = CX25840_VIN7_CH1 |
+ CX25840_VIN6_CH2 |
+ CX25840_VIN8_CH3 |
+ CX25840_COMPONENT_ON,
+ .amux = CX25840_AUDIO7,
+ .gpio0 = 0x704040,
+ } },
+ },
[CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000] = {
.name = "Leadtek Winfast PxDVR3200 H XC4000",
.porta = CX23885_ANALOG_VIDEO,
@@ -688,6 +721,10 @@ struct cx23885_subid cx23885_subids[] = {
.card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
}, {
.subvendor = 0x107d,
+ .subdevice = 0x6f21,
+ .card = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
+ }, {
+ .subvendor = 0x107d,
.subdevice = 0x6f39,
.card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000,
}, {
@@ -1043,6 +1080,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
case CX23885_BOARD_HAUPPAUGE_HVR1500:
case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+ case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1208,6 +1246,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
cx_set(GP0_IO, 0x000f000f);
break;
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+ case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1704,6 +1743,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_HAUPPAUGE_HVR1700:
case CX23885_BOARD_HAUPPAUGE_HVR1400:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+ case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
case CX23885_BOARD_HAUPPAUGE_HVR1270:
@@ -1733,6 +1773,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
case CX23885_BOARD_HAUPPAUGE_HVR1700:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+ case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@@ -1865,7 +1865,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
- if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
+ if ((dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) ||
+ (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200)) {
struct xc2028_ctrl ctrl = {
.fname = XC2028_DEFAULT_FIRMWARE,
.max_len = 64
@@ -93,6 +93,7 @@
#define CX23885_BOARD_PROF_8000 37
#define CX23885_BOARD_HAUPPAUGE_HVR4400 38
#define CX23885_BOARD_AVERMEDIA_HC81R 39
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 40
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002