aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/video/Makefile2
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c218
-rw-r--r--drivers/media/video/saa7115.c76
-rw-r--r--include/media/v4l2-common.h1
4 files changed, 78 insertions, 219 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 51721574d9c..00080224f28 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -44,7 +44,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o
44obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/ 44obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
45obj-$(CONFIG_VIDEO_CX88) += cx88/ 45obj-$(CONFIG_VIDEO_CX88) += cx88/
46obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ 46obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
47obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o 47obj-$(CONFIG_VIDEO_EM28XX) += saa7115.o tvp5150.o
48obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o 48obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o
49obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/ 49obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
50obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ 50obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 78f0f7a706e..780342f7b23 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -101,23 +101,6 @@ static struct em28xx_tvnorm tvnorms[] = {
101 } 101 }
102}; 102};
103 103
104static const unsigned char saa7114_i2c_init[] = {
105 0x00,0x00,0x01,0x08,0x02,0xc4,0x03,0x30,0x04,0x90,0x05,0x90,0x06,0xeb,0x07,0xe0,
106 0x08,0x88,0x09,0x40,0x0a,0x80,0x0b,0x44,0x0c,0x40,0x0d,0x00,0x0e,0x81,0x0f,0x2a,
107 0x10,0x06,0x11,0x00,0x12,0xc8,0x13,0x80,0x14,0x00,0x15,0x11,0x16,0x01,0x17,0x42,
108 0x18,0x40,0x19,0x80,0x40,0x00,0x41,0xff,0x42,0xff,0x43,0xff,0x44,0xff,0x45,0xff,
109 0x46,0xff,0x47,0xff,0x48,0xff,0x49,0xff,0x4a,0xff,0x4b,0xff,0x4c,0xff,0x4d,0xff,
110 0x4e,0xff,0x4f,0xff,0x50,0xff,0x51,0xff,0x52,0xff,0x53,0xff,0x54,0x5f,0x55,0xff,
111 0x56,0xff,0x57,0xff,0x58,0x00,0x59,0x47,0x5a,0x03,0x5b,0x03,0x5d,0x3e,0x5e,0x00,
112 0x80,0x1c,0x83,0x01,0x84,0xa5,0x85,0x10,0x86,0x45,0x87,0x41,0x88,0xf0,0x88,0x00,
113 0x88,0xf0,0x90,0x00,0x91,0x08,0x92,0x00,0x93,0x80,0x94,0x08,0x95,0x00,0x96,0xc0,
114 0x97,0x02,0x98,0x13,0x99,0x00,0x9a,0x38,0x9b,0x01,0x9c,0x80,0x9d,0x02,0x9e,0x06,
115 0x9f,0x01,0xa0,0x01,0xa1,0x00,0xa2,0x00,0xa4,0x80,0xa5,0x36,0xa6,0x36,0xa8,0x67,
116 0xa9,0x04,0xaa,0x00,0xac,0x33,0xad,0x02,0xae,0x00,0xb0,0xcd,0xb1,0x04,0xb2,0xcd,
117 0xb3,0x04,0xb4,0x01,0xb8,0x00,0xb9,0x00,0xba,0x00,0xbb,0x00,0xbc,0x00,0xbd,0x00,
118 0xbe,0x00,0xbf,0x00
119};
120
121#define TVNORMS ARRAY_SIZE(tvnorms) 104#define TVNORMS ARRAY_SIZE(tvnorms)
122 105
123/* supported controls */ 106/* supported controls */
@@ -144,65 +127,6 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
144 } 127 }
145}; 128};
146 129
147/* FIXME: These are specific to saa711x - should be moved to its code */
148static struct v4l2_queryctrl saa711x_qctrl[] = {
149 {
150 .id = V4L2_CID_BRIGHTNESS,
151 .type = V4L2_CTRL_TYPE_INTEGER,
152 .name = "Brightness",
153 .minimum = -128,
154 .maximum = 127,
155 .step = 1,
156 .default_value = 0,
157 .flags = 0,
158 },{
159 .id = V4L2_CID_CONTRAST,
160 .type = V4L2_CTRL_TYPE_INTEGER,
161 .name = "Contrast",
162 .minimum = 0x0,
163 .maximum = 0x1f,
164 .step = 0x1,
165 .default_value = 0x10,
166 .flags = 0,
167 },{
168 .id = V4L2_CID_SATURATION,
169 .type = V4L2_CTRL_TYPE_INTEGER,
170 .name = "Saturation",
171 .minimum = 0x0,
172 .maximum = 0x1f,
173 .step = 0x1,
174 .default_value = 0x10,
175 .flags = 0,
176 },{
177 .id = V4L2_CID_RED_BALANCE,
178 .type = V4L2_CTRL_TYPE_INTEGER,
179 .name = "Red chroma balance",
180 .minimum = -128,
181 .maximum = 127,
182 .step = 1,
183 .default_value = 0,
184 .flags = 0,
185 },{
186 .id = V4L2_CID_BLUE_BALANCE,
187 .type = V4L2_CTRL_TYPE_INTEGER,
188 .name = "Blue chroma balance",
189 .minimum = -128,
190 .maximum = 127,
191 .step = 1,
192 .default_value = 0,
193 .flags = 0,
194 },{
195 .id = V4L2_CID_GAMMA,
196 .type = V4L2_CTRL_TYPE_INTEGER,
197 .name = "Gamma",
198 .minimum = 0x0,
199 .maximum = 0x3f,
200 .step = 0x1,
201 .default_value = 0x20,
202 .flags = 0,
203 }
204};
205
206static struct usb_driver em28xx_usb_driver; 130static struct usb_driver em28xx_usb_driver;
207 131
208static DEFINE_MUTEX(em28xx_sysfs_lock); 132static DEFINE_MUTEX(em28xx_sysfs_lock);
@@ -245,22 +169,9 @@ static int em28xx_config(struct em28xx *dev)
245static void em28xx_config_i2c(struct em28xx *dev) 169static void em28xx_config_i2c(struct em28xx *dev)
246{ 170{
247 struct v4l2_frequency f; 171 struct v4l2_frequency f;
248 struct video_decoder_init em28xx_vdi = {.data = NULL }; 172 em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
249 173 em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &dev->ctl_input);
250 174 em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
251 /* configure decoder */
252 if(dev->model == EM2820_BOARD_MSI_VOX_USB_2){
253 em28xx_vdi.data=saa7114_i2c_init;
254 em28xx_vdi.len=sizeof(saa7114_i2c_init);
255 }
256
257
258 em28xx_i2c_call_clients(dev, DECODER_INIT, &em28xx_vdi);
259 em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &dev->ctl_input);
260/* em28xx_i2c_call_clients(dev,DECODER_SET_PICTURE, &dev->vpic); */
261/* em28xx_i2c_call_clients(dev,DECODER_SET_NORM,&dev->tvnorm->id); */
262/* em28xx_i2c_call_clients(dev,DECODER_ENABLE_OUTPUT,&output); */
263/* em28xx_i2c_call_clients(dev,DECODER_DUMP, NULL); */
264 175
265 /* configure tuner */ 176 /* configure tuner */
266 f.tuner = 0; 177 f.tuner = 0;
@@ -300,8 +211,7 @@ static void video_mux(struct em28xx *dev, int index)
300 dev->ctl_input = index; 211 dev->ctl_input = index;
301 dev->ctl_ainput = INPUT(index)->amux; 212 dev->ctl_ainput = INPUT(index)->amux;
302 213
303 em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &input); 214 em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &input);
304
305 215
306 em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput); 216 em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
307 217
@@ -747,43 +657,6 @@ static int em28xx_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
747 } 657 }
748} 658}
749 659
750/*FIXME: should be moved to saa711x */
751static int saa711x_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
752{
753 s32 tmp;
754 switch (ctrl->id) {
755 case V4L2_CID_BRIGHTNESS:
756 if ((tmp = em28xx_brightness_get(dev)) < 0)
757 return -EIO;
758 ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
759 return 0;
760 case V4L2_CID_CONTRAST:
761 if ((ctrl->value = em28xx_contrast_get(dev)) < 0)
762 return -EIO;
763 return 0;
764 case V4L2_CID_SATURATION:
765 if ((ctrl->value = em28xx_saturation_get(dev)) < 0)
766 return -EIO;
767 return 0;
768 case V4L2_CID_RED_BALANCE:
769 if ((tmp = em28xx_v_balance_get(dev)) < 0)
770 return -EIO;
771 ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
772 return 0;
773 case V4L2_CID_BLUE_BALANCE:
774 if ((tmp = em28xx_u_balance_get(dev)) < 0)
775 return -EIO;
776 ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
777 return 0;
778 case V4L2_CID_GAMMA:
779 if ((ctrl->value = em28xx_gamma_get(dev)) < 0)
780 return -EIO;
781 return 0;
782 default:
783 return -EINVAL;
784 }
785}
786
787/* 660/*
788 * em28xx_set_ctrl() 661 * em28xx_set_ctrl()
789 * mute or set new saturation, brightness or contrast 662 * mute or set new saturation, brightness or contrast
@@ -806,27 +679,6 @@ static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
806 } 679 }
807} 680}
808 681
809/*FIXME: should be moved to saa711x */
810static int saa711x_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
811{
812 switch (ctrl->id) {
813 case V4L2_CID_BRIGHTNESS:
814 return em28xx_brightness_set(dev, ctrl->value);
815 case V4L2_CID_CONTRAST:
816 return em28xx_contrast_set(dev, ctrl->value);
817 case V4L2_CID_SATURATION:
818 return em28xx_saturation_set(dev, ctrl->value);
819 case V4L2_CID_RED_BALANCE:
820 return em28xx_v_balance_set(dev, ctrl->value);
821 case V4L2_CID_BLUE_BALANCE:
822 return em28xx_u_balance_set(dev, ctrl->value);
823 case V4L2_CID_GAMMA:
824 return em28xx_gamma_set(dev, ctrl->value);
825 default:
826 return -EINVAL;
827 }
828}
829
830/* 682/*
831 * em28xx_stream_interrupt() 683 * em28xx_stream_interrupt()
832 * stops streaming 684 * stops streaming
@@ -1130,8 +982,6 @@ static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
1130 982
1131 em28xx_set_norm(dev, dev->width, dev->height); 983 em28xx_set_norm(dev, dev->width, dev->height);
1132 984
1133 em28xx_i2c_call_clients(dev, DECODER_SET_NORM,
1134 &tvnorms[i].mode);
1135 em28xx_i2c_call_clients(dev, VIDIOC_S_STD, 985 em28xx_i2c_call_clients(dev, VIDIOC_S_STD,
1136 &dev->tvnorm->id); 986 &dev->tvnorm->id);
1137 987
@@ -1242,22 +1092,11 @@ static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
1242 } 1092 }
1243 } 1093 }
1244 } 1094 }
1245 if (dev->decoder == EM28XX_TVP5150) { 1095 em28xx_i2c_call_clients(dev,cmd,qc);
1246 em28xx_i2c_call_clients(dev,cmd,qc); 1096 if (qc->type)
1247 if (qc->type) 1097 return 0;
1248 return 0; 1098 else
1249 else 1099 return -EINVAL;
1250 return -EINVAL;
1251 }
1252 for (i = 0; i < ARRAY_SIZE(saa711x_qctrl); i++) {
1253 if (qc->id && qc->id == saa711x_qctrl[i].id) {
1254 memcpy(qc, &(saa711x_qctrl[i]),
1255 sizeof(*qc));
1256 return 0;
1257 }
1258 }
1259
1260 return -EINVAL;
1261 } 1100 }
1262 case VIDIOC_G_CTRL: 1101 case VIDIOC_G_CTRL:
1263 { 1102 {
@@ -1267,12 +1106,8 @@ static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
1267 if (!dev->has_msp34xx) 1106 if (!dev->has_msp34xx)
1268 retval=em28xx_get_ctrl(dev, ctrl); 1107 retval=em28xx_get_ctrl(dev, ctrl);
1269 if (retval==-EINVAL) { 1108 if (retval==-EINVAL) {
1270 if (dev->decoder == EM28XX_TVP5150) { 1109 em28xx_i2c_call_clients(dev,cmd,arg);
1271 em28xx_i2c_call_clients(dev,cmd,arg); 1110 return 0;
1272 return 0;
1273 }
1274
1275 return saa711x_get_ctrl(dev, ctrl);
1276 } else return retval; 1111 } else return retval;
1277 } 1112 }
1278 case VIDIOC_S_CTRL: 1113 case VIDIOC_S_CTRL:
@@ -1293,33 +1128,8 @@ static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
1293 } 1128 }
1294 } 1129 }
1295 1130
1296 if (dev->decoder == EM28XX_TVP5150) { 1131 em28xx_i2c_call_clients(dev,cmd,arg);
1297 em28xx_i2c_call_clients(dev,cmd,arg); 1132 return 0;
1298 return 0;
1299 } else if (!dev->has_msp34xx) {
1300 for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
1301 if (ctrl->id == em28xx_qctrl[i].id) {
1302 if (ctrl->value <
1303 em28xx_qctrl[i].minimum
1304 || ctrl->value >
1305 em28xx_qctrl[i].maximum)
1306 return -ERANGE;
1307 return em28xx_set_ctrl(dev, ctrl);
1308 }
1309 }
1310 for (i = 0; i < ARRAY_SIZE(saa711x_qctrl); i++) {
1311 if (ctrl->id == saa711x_qctrl[i].id) {
1312 if (ctrl->value <
1313 saa711x_qctrl[i].minimum
1314 || ctrl->value >
1315 saa711x_qctrl[i].maximum)
1316 return -ERANGE;
1317 return saa711x_set_ctrl(dev, ctrl);
1318 }
1319 }
1320 }
1321
1322 return -EINVAL;
1323 } 1133 }
1324 /* --- tuner ioctls ------------------------------------------ */ 1134 /* --- tuner ioctls ------------------------------------------ */
1325 case VIDIOC_G_TUNER: 1135 case VIDIOC_G_TUNER:
@@ -1772,7 +1582,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
1772#ifdef CONFIG_MODULES 1582#ifdef CONFIG_MODULES
1773 /* request some modules */ 1583 /* request some modules */
1774 if (dev->decoder == EM28XX_SAA7113 || dev->decoder == EM28XX_SAA7114) 1584 if (dev->decoder == EM28XX_SAA7113 || dev->decoder == EM28XX_SAA7114)
1775 request_module("saa711x"); 1585 request_module("saa7115");
1776 if (dev->decoder == EM28XX_TVP5150) 1586 if (dev->decoder == EM28XX_TVP5150)
1777 request_module("tvp5150"); 1587 request_module("tvp5150");
1778 if (dev->has_tuner) 1588 if (dev->has_tuner)
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index f0eb9851bf5..7050d81c024 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1,4 +1,4 @@
1/* saa7115 - Philips SAA7114/SAA7115 video decoder driver 1/* saa7115 - Philips SAA7113/SAA7114/SAA7115 video decoder driver
2 * 2 *
3 * Based on saa7114 driver by Maxim Yevtyushkin, which is based on 3 * Based on saa7114 driver by Maxim Yevtyushkin, which is based on
4 * the saa7111 driver by Dave Perks. 4 * the saa7111 driver by Dave Perks.
@@ -16,6 +16,7 @@
16 * (2/17/2003) 16 * (2/17/2003)
17 * 17 *
18 * VBI support (2004) and cleanups (2005) by Hans Verkuil <hverkuil@xs4all.nl> 18 * VBI support (2004) and cleanups (2005) by Hans Verkuil <hverkuil@xs4all.nl>
19 * SAA7113 support by Mauro Carvalho Chehab <mchehab@infradead.org>
19 * 20 *
20 * This program is free software; you can redistribute it and/or 21 * This program is free software; you can redistribute it and/or
21 * modify it under the terms of the GNU General Public License 22 * modify it under the terms of the GNU General Public License
@@ -42,8 +43,9 @@
42#include <media/audiochip.h> 43#include <media/audiochip.h>
43#include <asm/div64.h> 44#include <asm/div64.h>
44 45
45MODULE_DESCRIPTION("Philips SAA7114/SAA7115 video decoder driver"); 46MODULE_DESCRIPTION("Philips SAA7113/SAA7114/SAA7115 video decoder driver");
46MODULE_AUTHOR("Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, Hans Verkuil"); 47MODULE_AUTHOR( "Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, "
48 "Hans Verkuil, Mauro Carvalho Chehab");
47MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
48 50
49static int debug = 0; 51static int debug = 0;
@@ -51,7 +53,10 @@ module_param(debug, bool, 0644);
51 53
52MODULE_PARM_DESC(debug, "Debug level (0-1)"); 54MODULE_PARM_DESC(debug, "Debug level (0-1)");
53 55
54static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END }; 56static unsigned short normal_i2c[] = {
57 0x4a >>1, 0x48 >>1, /* SAA7113 */
58 0x42 >> 1, 0x40 >> 1, /* SAA7114 and SAA7115 */
59 I2C_CLIENT_END };
55 60
56 61
57I2C_CLIENT_INSMOD; 62I2C_CLIENT_INSMOD;
@@ -101,10 +106,12 @@ static inline int saa7115_read(struct i2c_client *client, u8 reg)
101 Hauppauge driver sets. */ 106 Hauppauge driver sets. */
102 107
103static const unsigned char saa7115_init_auto_input[] = { 108static const unsigned char saa7115_init_auto_input[] = {
109 /* Front-End Part */
104 0x01, 0x48, /* white peak control disabled */ 110 0x01, 0x48, /* white peak control disabled */
105 0x03, 0x20, /* was 0x30. 0x20: long vertical blanking */ 111 0x03, 0x20, /* was 0x30. 0x20: long vertical blanking */
106 0x04, 0x90, /* analog gain set to 0 */ 112 0x04, 0x90, /* analog gain set to 0 */
107 0x05, 0x90, /* analog gain set to 0 */ 113 0x05, 0x90, /* analog gain set to 0 */
114 /* Decoder Part */
108 0x06, 0xeb, /* horiz sync begin = -21 */ 115 0x06, 0xeb, /* horiz sync begin = -21 */
109 0x07, 0xe0, /* horiz sync stop = -17 */ 116 0x07, 0xe0, /* horiz sync stop = -17 */
110 0x0a, 0x80, /* was 0x88. decoder brightness, 0x80 is itu standard */ 117 0x0a, 0x80, /* was 0x88. decoder brightness, 0x80 is itu standard */
@@ -123,6 +130,8 @@ static const unsigned char saa7115_init_auto_input[] = {
123 0x1b, 0x42, /* misc chroma control 0x42 = recommended */ 130 0x1b, 0x42, /* misc chroma control 0x42 = recommended */
124 0x1c, 0xa9, /* combfilter control 0xA9 = recommended */ 131 0x1c, 0xa9, /* combfilter control 0xA9 = recommended */
125 0x1d, 0x01, /* combfilter control 0x01 = recommended */ 132 0x1d, 0x01, /* combfilter control 0x01 = recommended */
133
134 /* Power Device Control */
126 0x88, 0xd0, /* reset device */ 135 0x88, 0xd0, /* reset device */
127 0x88, 0xf0, /* set device programmed, all in operational mode */ 136 0x88, 0xf0, /* set device programmed, all in operational mode */
128 0x00, 0x00 137 0x00, 0x00
@@ -338,6 +347,33 @@ static const unsigned char saa7115_cfg_vbi_off[] = {
338 0x00, 0x00 347 0x00, 0x00
339}; 348};
340 349
350static const unsigned char saa7113_init_auto_input[] = {
351 0x01, 0x08, /* PH7113_INCREMENT_DELAY - (1) (1) (1) (1) IDEL3 IDEL2 IDELL1 IDEL0 */
352 0x02, 0xc2, /* PH7113_ANALOG_INPUT_CONTR_1 - FUSE1 FUSE0 GUDL1 GUDL0 MODE3 MODE2 MODE1 MODE0 */
353 0x03, 0x30, /* PH7113_ANALOG_INPUT_CONTR_2 - (1) HLNRS VBSL WPOFF HOLDG GAFIX GAI28 GAI18 */
354 0x04, 0x00, /* PH7113_ANALOG_INPUT_CONTR_3 - GAI17 GAI16 GAI15 GAI14 GAI13 GAI12 GAI11 GAI10 */
355 0x05, 0x00, /* PH7113_ANALOG_INPUT_CONTR_4 - GAI27 GAI26 GAI25 GAI24 GAI23 GAI22 GAI21 GAI20 */
356 0x06, 0x89, /* PH7113_HORIZONTAL_SYNC_START - HSB7 HSB6 HSB5 HSB4 HSB3 HSB2 HSB1 HSB0 */
357 0x07, 0x0d, /* PH7113_HORIZONTAL_SYNC_STOP - HSS7 HSS6 HSS5 HSS4 HSS3 HSS2 HSS1 HSS0 */
358 0x08, 0x88, /* PH7113_SYNC_CONTROL - AUFD FSEL FOET HTC1 HTC0 HPLL VNOI1 VNOI0 */
359 0x09, 0x01, /* PH7113_LUMINANCE_CONTROL - BYPS PREF BPSS1 BPSS0 VBLB UPTCV APER1 APER0 */
360 0x0a, 0x80, /* PH7113_LUMINANCE_BRIGHTNESS - BRIG7 BRIG6 BRIG5 BRIG4 BRIG3 BRIG2 BRIG1 BRIG0 */
361 0x0b, 0x47, /* PH7113_LUMINANCE_CONTRAST - CONT7 CONT6 CONT5 CONT4 CONT3 CONT2 CONT1 CONT0 */
362 0x0c, 0x40, /* PH7113_CHROMA_SATURATION - SATN7 SATN6 SATN5 SATN4 SATN3 SATN2 SATN1 SATN0 */
363 0x0d, 0x00, /* PH7113_CHROMA_HUE_CONTROL - HUEC7 HUEC6 HUEC5 HUEC4 HUEC3 HUEC2 HUEC1 HUEC0 */
364 0x0e, 0x01, /* PH7113_CHROMA_CONTROL - CDTO CSTD2 CSTD1 CSTD0 DCCF FCTC CHBW1 CHBW0 */
365 0x0f, 0x2a, /* PH7113_CHROMA_GAIN_CONTROL - ACGC CGAIN6 CGAIN5 CGAIN4 CGAIN3 CGAIN2 CGAIN1 CGAIN0 */
366 0x10, 0x08, /* PH7113_FORMAT_DELAY_CONTROL - OFTS1 OFTS0 HDEL1 HDEL0 VRLN YDEL2 YDEL1 YDEL0 */
367 0x11, 0x0c, /* PH7113_OUTPUT_CONTROL_1 - GPSW1 CM99 GPSW0 HLSEL OEYC OERT VIPB COLO */
368 0x12, 0x07, /* PH7113_OUTPUT_CONTROL_2 - RTSE13 RTSE12 RTSE11 RTSE10 RTSE03 RTSE02 RTSE01 RTSE00 */
369 0x13, 0x00, /* PH7113_OUTPUT_CONTROL_3 - ADLSB (1) (1) OLDSB FIDP (1) AOSL1 AOSL0 */
370 0x14, 0x00, /* RESERVED 14 - (1) (1) (1) (1) (1) (1) (1) (1) */
371 0x15, 0x00, /* PH7113_V_GATE1_START - VSTA7 VSTA6 VSTA5 VSTA4 VSTA3 VSTA2 VSTA1 VSTA0 */
372 0x16, 0x00, /* PH7113_V_GATE1_STOP - VSTO7 VSTO6 VSTO5 VSTO4 VSTO3 VSTO2 VSTO1 VSTO0 */
373 0x17, 0x00, /* PH7113_V_GATE1_MSB - (1) (1) (1) (1) (1) (1) VSTO8 VSTA8 */
374 0x00, 0x00
375};
376
341static const unsigned char saa7115_init_misc[] = { 377static const unsigned char saa7115_init_misc[] = {
342 0x38, 0x03, /* audio stuff */ 378 0x38, 0x03, /* audio stuff */
343 0x39, 0x10, 379 0x39, 0x10,
@@ -680,7 +716,7 @@ static void saa7115_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
680 state->std = std; 716 state->std = std;
681 717
682 /* restart task B if needed */ 718 /* restart task B if needed */
683 if (taskb && state->ident == V4L2_IDENT_SAA7114) { 719 if (taskb && state->ident != V4L2_IDENT_SAA7115) {
684 saa7115_writeregs(client, saa7115_cfg_vbi_on); 720 saa7115_writeregs(client, saa7115_cfg_vbi_on);
685 } 721 }
686 722
@@ -703,7 +739,7 @@ static void saa7115_log_status(struct i2c_client *client)
703 int vcr; 739 int vcr;
704 740
705 v4l_info(client, "Audio frequency: %d Hz\n", state->audclk_freq); 741 v4l_info(client, "Audio frequency: %d Hz\n", state->audclk_freq);
706 if (client->name[6] == '4') { 742 if (state->ident != V4L2_IDENT_SAA7115) {
707 /* status for the saa7114 */ 743 /* status for the saa7114 */
708 reg1f = saa7115_read(client, 0x1f); 744 reg1f = saa7115_read(client, 0x1f);
709 signalOk = (reg1f & 0xc1) == 0x81; 745 signalOk = (reg1f & 0xc1) == 0x81;
@@ -751,8 +787,8 @@ static void saa7115_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo
751 u8 lcr[24]; 787 u8 lcr[24];
752 int i, x; 788 int i, x;
753 789
754 /* saa7114 doesn't yet support VBI */ 790 /* saa7113/71144 doesn't yet support VBI */
755 if (state->ident == V4L2_IDENT_SAA7114) 791 if (state->ident != V4L2_IDENT_SAA7115)
756 return; 792 return;
757 793
758 for (i = 0; i <= 23; i++) 794 for (i = 0; i <= 23; i++)
@@ -1261,14 +1297,12 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)
1261 1297
1262 saa7115_write(client, 0, 5); 1298 saa7115_write(client, 0, 5);
1263 chip_id = saa7115_read(client, 0) & 0x0f; 1299 chip_id = saa7115_read(client, 0) & 0x0f;
1264 if (chip_id != 4 && chip_id != 5) { 1300 if (chip_id <3 && chip_id > 5) {
1265 v4l_dbg(1, debug, client, "saa7115 not found\n"); 1301 v4l_dbg(1, debug, client, "saa7115 not found\n");
1266 kfree(client); 1302 kfree(client);
1267 return 0; 1303 return 0;
1268 } 1304 }
1269 if (chip_id == 4) { 1305 snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id);
1270 snprintf(client->name, sizeof(client->name) - 1, "saa7114");
1271 }
1272 v4l_info(client, "saa711%d found @ 0x%x (%s)\n", chip_id, address << 1, adapter->name); 1306 v4l_info(client, "saa711%d found @ 0x%x (%s)\n", chip_id, address << 1, adapter->name);
1273 1307
1274 state = kzalloc(sizeof(struct saa7115_state), GFP_KERNEL); 1308 state = kzalloc(sizeof(struct saa7115_state), GFP_KERNEL);
@@ -1285,13 +1319,27 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)
1285 state->contrast = 64; 1319 state->contrast = 64;
1286 state->hue = 0; 1320 state->hue = 0;
1287 state->sat = 64; 1321 state->sat = 64;
1288 state->ident = (chip_id == 4) ? V4L2_IDENT_SAA7114 : V4L2_IDENT_SAA7115; 1322 switch (chip_id) {
1323 case 3:
1324 state->ident = V4L2_IDENT_SAA7113;
1325 break;
1326 case 4:
1327 state->ident = V4L2_IDENT_SAA7114;
1328 break;
1329 default:
1330 state->ident = V4L2_IDENT_SAA7115;
1331 break;
1332 }
1333
1289 state->audclk_freq = 48000; 1334 state->audclk_freq = 48000;
1290 1335
1291 v4l_dbg(1, debug, client, "writing init values\n"); 1336 v4l_dbg(1, debug, client, "writing init values\n");
1292 1337
1293 /* init to 60hz/48khz */ 1338 /* init to 60hz/48khz */
1294 saa7115_writeregs(client, saa7115_init_auto_input); 1339 if (state->ident==V4L2_IDENT_SAA7113)
1340 saa7115_writeregs(client, saa7113_init_auto_input);
1341 else
1342 saa7115_writeregs(client, saa7115_init_auto_input);
1295 saa7115_writeregs(client, saa7115_init_misc); 1343 saa7115_writeregs(client, saa7115_init_misc);
1296 saa7115_writeregs(client, saa7115_cfg_60hz_fullres_x); 1344 saa7115_writeregs(client, saa7115_cfg_60hz_fullres_x);
1297 saa7115_writeregs(client, saa7115_cfg_60hz_fullres_y); 1345 saa7115_writeregs(client, saa7115_cfg_60hz_fullres_y);
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index c44741e78f2..2360453e749 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -103,6 +103,7 @@ enum v4l2_chip_ident {
103 V4L2_IDENT_UNKNOWN = 0, 103 V4L2_IDENT_UNKNOWN = 0,
104 104
105 /* module saa7115: reserved range 100-149 */ 105 /* module saa7115: reserved range 100-149 */
106 V4L2_IDENT_SAA7113 = 103,
106 V4L2_IDENT_SAA7114 = 104, 107 V4L2_IDENT_SAA7114 = 104,
107 V4L2_IDENT_SAA7115 = 105, 108 V4L2_IDENT_SAA7115 = 105,
108 109
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 05:08:19 -0500