[PATCH] v4l: 675: tvp5150 included on makefile

- Tvp5150 included on makefile.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/media/video/tvp5150.c

@@ -9,16 +9,17 @@
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <linux/delay.h>
+#include <linux/video_decoder.h>
 
 #include "tvp5150_reg.h"
 
-MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");/* standard i2c insmod options */
+MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");	/* standard i2c insmod options */
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = {
-	0xb8 >>1,
-	0xba >>1,
+	0xb8 >> 1,
+	0xba >> 1,
 	I2C_CLIENT_END
 };
 
@@ -36,228 +37,519 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 struct tvp5150 {
 	struct i2c_client *client;
+
+	int norm;
+	int input;
+	int enable;
+	int bright;
+	int contrast;
+	int hue;
+	int sat;
 };
 
-static inline int tvp5150_read(struct i2c_client *c,unsigned char addr)
+static inline int tvp5150_read(struct i2c_client *c, unsigned char addr)
 {
 	unsigned char buffer[1];
 	int rc;
-/*	struct tvp5150 *core = i2c_get_clientdata(c); */
 
 	buffer[0] = addr;
 	if (1 != (rc = i2c_master_send(c, buffer, 1)))
-		dprintk(0,"i2c i/o error: rc == %d (should be 1)\n", rc);
+		dprintk(0, "i2c i/o error: rc == %d (should be 1)\n", rc);
 
 	msleep(10);
 
 	if (1 != (rc = i2c_master_recv(c, buffer, 1)))
-		dprintk(0,"i2c i/o error: rc == %d (should be 1)\n", rc);
+		dprintk(0, "i2c i/o error: rc == %d (should be 1)\n", rc);
 
 	return (buffer[0]);
 }
 
-static inline void tvp5150_write(struct i2c_client *c,unsigned char addr, unsigned char value)
+static inline void tvp5150_write(struct i2c_client *c, unsigned char addr,
+				 unsigned char value)
 {
 	unsigned char buffer[2];
 	int rc;
 /*	struct tvp5150 *core = i2c_get_clientdata(c); */
 
 	buffer[0] = addr;
-	buffer[2] = addr;
+	buffer[1] = value;
+	dprintk(1,"tvp5150: writing 0x%02x 0x%02x\n",buffer[0],buffer[1]);
 	if (2 != (rc = i2c_master_send(c, buffer, 2)))
-		dprintk(0,"i2c i/o error: rc == %d (should be 2)\n", rc);
+		dprintk(0, "i2c i/o error: rc == %d (should be 2)\n", rc);
 }
 
