Merge from mkrufky tree.

Some small updates in the comments for KWorld HardwareMpegTV XPert.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

9 files changed, 111 insertions, 62 deletions

diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134
index 7d163763d..e1484dfef 100644
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -88,3 +88,4 @@
  87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]
  88 -> Tevion DVB-T 220RF                       [17de:7201]
  89 -> ELSA EX-VISION 700TV                     [1131:7130]
+ 90 -> Kworld ATSC110                           [17de:7350]
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index c5c419f34..d7d19bdc3 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -578,7 +578,7 @@ static struct v4l2_queryctrl cx25840_qctrl[] = {
 		.type          = V4L2_CTRL_TYPE_INTEGER,
 		.name          = "Contrast",
 		.minimum       = 0,
-		.maximum       = 255,
+		.maximum       = 127,
 		.step          = 1,
 		.default_value = 64,
 		.flags         = 0,
@@ -587,7 +587,7 @@ static struct v4l2_queryctrl cx25840_qctrl[] = {
 		.type          = V4L2_CTRL_TYPE_INTEGER,
 		.name          = "Saturation",
 		.minimum       = 0,
-		.maximum       = 255,
+		.maximum       = 127,
 		.step          = 1,
 		.default_value = 64,
 		.flags         = 0,
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index 22027af75..aa3600ad9 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -1038,7 +1038,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = {
 		.type          = V4L2_CTRL_TYPE_INTEGER,
 		.name          = "Contrast",
 		.minimum       = 0,
-		.maximum       = 255,
+		.maximum       = 127,
 		.step          = 1,
 		.default_value = 64,
 		.flags         = 0,
@@ -1047,7 +1047,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = {
 		.type          = V4L2_CTRL_TYPE_INTEGER,
 		.name          = "Saturation",
 		.minimum       = 0,
-		.maximum       = 255,
+		.maximum       = 127,
 		.step          = 1,
 		.default_value = 64,
 		.flags         = 0,
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 0497cae40..3963ac2d1 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -2736,6 +2736,30 @@ struct saa7134_board saa7134_boards[] = {
 			.amux   = LINE1,
 		},
 	},
+	[SAA7134_BOARD_KWORLD_ATSC110] = {
+		.name           = "Kworld ATSC110",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TUV1236D,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs         = {{
+			.name = name_tv,
+			.vmux = 1,
+			.amux = TV,
+			.tv   = 1,
+		},{
+			.name = name_comp1,
+			.vmux = 3,
+			.amux = LINE2,
+		},{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE2,
+		}},
+	},
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3237,6 +3261,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
 		.subdevice    = 0x7201,
 		.driver_data  = SAA7134_BOARD_TEVION_DVBT_220RF,
 	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
+		.subvendor    = 0x17de,
+		.subdevice    = 0x7350,
+		.driver_data  = SAA7134_BOARD_KWORLD_ATSC110,
+	},{
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3562,6 +3592,18 @@ int saa7134_board_init2(struct saa7134_dev *dev)
 		i2c_transfer(&dev->i2c_adap, &msg, 1);
 		}
 		break;
+	case SAA7134_BOARD_KWORLD_ATSC110:
+		{
+			/* enable tuner */
+			int i;
+			u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 };
+			dev->i2c_client.addr = 0x0a;
+			for (i = 0; i < 5; i++)
+				if (2 != i2c_master_send(&dev->i2c_client,&buffer[i*2],2))
+					printk(KERN_WARNING "%s: Unable to enable tuner(%i).\n",
+					       dev->name, i);
+		}
+		break;
 	}
 	return 0;
 }
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 909b82f19..d1f88d974 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -929,6 +929,22 @@ static struct nxt200x_config avertvhda180 = {
 	.pll_address      = 0x61,
 	.pll_desc         = &dvb_pll_tdhu2,
 };
+
+static int nxt200x_set_pll_input(u8 *buf, int input)
+{
+	if (input)
+		buf[3] |= 0x08;
+	else
+		buf[3] &= ~0x08;
+	return 0;
+}
+
+static struct nxt200x_config kworldatsc110 = {
+	.demod_address    = 0x0a,
+	.pll_address      = 0x61,
+	.pll_desc         = &dvb_pll_tuv1236d,
+	.set_pll_input    = nxt200x_set_pll_input,
+};
 #endif
 
 /* ------------------------------------------------------------------ */
