Analog input for Hauppauge express-card HVR-1400

[Emil Meier <emil276me@yahoo.com>]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

In the attached files I have added some code for the analog part of a HVR-1400 
card. (The patch is taken from a patch for HVR1800..)
Until now only the composite video input is functional. 
The s-video input captures only the b&w part of the video.
The patch in cx25840-core.c was needed to get PAL support for the video input. 
If the line
cx25840_write(client, 0x2, 0x76);
is needed by other cards, the skipping should depend on the card-name... but I 
don't know how I can get the card-model in this module...

Maybe this helps someone else in using the analog part of this card.

Emil


      

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch-cx23885-cards.c.diff --]
[-- Type: text/x-patch; name="patch-cx23885-cards.c.diff", Size: 1521 bytes --]

*** ./drivers/media/video/cx23885/cx23885-cards.c~	2011-02-18 00:14:38.000000000 +0100
--- ./drivers/media/video/cx23885/cx23885-cards.c	2011-03-09 11:53:05.000000000 +0100
***************
*** 154,160 ****
--- 154,183 ----
  	},
  	[CX23885_BOARD_HAUPPAUGE_HVR1400] = {
  		.name		= "Hauppauge WinTV-HVR1400",
+ 		.porta          = CX23885_ANALOG_VIDEO,
  		.portc		= CX23885_MPEG_DVB,
+ 		.tuner_type     = TUNER_XC2028,
+ 		.tuner_addr     = 0x61, /* 0x84 >> 1 */
+ 		.input          = {{
+ 		     .type   = CX23885_VMUX_TELEVISION,
+ 		     .vmux   =       CX25840_VIN7_CH3 |
+ 		     CX25840_VIN5_CH2 |
+ 		     CX25840_VIN2_CH1,
+ 		     .gpio0  = 0,
+ 		   }, {
+ 		     .type   = CX23885_VMUX_COMPOSITE1,
+ 		     .vmux   =       CX25840_VIN7_CH3 |
+ 		     CX25840_VIN4_CH2 |
+ 		     CX25840_VIN6_CH1,
+ 		     .gpio0  = 0,
+ 		   }, {
+ 		     .type   = CX23885_VMUX_SVIDEO,
+ 		     .vmux   =       CX25840_VIN7_CH3 |
+ 		     CX25840_VIN4_CH2 |
+ 		     CX25840_VIN8_CH1 |
+ 		     CX25840_SVIDEO_ON,
+ 		     .gpio0  = 0,
+ 	       	   } },
  	},
  	[CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP] = {
  		.name		= "DViCO FusionHDTV7 Dual Express",
***************
*** 1245,1250 ****
--- 1268,1274 ----
  	case CX23885_BOARD_MAGICPRO_PROHDTVE2:
  	case CX23885_BOARD_HAUPPAUGE_HVR1290:
  	case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
+ 	case CX23885_BOARD_HAUPPAUGE_HVR1400:
  		dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
  				&dev->i2c_bus[2].i2c_adap,
  				"cx25840", "cx25840", 0x88 >> 1, NULL);

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: patch-cx25840-core.c.diff --]
[-- Type: text/x-patch; name="patch-cx25840-core.c.diff", Size: 691 bytes --]

*** ./drivers/media/video/cx25840/cx25840-core.c~	2011-02-18 00:14:38.000000000 +0100
--- ./drivers/media/video/cx25840/cx25840-core.c	2011-03-09 11:54:24.000000000 +0100
***************
*** 654,660 ****
  
  	/* Trust the default xtal, no division */
  	/* This changes for the cx23888 products */
! 	cx25840_write(client, 0x2, 0x76);
  
  	/* Bring down the regulator for AUX clk */
  	cx25840_write(client, 0x1, 0x40);
--- 654,661 ----
  
  	/* Trust the default xtal, no division */
  	/* This changes for the cx23888 products */
! 	// not for hvr1400 em 090818
! 	//cx25840_write(client, 0x2, 0x76);
  
  	/* Bring down the regulator for AUX clk */
  	cx25840_write(client, 0x1, 0x40);