Merge branch 'neuros' of...

Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros

drivers/media/video/tvp5150.c

@@ -834,28 +834,25 @@ static int tvp5150_get_ctrl(struct i2c_client *c, struct v4l2_control *ctrl)
 
 static int tvp5150_get_std(struct i2c_client *c, v4l2_std_id *id)
 {
-	int fmt = tvp5150_read(c, TVP5150_VIDEO_STD);
+	int fmt = tvp5150_read(c, TVP5150_STATUS_REG_5);
 	fmt &= 0x0F;
 	switch (fmt) {
-	case 0x00:
-		*id = V4L2_STD_ALL;
-		break;
-	case 0x02:
+	case 0x01:
 		*id = V4L2_STD_NTSC;
 		break;
-	case 0x04:
+	case 0x03:
 		*id = V4L2_STD_PAL;
 		break;
-	case 0x06:
+	case 0x05:
 		*id = V4L2_STD_PAL_M;
 		break;
-	case 0x08:
+	case 0x07:
 		*id = V4L2_STD_PAL_N | V4L2_STD_PAL_Nc;
 		break;
-	case 0x0A:
+	case 0x09:
 		*id = V4L2_STD_NTSC_443;
 		break;
-	case 0x0C:
+	case 0x0b:
 		*id = V4L2_STD_SECAM;
 		break;
 	default:

include/media/davinci_vpfe.h

@@ -41,8 +41,7 @@
 #define VPFE_CMD_CAPTURE_ACTIVE _IOW('V', BASE_VIDIOC_PRIVATE + 4, long int)
 
 #define    VPFE_AMUX_COMPOSITE  0
-#define    VPFE_AMUX_SVIDEO     1
-#define    VPFE_AMUX_COMPONENT     2
+#define    VPFE_AMUX_COMPONENT	1
 
 /* settings for commonly used video formats */
 #define VPFE_WIN_NTSC    {0,0,720,480}
@@ -54,9 +53,8 @@
 #define VPFE_WIN_QVGA    {0,0,320,240}
 #define VPFE_WIN_SIF     {0,0,352,240}
 
-#define VPFE_CAPTURE_ID_TVP5146		0
-#define VPFE_CAPTURE_ID_TVP5150		1
-#define VPFE_CAPTURE_ID_TVP7000		2
+#define VPFE_CAPTURE_ID_TVP5150		0
+#define VPFE_CAPTURE_ID_TVP7000		1
 
 
 #ifdef __KERNEL__