@@ -1014,6 +1030,9 @@ static int dvb_init(struct saa7134_dev *dev)
 	case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
 		dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
 		break;
+	case SAA7134_BOARD_KWORLD_ATSC110:
+		dev->dvb.frontend = nxt200x_attach(&kworldatsc110, &dev->i2c_adap);
+		break;
 #endif
 	default:
 		printk("%s: Huh? unknown DVB card?\n",dev->name);
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 638c88ba6..b72306e59 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -227,6 +227,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87
 #define SAA7134_BOARD_TEVION_DVBT_220RF 88
 #define SAA7134_BOARD_ELSA_700TV       89
+#define SAA7134_BOARD_KWORLD_ATSC110   90
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
diff --git a/v4l/Make.config b/v4l/Make.config
index f8978c53b..216674ce2 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -22,6 +22,10 @@ CONFIG_VIDEO_ADV_DEBUG	:= y
 
 CONFIG_VIDEO_PVRUSB2	:= n
 
+CONFIG_VIDEO_IVTV	:= n
+
+CONFIG_DVB_FIRESAT	:= n
+
 # doesn't build on older kernels
 
 CONFIG_DVB_CORE			:= n
@@ -58,7 +62,6 @@ CONFIG_DVB_TTUSB_BUDGET		:= n
 CONFIG_DVB_TTUSB_DEC		:= n
 CONFIG_VIDEO_SAA7146		:= n
 CONFIG_VIDEO_SAA7146_VV		:= n
-CONFIG_DVB_FIRESAT		:= n
 
 ifneq ($(KERNELRELEASE),)
  CONFIG_DVB_CORE := $(shell test $(SUBLEVEL) -ge 10 -a $(PATCHLEVEL) -ge 6 && echo m)
@@ -106,3 +109,5 @@ ifeq ($(CONFIG_DVB_CORE),m)
  CONFIG_VIDEO_SAA7146_VV	:= m
 endif
 
+CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m)
+CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m)
diff --git a/v4l/Makefile b/v4l/Makefile
index e637d2617..1cbe00cbb 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -74,6 +74,12 @@ pvrusb2-objs		:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
 			   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
 			   pvrusb2-ioread.o pvrusb2-debugifc.o
 dvb-firesat-objs	:= firesat.o avc_api.o cmp.o firesat-rc.o
+ivtv-objs    := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \
+		ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \
+		ivtv-irq.o ivtv-mailbox.o ivtv-vbi.o ivtv-kthreads.o \
+		ivtv-audio.o ivtv-ioctl.o ivtv-controls.o ivtv-video.o \
+		ivtv-cards.o ivtv-yuv.o
+ivtv-fb-objs := ivtv-osd.o ivtv-queue.o
 
 obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
 obj-m				+= compat_ioctl32.o 
@@ -145,6 +151,7 @@ obj-$(CONFIG_VIDEO_SAA7146)	+= saa7146.o
 obj-$(CONFIG_VIDEO_SAA7146_VV)	+= saa7146_vv.o
 obj-$(CONFIG_VIDEO_PVRUSB2)	+= pvrusb2.o
 obj-$(CONFIG_DVB_FIRESAT)       += dvb-firesat.o
+obj-$(CONFIG_VIDEO_IVTV)        += ivtv.o ivtv-fb.o
 
 # 2.6-only stuff
 ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -323,6 +330,7 @@ inst_ttusb-budget := dvb-ttusb-budget.ko
 inst_ttusb-dec := ttusb_dec.ko ttusbdecfe.ko
 inst_pvrusb2 := pvrusb2.ko
 inst_firesat := dvb-firesat.ko
+inst_ivtv := ivtv.ko ivtv-fb.ko
 
 v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 
@@ -336,15 +344,33 @@ default:: links .version
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
 pvrusb2::
-	@scripts/merge-pvrusb2.sh
+	@echo creating pvrusb2 symbolic links...
+	@find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+	@echo 'm' > .pvrusb2-merge
 