-static void dump_reg (struct i2c_client *c)
+static void dump_reg(struct i2c_client *c)
 {
-	dprintk (2, "tvp5150: Video input source selection #1 = 0x%02x\n", tvp5150_read(c,TVP5150_VD_IN_SRC_SEL_1));
-	dprintk (2, "tvp5150: Analog channel controls = 0x%02x\n", tvp5150_read(c,TVP5150_ANAL_CHL_CTL));
-	dprintk (2, "tvp5150: Operation mode controls = 0x%02x\n", tvp5150_read(c,TVP5150_OP_MODE_CTL));
-	dprintk (2, "tvp5150: Miscellaneous controls = 0x%02x\n", tvp5150_read(c,TVP5150_MISC_CTL));
-	dprintk (2, "tvp5150: Autoswitch mask: TVP5150A / TVP5150AM = 0x%02x\n", tvp5150_read(c,TVP5150_AUTOSW_MSK));
-	dprintk (2, "tvp5150: Color killer threshold control = 0x%02x\n", tvp5150_read(c,TVP5150_COLOR_KIL_THSH_CTL));
-	dprintk (2, "tvp5150: Luminance processing control #1 = 0x%02x\n", tvp5150_read(c,TVP5150_LUMA_PROC_CTL_1));
-	dprintk (2, "tvp5150: Luminance processing control #2 = 0x%02x\n", tvp5150_read(c,TVP5150_LUMA_PROC_CTL_2));
-	dprintk (2, "tvp5150: Brightness control = 0x%02x\n", tvp5150_read(c,TVP5150_BRIGHT_CTL));
-	dprintk (2, "tvp5150: Color saturation control = 0x%02x\n", tvp5150_read(c,TVP5150_SATURATION_CTL));
-	dprintk (2, "tvp5150: Hue control = 0x%02x\n", tvp5150_read(c,TVP5150_HUE_CTL));
-	dprintk (2, "tvp5150: Contrast control = 0x%02x\n", tvp5150_read(c,TVP5150_CONTRAST_CTL));
-	dprintk (2, "tvp5150: Outputs and data rates select = 0x%02x\n", tvp5150_read(c,TVP5150_DATA_RATE_SEL));
-	dprintk (2, "tvp5150: Luminance processing control #3 = 0x%02x\n", tvp5150_read(c,TVP5150_LUMA_PROC_CTL_3));
-	dprintk (2, "tvp5150: Configuration shared pins = 0x%02x\n", tvp5150_read(c,TVP5150_CONF_SHARED_PIN));
-	dprintk (2, "tvp5150: Active video cropping start MSB = 0x%02x\n", tvp5150_read(c,TVP5150_ACT_VD_CROP_ST_MSB));
-	dprintk (2, "tvp5150: Active video cropping start LSB = 0x%02x\n", tvp5150_read(c,TVP5150_ACT_VD_CROP_ST_LSB));
-	dprintk (2, "tvp5150: Active video cropping stop MSB = 0x%02x\n", tvp5150_read(c,TVP5150_ACT_VD_CROP_STP_MSB));
-	dprintk (2, "tvp5150: Active video cropping stop LSB = 0x%02x\n", tvp5150_read(c,TVP5150_ACT_VD_CROP_STP_LSB));
-	dprintk (2, "tvp5150: Genlock/RTC = 0x%02x\n", tvp5150_read(c,TVP5150_GENLOCK));
-	dprintk (2, "tvp5150: Horizontal sync start = 0x%02x\n", tvp5150_read(c,TVP5150_HORIZ_SYNC_START));
-	dprintk (2, "tvp5150: Vertical blanking start = 0x%02x\n", tvp5150_read(c,TVP5150_VERT_BLANKING_START));
-	dprintk (2, "tvp5150: Vertical blanking stop = 0x%02x\n", tvp5150_read(c,TVP5150_VERT_BLANKING_STOP));
-	dprintk (2, "tvp5150: Chrominance processing control #1 = 0x%02x\n", tvp5150_read(c,TVP5150_CHROMA_PROC_CTL_1));
-	dprintk (2, "tvp5150: Chrominance processing control #2 = 0x%02x\n", tvp5150_read(c,TVP5150_CHROMA_PROC_CTL_2));
-	dprintk (2, "tvp5150: Interrupt reset register B = 0x%02x\n", tvp5150_read(c,TVP5150_INT_RESET_REG_B));
-	dprintk (2, "tvp5150: Interrupt enable register B = 0x%02x\n", tvp5150_read(c,TVP5150_INT_ENABLE_REG_B));
-	dprintk (2, "tvp5150: Interrupt configuration register B = 0x%02x\n", tvp5150_read(c,TVP5150_INTT_CONFIG_REG_B));
-	dprintk (2, "tvp5150: Video standard = 0x%02x\n", tvp5150_read(c,TVP5150_VIDEO_STD));
-	dprintk (2, "tvp5150: Cb gain factor = 0x%02x\n", tvp5150_read(c,TVP5150_CB_GAIN_FACT));
-	dprintk (2, "tvp5150: Cr gain factor = 0x%02x\n", tvp5150_read(c,TVP5150_CR_GAIN_FACTOR));
-	dprintk (2, "tvp5150: Macrovision on counter = 0x%02x\n", tvp5150_read(c,TVP5150_MACROVISION_ON_CTR));
-	dprintk (2, "tvp5150: Macrovision off counter = 0x%02x\n", tvp5150_read(c,TVP5150_MACROVISION_OFF_CTR));
-	dprintk (2, "tvp5150: revision select (TVP5150AM1 only) = 0x%02x\n", tvp5150_read(c,TVP5150_REV_SELECT));
-	dprintk (2, "tvp5150: MSB of device ID = 0x%02x\n", tvp5150_read(c,TVP5150_MSB_DEV_ID));
-	dprintk (2, "tvp5150: LSB of device ID = 0x%02x\n", tvp5150_read(c,TVP5150_LSB_DEV_ID));
-	dprintk (2, "tvp5150: ROM major version = 0x%02x\n", tvp5150_read(c,TVP5150_ROM_MAJOR_VER));
-	dprintk (2, "tvp5150: ROM minor version = 0x%02x\n", tvp5150_read(c,TVP5150_ROM_MINOR_VER));
-	dprintk (2, "tvp5150: Vertical line count MSB = 0x%02x\n", tvp5150_read(c,TVP5150_VERT_LN_COUNT_MSB));
-	dprintk (2, "tvp5150: Vertical line count LSB = 0x%02x\n", tvp5150_read(c,TVP5150_VERT_LN_COUNT_LSB));
-	dprintk (2, "tvp5150: Interrupt status register B = 0x%02x\n", tvp5150_read(c,TVP5150_INT_STATUS_REG_B));
-	dprintk (2, "tvp5150: Interrupt active register B = 0x%02x\n", tvp5150_read(c,TVP5150_INT_ACTIVE_REG_B));
-	dprintk (2, "tvp5150: Status register #1 = 0x%02x\n", tvp5150_read(c,TVP5150_STATUS_REG_1));
-	dprintk (2, "tvp5150: Status register #2 = 0x%02x\n", tvp5150_read(c,TVP5150_STATUS_REG_2));
-	dprintk (2, "tvp5150: Status register #3 = 0x%02x\n", tvp5150_read(c,TVP5150_STATUS_REG_3));
-	dprintk (2, "tvp5150: Status register #4 = 0x%02x\n", tvp5150_read(c,TVP5150_STATUS_REG_4));
-	dprintk (2, "tvp5150: Status register #5 = 0x%02x\n", tvp5150_read(c,TVP5150_STATUS_REG_5));
-	dprintk (2, "tvp5150: Closed caption data registers = 0x%02x\n", tvp5150_read(c,TVP5150_CC_DATA_REG1));
-	dprintk (2, "tvp5150: Closed caption data registers = 0x%02x\n", tvp5150_read(c,TVP5150_CC_DATA_REG2));
-	dprintk (2, "tvp5150: Closed caption data registers = 0x%02x\n", tvp5150_read(c,TVP5150_CC_DATA_REG3));
-	dprintk (2, "tvp5150: Closed caption data registers = 0x%02x\n", tvp5150_read(c,TVP5150_CC_DATA_REG4));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG1));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG2));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG3));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG4));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG5));
-	dprintk (2, "tvp5150: WSS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_WSS_DATA_REG6));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG1));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG2));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG3));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG4));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG5));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG6));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG7));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG8));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG9));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG10));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG11));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG12));
-	dprintk (2, "tvp5150: VPS data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VPS_DATA_REG13));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG1));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG2));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG3));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG4));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG5));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG6));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG7));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG8));
-	dprintk (2, "tvp5150: VITC data registers = 0x%02x\n", tvp5150_read(c,TVP5150_VITC_DATA_REG9));
-	dprintk (2, "tvp5150: VBI FIFO read data = 0x%02x\n", tvp5150_read(c,TVP5150_VBI_FIFO_READ_DATA));
-	dprintk (2, "tvp5150: Teletext filter 1 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_1_1));
-	dprintk (2, "tvp5150: Teletext filter 1 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_1_2));
-	dprintk (2, "tvp5150: Teletext filter 1 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_1_3));
-	dprintk (2, "tvp5150: Teletext filter 1 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_1_4));
-	dprintk (2, "tvp5150: Teletext filter 1 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_1_5));
-	dprintk (2, "tvp5150: Teletext filter 2 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_2_1));
-	dprintk (2, "tvp5150: Teletext filter 2 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_2_2));
-	dprintk (2, "tvp5150: Teletext filter 2 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_2_3));
-	dprintk (2, "tvp5150: Teletext filter 2 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_2_4));
-	dprintk (2, "tvp5150: Teletext filter 2 = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_2_5));
-	dprintk (2, "tvp5150: Teletext filter enable = 0x%02x\n", tvp5150_read(c,TVP5150_TELETEXT_FIL_ENA));
-	dprintk (2, "tvp5150: Interrupt status register A = 0x%02x\n", tvp5150_read(c,TVP5150_INT_STATUS_REG_A));
-	dprintk (2, "tvp5150: Interrupt enable register A = 0x%02x\n", tvp5150_read(c,TVP5150_INT_ENABLE_REG_A));
-	dprintk (2, "tvp5150: Interrupt configuration = 0x%02x\n", tvp5150_read(c,TVP5150_INT_CONF));
-	dprintk (2, "tvp5150: VDP configuration RAM data = 0x%02x\n", tvp5150_read(c,TVP5150_VDP_CONF_RAM_DATA));
-	dprintk (2, "tvp5150: Configuration RAM address low byte = 0x%02x\n", tvp5150_read(c,TVP5150_CONF_RAM_ADDR_LOW));
-	dprintk (2, "tvp5150: Configuration RAM address high byte = 0x%02x\n", tvp5150_read(c,TVP5150_CONF_RAM_ADDR_HIGH));
-	dprintk (2, "tvp5150: VDP status register = 0x%02x\n", tvp5150_read(c,TVP5150_VDP_STATUS_REG));
-	dprintk (2, "tvp5150: FIFO word count = 0x%02x\n", tvp5150_read(c,TVP5150_FIFO_WORD_COUNT));
-	dprintk (2, "tvp5150: FIFO interrupt threshold = 0x%02x\n", tvp5150_read(c,TVP5150_FIFO_INT_THRESHOLD));
-	dprintk (2, "tvp5150: FIFO reset = 0x%02x\n", tvp5150_read(c,TVP5150_FIFO_RESET));
-	dprintk (2, "tvp5150: Line number interrupt = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_NUMBER_INT));
-	dprintk (2, "tvp5150: Pixel alignment register low byte = 0x%02x\n", tvp5150_read(c,TVP5150_PIX_ALIGN_REG_LOW));
-	dprintk (2, "tvp5150: Pixel alignment register high byte = 0x%02x\n", tvp5150_read(c,TVP5150_PIX_ALIGN_REG_HIGH));
-	dprintk (2, "tvp5150: FIFO output control = 0x%02x\n", tvp5150_read(c,TVP5150_FIFO_OUT_CTRL));
-	dprintk (2, "tvp5150: Full field enable 1 = 0x%02x\n", tvp5150_read(c,TVP5150_FULL_FIELD_ENA_1));
-	dprintk (2, "tvp5150: Full field enable 2 = 0x%02x\n", tvp5150_read(c,TVP5150_FULL_FIELD_ENA_2));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_1));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_2));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_3));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_4));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_5));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_6));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_7));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_8));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_9));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_10));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_11));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_12));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_13));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_14));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_15));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_16));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_17));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_18));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_19));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_20));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_21));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_22));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_23));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_24));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_25));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_27));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_28));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_29));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_30));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_31));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_32));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_33));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_34));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_35));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_36));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_37));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_38));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_39));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_40));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_41));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_42));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_43));
-	dprintk (2, "tvp5150: Line mode registers = 0x%02x\n", tvp5150_read(c,TVP5150_LINE_MODE_REG_44));
-	dprintk (2, "tvp5150: Full field mode register = 0x%02x\n", tvp5150_read(c,TVP5150_FULL_FIELD_MODE_REG));
+	printk("tvp5150: Video input source selection #1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VD_IN_SRC_SEL_1));
+	printk("tvp5150: Analog channel controls = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ANAL_CHL_CTL));
+	printk("tvp5150: Operation mode controls = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_OP_MODE_CTL));
+	printk("tvp5150: Miscellaneous controls = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_MISC_CTL));
+	printk("tvp5150: Autoswitch mask: TVP5150A / TVP5150AM = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_AUTOSW_MSK));
+	printk("tvp5150: Color killer threshold control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_COLOR_KIL_THSH_CTL));
+	printk("tvp5150: Luminance processing control #1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LUMA_PROC_CTL_1));
+	printk("tvp5150: Luminance processing control #2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LUMA_PROC_CTL_2));
+	printk("tvp5150: Brightness control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_BRIGHT_CTL));
+	printk("tvp5150: Color saturation control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_SATURATION_CTL));
+	printk("tvp5150: Hue control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_HUE_CTL));
+	printk("tvp5150: Contrast control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CONTRAST_CTL));
+	printk("tvp5150: Outputs and data rates select = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_DATA_RATE_SEL));
+	printk("tvp5150: Luminance processing control #3 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LUMA_PROC_CTL_3));
+	printk("tvp5150: Configuration shared pins = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CONF_SHARED_PIN));
+	printk("tvp5150: Active video cropping start MSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ACT_VD_CROP_ST_MSB));
+	printk("tvp5150: Active video cropping start LSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ACT_VD_CROP_ST_LSB));
+	printk("tvp5150: Active video cropping stop MSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ACT_VD_CROP_STP_MSB));
+	printk("tvp5150: Active video cropping stop LSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ACT_VD_CROP_STP_LSB));
+	printk("tvp5150: Genlock/RTC = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_GENLOCK));
+	printk("tvp5150: Horizontal sync start = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_HORIZ_SYNC_START));
+	printk("tvp5150: Vertical blanking start = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VERT_BLANKING_START));
+	printk("tvp5150: Vertical blanking stop = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VERT_BLANKING_STOP));
+	printk("tvp5150: Chrominance processing control #1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CHROMA_PROC_CTL_1));
+	printk("tvp5150: Chrominance processing control #2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CHROMA_PROC_CTL_2));
+	printk("tvp5150: Interrupt reset register B = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_RESET_REG_B));
+	printk("tvp5150: Interrupt enable register B = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_ENABLE_REG_B));
+	printk("tvp5150: Interrupt configuration register B = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INTT_CONFIG_REG_B));
+	printk("tvp5150: Video standard = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VIDEO_STD));
+	printk("tvp5150: Cb gain factor = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CB_GAIN_FACT));
+	printk("tvp5150: Cr gain factor = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CR_GAIN_FACTOR));
+	printk("tvp5150: Macrovision on counter = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_MACROVISION_ON_CTR));
+	printk("tvp5150: Macrovision off counter = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_MACROVISION_OFF_CTR));
+	printk("tvp5150: revision select (TVP5150AM1 only) = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_REV_SELECT));
+	printk("tvp5150: MSB of device ID = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_MSB_DEV_ID));
+	printk("tvp5150: LSB of device ID = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LSB_DEV_ID));
+	printk("tvp5150: ROM major version = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ROM_MAJOR_VER));
+	printk("tvp5150: ROM minor version = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_ROM_MINOR_VER));
+	printk("tvp5150: Vertical line count MSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VERT_LN_COUNT_MSB));
+	printk("tvp5150: Vertical line count LSB = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VERT_LN_COUNT_LSB));
+	printk("tvp5150: Interrupt status register B = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_STATUS_REG_B));
+	printk("tvp5150: Interrupt active register B = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_ACTIVE_REG_B));
+	printk("tvp5150: Status register #1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_STATUS_REG_1));
+	printk("tvp5150: Status register #2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_STATUS_REG_2));
+	printk("tvp5150: Status register #3 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_STATUS_REG_3));
+	printk("tvp5150: Status register #4 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_STATUS_REG_4));
+	printk("tvp5150: Status register #5 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_STATUS_REG_5));
+	printk("tvp5150: Closed caption data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CC_DATA_REG1));
+	printk("tvp5150: Closed caption data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CC_DATA_REG2));
+	printk("tvp5150: Closed caption data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CC_DATA_REG3));
+	printk("tvp5150: Closed caption data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CC_DATA_REG4));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG1));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG2));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG3));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG4));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG5));
+	printk("tvp5150: WSS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_WSS_DATA_REG6));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG1));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG2));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG3));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG4));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG5));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG6));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG7));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG8));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG9));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG10));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG11));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG12));
+	printk("tvp5150: VPS data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VPS_DATA_REG13));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG1));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG2));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG3));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG4));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG5));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG6));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG7));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG8));
+	printk("tvp5150: VITC data registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VITC_DATA_REG9));
+	printk("tvp5150: VBI FIFO read data = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VBI_FIFO_READ_DATA));
+	printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_1_1));
+	printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_1_2));
+	printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_1_3));
+	printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_1_4));
+	printk("tvp5150: Teletext filter 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_1_5));
+	printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_2_1));
+	printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_2_2));
+	printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_2_3));
+	printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_2_4));
+	printk("tvp5150: Teletext filter 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_2_5));
+	printk("tvp5150: Teletext filter enable = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_TELETEXT_FIL_ENA));
+	printk("tvp5150: Interrupt status register A = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_STATUS_REG_A));
+	printk("tvp5150: Interrupt enable register A = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_ENABLE_REG_A));
+	printk("tvp5150: Interrupt configuration = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_INT_CONF));
+	printk("tvp5150: VDP configuration RAM data = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VDP_CONF_RAM_DATA));
+	printk("tvp5150: Configuration RAM address low byte = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CONF_RAM_ADDR_LOW));
+	printk("tvp5150: Configuration RAM address high byte = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_CONF_RAM_ADDR_HIGH));
+	printk("tvp5150: VDP status register = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_VDP_STATUS_REG));
+	printk("tvp5150: FIFO word count = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FIFO_WORD_COUNT));
+	printk("tvp5150: FIFO interrupt threshold = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FIFO_INT_THRESHOLD));
+	printk("tvp5150: FIFO reset = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FIFO_RESET));
+	printk("tvp5150: Line number interrupt = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_NUMBER_INT));
+	printk("tvp5150: Pixel alignment register low byte = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_PIX_ALIGN_REG_LOW));
+	printk("tvp5150: Pixel alignment register high byte = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_PIX_ALIGN_REG_HIGH));
+	printk("tvp5150: FIFO output control = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FIFO_OUT_CTRL));
+	printk("tvp5150: Full field enable 1 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FULL_FIELD_ENA_1));
+	printk("tvp5150: Full field enable 2 = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FULL_FIELD_ENA_2));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_1));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_2));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_3));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_4));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_5));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_6));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_7));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_8));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_9));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_10));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_11));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_12));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_13));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_14));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_15));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_16));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_17));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_18));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_19));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_20));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_21));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_22));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_23));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_24));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_25));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_27));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_28));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_29));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_30));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_31));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_32));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_33));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_34));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_35));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_36));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_37));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_38));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_39));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_40));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_41));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_42));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_43));
+	printk("tvp5150: Line mode registers = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_LINE_MODE_REG_44));
+	printk("tvp5150: Full field mode register = 0x%02x\n",
+	       tvp5150_read(c, TVP5150_FULL_FIELD_MODE_REG));
 }
 
 /****************************************************************************
 			Basic functions
  ****************************************************************************/
 enum tvp5150_input {
-	TVP5150_ANALOG_CH0    = 0,
-	TVP5150_SVIDEO        = 1,
-	TVP5150_ANALOG_CH1    = 2,
-	TVP5150_BLACK_SCREEN  = 8
+	TVP5150_ANALOG_CH0 = 0,
+	TVP5150_SVIDEO = 1,
+	TVP5150_ANALOG_CH1 = 2,
+	TVP5150_BLACK_SCREEN = 8
 };
 
-static inline void tvp5150_selmux(struct i2c_client *c, enum tvp5150_input input)
+static inline void tvp5150_selmux(struct i2c_client *c,
+				  enum tvp5150_input input)
 {
-	tvp5150_write(c,TVP5150_VD_IN_SRC_SEL_1,input);
+	int tvp_input;
+
+	/* FIXME: It is dependent of basic driver */
+	switch (input)
+	{
+	case 2:
+		tvp_input=TVP5150_ANALOG_CH0;
+		break;
+	case 0:
+		tvp_input=TVP5150_ANALOG_CH1;
+		break;
+	case 1:
+		tvp_input=TVP5150_SVIDEO;
+		break;
+	default:
+		tvp_input=TVP5150_BLACK_SCREEN;
+	}
+
+	tvp5150_write(c, TVP5150_VD_IN_SRC_SEL_1, tvp_input);
 };
 
 static inline void tvp5150_reset(struct i2c_client *c)
 {
-	/* Automatic offset and AGC enabled*/
-	tvp5150_write(c,TVP5150_ANAL_CHL_CTL,0x15);
+	tvp5150_write(c, TVP5150_CONF_SHARED_PIN, 2);
+
+	/* Automatic offset and AGC enabled */
+	tvp5150_write(c, TVP5150_ANAL_CHL_CTL, 0x15);
 
 	/* Normal Operation */
-	tvp5150_write(c,TVP5150_OP_MODE_CTL,0x00);
+//	tvp5150_write(c, TVP5150_OP_MODE_CTL, 0x00);
 
 	/* Activate YCrCb output 0x9 or 0xd ? */
-	tvp5150_write(c,TVP5150_MISC_CTL,0x09);
+	tvp5150_write(c, TVP5150_MISC_CTL, 0x6f);
 
 	/* Activates video std autodetection for PAL/M and PAL/N */
-	tvp5150_write(c,TVP5150_AUTOSW_MSK,0xf0);
+	tvp5150_write(c, TVP5150_AUTOSW_MSK, 0xf0);
 
 	/* Default format: 0x47, 4:2:2: 0x40 */
-	tvp5150_write(c,TVP5150_DATA_RATE_SEL,0x47);
+	tvp5150_write(c, TVP5150_DATA_RATE_SEL, 0x47);
+
+	tvp5150_selmux(c, TVP5150_ANALOG_CH0);
 
-	tvp5150_selmux(c,TVP5150_ANALOG_CH0);
+	tvp5150_write(c, TVP5150_CHROMA_PROC_CTL_1, 0x0c);
+	tvp5150_write(c, TVP5150_CHROMA_PROC_CTL_2, 0x54);
+
+	tvp5150_write(c, 0x27, 0x20);	/* ?????????? */
+
+	tvp5150_write(c, TVP5150_VIDEO_STD, 0x0);	/* Auto switch */
+
+	tvp5150_write(c, TVP5150_HUE_CTL, 0x0);
 };
 
+/****************************************************************************
+			I2C Command
+ ****************************************************************************/
+static int tvp5150_command(struct i2c_client *client,
+			   unsigned int cmd, void *arg)
+{
+	struct tvp5150 *decoder = i2c_get_clientdata(client);
+
+	switch (cmd) {
+
+	case 0:
+	case DECODER_INIT:
+		tvp5150_reset(client);
+		break;
+
+	case DECODER_DUMP:
+		dump_reg(client);
+		break;
+
+	case DECODER_GET_CAPABILITIES:
+	{
+		struct video_decoder_capability *cap = arg;
+
+		cap->flags = VIDEO_DECODER_PAL |
+		    VIDEO_DECODER_NTSC |
+		    VIDEO_DECODER_SECAM |
+		    VIDEO_DECODER_AUTO | VIDEO_DECODER_CCIR;
+		cap->inputs = 3;
+		cap->outputs = 1;
+		break;
+	}
+	case DECODER_GET_STATUS:
+	{
+		break;
+	}
+
+	case DECODER_SET_GPIO:
+		break;
+
+	case DECODER_SET_VBI_BYPASS:
+		break;
+
+	case DECODER_SET_NORM:
+	{
+		int *iarg = arg;
+
+		switch (*iarg) {
+
+		case VIDEO_MODE_NTSC:
+			break;
+
+		case VIDEO_MODE_PAL:
+			break;
+
+		case VIDEO_MODE_SECAM:
+			break;
+
+		case VIDEO_MODE_AUTO:
+			break;
+
+		default:
+			return -EINVAL;
+
+		}
+		decoder->norm = *iarg;
+		break;
+	}
+	case DECODER_SET_INPUT:
+	{
+		int *iarg = arg;
+		if (*iarg < 0 || *iarg > 3) {
+			return -EINVAL;
+		}
+
+		tvp5150_selmux(client, *iarg);
+
+		break;
+	}
+	case DECODER_SET_OUTPUT:
+	{
+		int *iarg = arg;
+
+		/* not much choice of outputs */
+		if (*iarg != 0) {
+			return -EINVAL;
+		}
+		break;
+	}
+	case DECODER_ENABLE_OUTPUT:
+//              int *iarg = arg;
+//              int enable = (*iarg != 0);
+
+		break;
+
+	case DECODER_SET_PICTURE:
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
 
 /****************************************************************************
 			I2C Client & Driver
@@ -271,10 +563,8 @@ static struct i2c_client client_template =
 	.driver    = &driver,
 };
 
-static int
-tvp5150_detect_client (struct i2c_adapter *adapter,
-		       int                 address,
-		       int                 kind)
+static int tvp5150_detect_client (struct i2c_adapter *adapter,
+		int address, int kind)
 {
 	struct i2c_client *client;
 	struct tvp5150 *core;
@@ -297,7 +587,7 @@ tvp5150_detect_client (struct i2c_adapter *adapter,
 	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
 	if (client == 0)
 		return -ENOMEM;
-        memcpy(client,&client_template,sizeof(struct i2c_client));
+	memcpy(client,&client_template,sizeof(struct i2c_client));
 
 	core = kmalloc(sizeof(struct tvp5150), GFP_KERNEL);
 	if (core == 0) {
@@ -315,7 +605,6 @@ tvp5150_detect_client (struct i2c_adapter *adapter,
 		return rv;
 	}
 
-	tvp5150_reset(client);
 	dump_reg (client);
 
 	return 0;
@@ -360,6 +649,8 @@ static struct i2c_driver driver = {
 
 	.attach_adapter = tvp5150_attach_adapter,
 	.detach_client = tvp5150_detach_client,
+
+	.command = tvp5150_command,
 };
 
 static int __init