---

yaml
---
r: 76295
b: refs/heads/master
c: 6cb4587
h: refs/heads/master
i:
  76293: ed98912
  76291: 37fad40
  76287: 9c66f64
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12466577853b0d057f4416f4c7020e544f3a4209
+refs/heads/master: 6cb45879dca84c667996d65a12880db6705a2b0e

trunk/drivers/media/video/Kconfig

@@ -505,6 +505,18 @@ config TUNER_3036
 	  Say Y here to include support for Philips SAB3036 compatible tuners.
 	  If in doubt, say N.
 
+config TUNER_XC2028
+	tristate "Xceive xc2028 support for tm5600/tm6000 driver"
+	depends on I2C
+	select VIDEO_TUNER
+	help
+	  Say Y here to include support for Xceive xc2028 tuner. This is
+	  required on a few tm5600/tm6000 designs. You should notice
+	  that this module currently works only with the special
+	  firmware versions used on those Trident chips.
+
+	  If in doubt, say N.
+
 config VIDEO_VINO
 	tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
 	depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2

trunk/drivers/media/video/Makefile

@@ -6,6 +6,10 @@ zr36067-objs	:=	zoran_procfs.o zoran_device.o \
 			zoran_driver.o zoran_card.o
 tuner-objs	:=	tuner-core.o tuner-types.o tda9887.o
 
+ifneq ($(CONFIG_TUNER_XC2028),)
+  tuner-objs	+=	tuner-xc2028.o
+endif
+
 msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o \

trunk/drivers/media/video/tuner-core.c

@@ -193,6 +193,8 @@ static void set_freq(struct i2c_client *c, unsigned long freq)
 		set_tv_freq(c, freq);
 		t->tv_freq = freq;
 		break;
+	default:
+		tuner_dbg("freq set: unknown mode: 0x%04x!\n",t->mode);
 	}
 }
 
@@ -320,6 +322,9 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		i2c_master_send(c,buffer,4);
 		attach_simple_tuner(t);
 		break;
+	case TUNER_XC2028:
+		xc2028_tuner_init(c);
+		break;
 	case TUNER_TDA9887:
 		tda9887_tuner_init(t);
 		break;

trunk/drivers/media/video/tuner-driver.h

@@ -70,6 +70,8 @@ struct tuner {
 	struct tuner_operations ops;
 };
 
+extern int xc2028_tuner_init(struct i2c_client *c);
+
 /* ------------------------------------------------------------------------ */
 
 extern int tda9887_tuner_init(struct tuner *t);