-pvrusb2-unmerge::
-#	patch -R -p1 < scripts/merge-pvrusb2.sh
+ivtv-checkout::
+	@if [ ! -d ivtv ]; then \
+		echo retrieving the latest ivtv sources from ivtvdriver.org; \
+		echo this step requires subversion to be installed; \
+		svn co http://ivtvdriver.org/svn/ivtv/trunk ivtv; \
+	fi
+
+ivtv-update ivtv-up:: ivtv-checkout
+	@svn up ivtv
+
+ivtv-links:: ivtv-checkout
+	@echo creating ivtv symbolic links...
+	@find ivtv/driver -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+	@find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+
+ivtv:: ivtv-links
+	@echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h
+	@echo ivtv trunk merged. Run make to build the entire tree.
 
 links::
 	@echo creating symbolic links...
-	@find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
-	@find ../linux/sound -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+	@find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+	@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
 
 #	@find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
 
@@ -376,6 +402,9 @@ v4l-install:: v4l-rminstall
 	-install -d $(KDIR26)/video/pvrusb2
 	-install -m 644 -c $(inst_pvrusb2) $(KDIR26)/video/pvrusb2
 
+	-install -d $(KDIR26)/video/ivtv
+	-install -m 644 -c $(inst_ivtv) $(KDIR26)/video/ivtv
+
 #	-install -d $(KDIRUSB)
 #	-install -m 644 -c $(inst_usb) $(KDIRUSB)/
 
@@ -444,6 +473,8 @@ v4l-rminstall::
 		$(addprefix $(KDIR26)/video/, $(inst_video)) \
 		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
 		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
+		$(addprefix $(KDIR26)/video/pvrusb2/, $(inst_pvrusb2)) \
+		$(addprefix $(KDIR26)/video/ivtv/, $(inst_ivtv)) \
 		$(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \
 		$(addprefix $(KDIRUSB)/, $(inst_em28xx)) \
 		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
@@ -451,6 +482,7 @@ v4l-rminstall::
 		$(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \
 		$(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
 		$(addprefix $(KDIR26)/video/pvrusb2/, $(addsuffix .gz,$(inst_pvrusb2))) 2>/dev/null \
+		$(addprefix $(KDIR26)/video/ivtv/, $(addsuffix .gz,$(inst_ivtv))) 2>/dev/null \
 		$(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \
 		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null
 	@echo
@@ -489,7 +521,7 @@ rmmodules::
 clean::
 	@find . -name '*.c' -type l -exec rm '{}' \;
 	@find . -name '*.h' -type l -exec rm '{}' \;
-	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump
+	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h .pvrusb2-merge
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d
diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh
deleted file mode 100755
index e12d79a3f..000000000
--- a/v4l/scripts/merge-pvrusb2.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PWD=`pwd`
-CWD=$PWD
-
-cd ../v4l_experimental/pvrusb2
-PVRUSB2=$PWD
-
-echo creating pvrusb2 symbolic links...
-
-for x in `find . -type f -name '*.[c,h]'` ; do
-	ln -f -s $PVRUSB2/$x $CWD/$x
-done
-
-cd $CWD
-patch -p1 <<'DIFF'
---- v4l.orig/Make.config
-+++ v4l/Make.config
-@@ -17,7 +17,7 @@
- 
- CONFIG_VIDEO_ADV_DEBUG	:= y
- 
--CONFIG_VIDEO_PVRUSB2	:= n
-+CONFIG_VIDEO_PVRUSB2	:= m
- 
- # doesn't build on older kernels
- 
---- v4l.orig/Makefile
-+++ v4l/Makefile
-@@ -319,10 +319,10 @@
- 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
- 
- pvrusb2::
--	@scripts/merge-pvrusb2.sh
-+#	@scripts/merge-pvrusb2.sh
- 
- pvrusb2-unmerge::
--#	patch -R -p1 < scripts/merge-pvrusb2.sh
-+	patch -R -p1 < scripts/merge-pvrusb2.sh
- 
- links::
- 	@echo creating symbolic links...
-@@ -464,7 +467,7 @@ dvb-rminstall::
- rmmodules::
- 	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
- 
--clean::
-+clean:: pvrusb2-unmerge
- 	@find . -name '*.c' -type l -exec rm '{}' \;
- 	@find . -name '*.h' -type l -exec rm '{}' \;
- 	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump