From: Chris Wright Date: Tue, 21 Mar 2006 07:09:04 +0000 (-0800) Subject: v4l/dvb fixes for 2.6.16, fwd from Michael Krufky X-Git-Tag: v2.6.16.1~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f5bc7681ff656d8845e0e20ecf7524a157cb648;p=thirdparty%2Fkernel%2Fstable-queue.git v4l/dvb fixes for 2.6.16, fwd from Michael Krufky --- diff --git a/queue-2.6.16/kconfig-video_decoder-must-select-fw_loader.patch b/queue-2.6.16/kconfig-video_decoder-must-select-fw_loader.patch new file mode 100644 index 00000000000..6df3b04155d --- /dev/null +++ b/queue-2.6.16/kconfig-video_decoder-must-select-fw_loader.patch @@ -0,0 +1,41 @@ +From stable-bounces@linux.kernel.org Mon Mar 20 19:35:28 2006 +Date: Mon, 20 Mar 2006 22:34:58 -0500 +From: Michael Krufky +To: stable@kernel.org +Cc: v4l-dvb maintainer list , lkml , Mauro Carvalho Chehab +Subject: [PATCH] Kconfig: VIDEO_DECODER must select FW_LOADER + +From: Michael Krufky + +The cx25840 module requires external firmware in order to function, +so it must select FW_LOADER, but saa7115 and saa7129 do not require it. + +Signed-off-by: Michael Krufky +Cc: Mauro Carvalho Chehab +Signed-off-by: Chris Wright +--- + +--- +linux-2.6.16.orig/drivers/media/video/Kconfig ++++ linux-2.6.16/drivers/media/video/Kconfig +@@ -349,6 +349,7 @@ + config VIDEO_DECODER + tristate "Add support for additional video chipsets" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ++ select FW_LOADER + ---help--- + Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 + video decoders. + drivers/media/video/Kconfig | 1 + + 1 files changed, 1 insertion(+) + +--- linux-2.6.16.orig/drivers/media/video/Kconfig ++++ linux-2.6.16/drivers/media/video/Kconfig +@@ -349,6 +349,7 @@ config VIDEO_AUDIO_DECODER + config VIDEO_DECODER + tristate "Add support for additional video chipsets" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ++ select FW_LOADER + ---help--- + Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 + video decoders. diff --git a/queue-2.6.16/series b/queue-2.6.16/series index 5341cc94240..7453858f740 100644 --- a/queue-2.6.16/series +++ b/queue-2.6.16/series @@ -1 +1,3 @@ sata_mv-fix-irq-port-status-usage.patch +v4l-dvb-fix-samsung-tuner-frequency-ranges.patch +kconfig-video_decoder-must-select-fw_loader.patch diff --git a/queue-2.6.16/v4l-dvb-fix-samsung-tuner-frequency-ranges.patch b/queue-2.6.16/v4l-dvb-fix-samsung-tuner-frequency-ranges.patch new file mode 100644 index 00000000000..9f9a6d4e06b --- /dev/null +++ b/queue-2.6.16/v4l-dvb-fix-samsung-tuner-frequency-ranges.patch @@ -0,0 +1,33 @@ +From stable-bounces@linux.kernel.org Mon Mar 20 19:35:25 2006 +Date: Mon, 20 Mar 2006 22:34:54 -0500 +From: Michael Krufky +To: stable@kernel.org +Cc: Hans Verkuil , v4l-dvb maintainer list , lkml , Mauro Carvalho Chehab +Subject: [PATCH] V4L/DVB (3324): Fix Samsung tuner frequency ranges + +From: Hans Verkuil + +Forgot to take the NTSC frequency offset into account. + +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Michael Krufky +Signed-off-by: Chris Wright +--- + + drivers/media/video/tuner-types.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.16.orig/drivers/media/video/tuner-types.c ++++ linux-2.6.16/drivers/media/video/tuner-types.c +@@ -1087,8 +1087,8 @@ static struct tuner_params tuner_tnf_533 + /* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */ + + static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = { +- { 16 * 175.75 /*MHz*/, 0x01, }, +- { 16 * 410.25 /*MHz*/, 0x02, }, ++ { 16 * 130.00 /*MHz*/, 0x01, }, ++ { 16 * 364.50 /*MHz*/, 0x02, }, + { 16 * 999.99 , 0x08, }, + }; +