Please revert, without the preceding patch (cx23885: fix UNSET/TUNER_ABSENT
confusion.)
this board won't work.
Or merge that patch as well, that's fine too...
Regards,
Hans
On 07/18/2014 12:57 AM, Mauro Carvalho Chehab wrote:
> This is an automatic generated email to let you know that the following patch
> were queued at the
> http://git.linuxtv.org/media_tree.git tree:
>
> Subject: [media] cx23885: add support for Hauppauge ImpactVCB-e
> Author: Hans Verkuil <hans.verk...@cisco.com>
> Date: Fri Jun 27 11:15:42 2014 -0300
>
> Add support for Hauppauge model 71100: WinTV-ImpactVCB-e
> (PCIe, Retail, half height)
>
> Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
> Signed-off-by: Mauro Carvalho Chehab <m.che...@samsung.com>
>
> drivers/media/pci/cx23885/cx23885-cards.c | 31
> ++++++++++++++++++++++++++++-
> drivers/media/pci/cx23885/cx23885-video.c | 1 +
> drivers/media/pci/cx23885/cx23885.h | 1 +
> 3 files changed, 32 insertions(+), 1 deletions(-)
>
> ---
>
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=cce11b093f8a7f5e689f250d5b219f69a45e5db3
>
> diff --git a/drivers/media/pci/cx23885/cx23885-cards.c
> b/drivers/media/pci/cx23885/cx23885-cards.c
> index 79f20c8..9723067 100644
> --- a/drivers/media/pci/cx23885/cx23885-cards.c
> +++ b/drivers/media/pci/cx23885/cx23885-cards.c
> @@ -649,7 +649,26 @@ struct cx23885_board cx23885_boards[] = {
> CX25840_NONE1_CH3,
> .amux = CX25840_AUDIO6,
> } },
> - }
> + },
> + [CX23885_BOARD_HAUPPAUGE_IMPACTVCBE] = {
> + .name = "Hauppauge ImpactVCB-e",
> + .tuner_type = TUNER_ABSENT,
> + .porta = CX23885_ANALOG_VIDEO,
> + .input = {{
> + .type = CX23885_VMUX_COMPOSITE1,
> + .vmux = CX25840_VIN7_CH3 |
> + CX25840_VIN4_CH2 |
> + CX25840_VIN6_CH1,
> + .amux = CX25840_AUDIO7,
> + }, {
> + .type = CX23885_VMUX_SVIDEO,
> + .vmux = CX25840_VIN7_CH3 |
> + CX25840_VIN4_CH2 |
> + CX25840_VIN8_CH1 |
> + CX25840_SVIDEO_ON,
> + .amux = CX25840_AUDIO7,
> + } },
> + },
> };
> const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
>
> @@ -897,6 +916,10 @@ struct cx23885_subid cx23885_subids[] = {
> .subvendor = 0x1461,
> .subdevice = 0xd939,
> .card = CX23885_BOARD_AVERMEDIA_HC81R,
> + }, {
> + .subvendor = 0x0070,
> + .subdevice = 0x7133,
> + .card = CX23885_BOARD_HAUPPAUGE_IMPACTVCBE,
> },
> };
> const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
> @@ -977,6 +1000,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8
> *eeprom_data)
> case 71009:
> /* WinTV-HVR1200 (PCIe, Retail, full height)
> * DVB-T and basic analog */
> + case 71100:
> + /* WinTV-ImpactVCB-e (PCIe, Retail, half height)
> + * Basic analog */
> case 71359:
> /* WinTV-HVR1200 (PCIe, OEM, half height)
> * DVB-T and basic analog */
> @@ -1701,6 +1727,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> case CX23885_BOARD_HAUPPAUGE_HVR1850:
> case CX23885_BOARD_HAUPPAUGE_HVR1290:
> case CX23885_BOARD_HAUPPAUGE_HVR4400:
> + case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:
> if (dev->i2c_bus[0].i2c_rc == 0)
> hauppauge_eeprom(dev, eeprom+0xc0);
> break;
> @@ -1807,6 +1834,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> case CX23885_BOARD_HAUPPAUGE_HVR1200:
> case CX23885_BOARD_HAUPPAUGE_HVR1700:
> case CX23885_BOARD_HAUPPAUGE_HVR1400:
> + case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
> @@ -1835,6 +1863,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
> break;
> case CX23885_BOARD_HAUPPAUGE_HVR1250:
> case CX23885_BOARD_HAUPPAUGE_HVR1800:
> + case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:
> case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
> case CX23885_BOARD_HAUPPAUGE_HVR1700:
> case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
> diff --git a/drivers/media/pci/cx23885/cx23885-video.c
> b/drivers/media/pci/cx23885/cx23885-video.c
> index e0a5952..71e3ec3 100644
> --- a/drivers/media/pci/cx23885/cx23885-video.c
> +++ b/drivers/media/pci/cx23885/cx23885-video.c
> @@ -507,6 +507,7 @@ static int cx23885_video_mux(struct cx23885_dev *dev,
> unsigned int input)
> if ((dev->board == CX23885_BOARD_HAUPPAUGE_HVR1800) ||
> (dev->board == CX23885_BOARD_MPX885) ||
> (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) ||
> + (dev->board == CX23885_BOARD_HAUPPAUGE_IMPACTVCBE) ||
> (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) ||
> (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) ||
> (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) ||
> diff --git a/drivers/media/pci/cx23885/cx23885.h
> b/drivers/media/pci/cx23885/cx23885.h
> index 0fa4048..6a4b20e 100644
> --- a/drivers/media/pci/cx23885/cx23885.h
> +++ b/drivers/media/pci/cx23885/cx23885.h
> @@ -96,6 +96,7 @@
> #define CX23885_BOARD_TBS_6981 40
> #define CX23885_BOARD_TBS_6980 41
> #define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
> +#define CX23885_BOARD_HAUPPAUGE_IMPACTVCBE 43
>
> #define GPIO_0 0x00000001
> #define GPIO_1 0x00000002
>
> _______________________________________________
> linuxtv-commits mailing list
> linuxtv-comm...@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
