[linuxtv-commits] [hg:v4l-dvb] gspca: Change a bit the init of ov7660 and Sonix JPEG bridges.
The patch number 8550 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Change a bit the init of ov7660 and Sonix JPEG bridges.
Set back some values of gspcav1 in init of sonixj sensor ov7660.
Add some comments.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/sonixj.c | 46 ++-
1 file changed, 21 insertions(+), 25 deletions(-)
diff -r a19c20d8c144 -r 1755fc02158b linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Sun Jul 27 19:01:59 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixj.c Mon Jul 28 11:41:51 2008 +0200
@@ -371,17 +371,15 @@ static const __u8 ov7660_sensor_init[][8
{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
/* (delay 20ms) */
{0xa1, 0x21, 0x12, 0x05, 0x00, 0x00, 0x00, 0x10},
- /* Outformat ?? rawRGB */
+ /* Outformat = rawRGB */
{0xa1, 0x21, 0x13, 0xb8, 0x00, 0x00, 0x00, 0x10}, /* init COM8 */
- {0xd1, 0x21, 0x00, 0x01, 0x74, 0x92, 0x00, 0x10},
-/* {0xd1, 0x21, 0x00, 0x01, 0x74, 0x74, 0x00, 0x10}, */
+ {0xd1, 0x21, 0x00, 0x01, 0x74, 0x74, 0x00, 0x10},
/* GAIN BLUE RED VREF */
{0xd1, 0x21, 0x04, 0x00, 0x7d, 0x62, 0x00, 0x10},
/* COM 1 BAVE GEAVE AECHH */
{0xb1, 0x21, 0x08, 0x83, 0x01, 0x00, 0x00, 0x10}, /* RAVE COM2 */
{0xd1, 0x21, 0x0c, 0x00, 0x08, 0x04, 0x4f, 0x10}, /* COM 3 4 5 6 */
- {0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xf8, 0x10},
-/* {0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xff, 0x10}, */
+ {0xd1, 0x21, 0x10, 0x7f, 0x40, 0x05, 0xff, 0x10},
/* AECH CLKRC COM7 COM8 */
{0xc1, 0x21, 0x14, 0x2c, 0x00, 0x02, 0x00, 0x10}, /* COM9 COM10 */
{0xd1, 0x21, 0x17, 0x10, 0x60, 0x02, 0x7b, 0x10},
@@ -390,8 +388,8 @@ static const __u8 ov7660_sensor_init[][8
{0xb1, 0x21, 0x1e, 0x01, 0x0e, 0x00, 0x00, 0x10}, /* MVFP LAEC */
{0xd1, 0x21, 0x20, 0x07, 0x07, 0x07, 0x07, 0x10},
/* BOS GBOS GROS ROS (BGGR offset) */
- {0xd1, 0x21, 0x24, 0x68, 0x58, 0xd4, 0x80, 0x10},
-/* {0xd1, 0x21, 0x24, 0x78, 0x68, 0xd4, 0x80, 0x10}, */
+/* {0xd1, 0x21, 0x24, 0x68, 0x58, 0xd4, 0x80, 0x10}, */
+ {0xd1, 0x21, 0x24, 0x78, 0x68, 0xd4, 0x80, 0x10},
/* AEW AEB VPT BBIAS */
{0xd1, 0x21, 0x28, 0x80, 0x30, 0x00, 0x00, 0x10},
/* GbBIAS RSVD EXHCH EXHCL */
@@ -418,9 +416,9 @@ static const __u8 ov7660_sensor_init[][8
{0xd1, 0x21, 0x62, 0x00, 0x00, 0x50, 0x30, 0x10},
/* LCC1 LCC2 LCC3 LCC4 */
{0xa1, 0x21, 0x66, 0x00, 0x00, 0x00, 0x00, 0x10}, /* LCC5 */
- {0xd1, 0x21, 0x67, 0x80, 0x7a, 0x90, 0x80, 0x10},
+ {0xd1, 0x21, 0x67, 0x80, 0x7a, 0x90, 0x80, 0x10}, /* MANU */
{0xa1, 0x21, 0x6b, 0x0a, 0x00, 0x00, 0x00, 0x10},
- /* band gap reference [0..3] DBLV */
+ /* band gap reference [0:3] DBLV */
{0xd1, 0x21, 0x6c, 0x30, 0x48, 0x80, 0x74, 0x10}, /* gamma curve */
{0xd1, 0x21, 0x70, 0x64, 0x60, 0x5c, 0x58, 0x10}, /* gamma curve */
{0xd1, 0x21, 0x74, 0x54, 0x4c, 0x40, 0x38, 0x10}, /* gamma curve */
@@ -430,37 +428,35 @@ static const __u8 ov7660_sensor_init[][8
{0xd1, 0x21, 0x84, 0x6e, 0x77, 0x87, 0x95, 0x10}, /* gamma curve */
{0xc1, 0x21, 0x88, 0xaf, 0xc7, 0xdf, 0x00, 0x10}, /* gamma curve */
{0xc1, 0x21, 0x8b, 0x99, 0x99, 0xcf, 0x00, 0x10}, /* reserved */
- {0xb1, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x10},
+ {0xb1, 0x21, 0x92, 0x00, 0x00, 0x00, 0x00, 0x10}, /* DM_LNL/H */
/** (some exchanges in the win trace) **/
- {0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10},
+ {0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10}, /* MVFP */
/* bits[3..0]reserved */
{0xa1, 0x21, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},
/* VREF vertical frame ctrl */
{0xa1, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},
- {0xa1, 0x21, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10}, /* 0x20 */
- {0xa1, 0x21, 0x2d, 0x00, 0x00,
[linuxtv-commits] [hg:v4l-dvb] gspca: Bad pixel format in the spca508 subdriver.
The patch number 8552 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Bad pixel format in the spca508 subdriver.
The pixel format should have been changed in changeset 6de914aaad86.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/spca508.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff -r 32f9ab2a4768 -r e9a442d3b53a linux/drivers/media/video/gspca/spca508.c
--- a/linux/drivers/media/video/gspca/spca508.c Mon Jul 28 11:43:34 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca508.c Mon Jul 28 12:52:27 2008 +0200
@@ -63,22 +63,22 @@ static struct ctrl sd_ctrls[] = {
};
static struct v4l2_pix_format sif_mode[] = {
- {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+ {160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
.bytesperline = 160 * 3,
.sizeimage = 160 * 120 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 3},
- {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+ {176, 144, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
.bytesperline = 176 * 3,
.sizeimage = 176 * 144 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 2},
- {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+ {320, 240, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
.bytesperline = 320 * 3,
.sizeimage = 320 * 240 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1},
- {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+ {352, 288, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
.bytesperline = 352 * 3,
.sizeimage = 352 * 288 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/e9a442d3b53a98c0853055982d43d0a5e120632a
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] media/video/Kconfig: get rid of a select
The patch number 8553 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] media/video/Kconfig: get rid of a select Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/Kconfig |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -r e9a442d3b53a -r 9f4432068197 linux/drivers/media/video/Kconfig --- a/linux/drivers/media/video/Kconfig Mon Jul 28 12:52:27 2008 +0200 +++ b/linux/drivers/media/video/Kconfig Mon Jul 28 12:58:53 2008 -0300 @@ -822,8 +822,7 @@ config VIDEO_OVCAMCHIP config USB_W9968CF tristate USB W996[87]CF JPEG Dual Mode Camera support - depends on VIDEO_V4L1 I2C - select VIDEO_OVCAMCHIP + depends on VIDEO_V4L1 I2C VIDEO_OVCAMCHIP ---help--- Say Y here if you want support for cameras based on OV681 or Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/9f4432068197a06daba2f35de85d4e26816eea58 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] media/video/Kconfig: cosmetic changes and convert select into depends on
The patch number 8554 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] media/video/Kconfig: cosmetic changes and convert select into depends on It seems cosmetically better to let USB drivers be the last one. Also, two SOC drivers were using select, instead of depends on SOC_CAMERA. Since select has some drawbacks when checking for dependencies, convert those two into depends on. CC: Guennadi Liakhovetski [EMAIL PROTECTED] Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/Kconfig | 118 ++ 1 file changed, 58 insertions(+), 60 deletions(-) diff -r 9f4432068197 -r e12f6a50ac05 linux/drivers/media/video/Kconfig --- a/linux/drivers/media/video/Kconfig Mon Jul 28 12:58:53 2008 -0300 +++ b/linux/drivers/media/video/Kconfig Mon Jul 28 13:07:42 2008 -0300 @@ -784,6 +784,64 @@ config VIDEO_CAFE_CCIC CMOS camera controller. This is the controller found on first- generation OLPC systems. +config SOC_CAMERA + tristate SoC camera support + depends on VIDEO_V4L2 HAS_DMA + select VIDEOBUF_GEN + help + SoC Camera is a common API to several cameras, not connecting + over a bus like PCI or USB. For example some i2c camera connected + directly to the data bus of an SoC. + +config SOC_CAMERA_MT9M001 + tristate mt9m001 support + depends on SOC_CAMERA I2C + select GPIO_PCA953X if MT9M001_PCA9536_SWITCH + help + This driver supports MT9M001 cameras from Micron, monochrome + and colour models. + +config MT9M001_PCA9536_SWITCH + bool pca9536 datawidth switch for mt9m001 + depends on SOC_CAMERA_MT9M001 GENERIC_GPIO + help + Select this if your MT9M001 camera uses a PCA9536 I2C GPIO + extender to switch between 8 and 10 bit datawidth modes + +config SOC_CAMERA_MT9V022 + tristate mt9v022 support + depends on SOC_CAMERA I2C + select GPIO_PCA953X if MT9V022_PCA9536_SWITCH + help + This driver supports MT9V022 cameras from Micron + +config MT9V022_PCA9536_SWITCH + bool pca9536 datawidth switch for mt9v022 + depends on SOC_CAMERA_MT9V022 GENERIC_GPIO + help + Select this if your MT9V022 camera uses a PCA9536 I2C GPIO + extender to switch between 8 and 10 bit datawidth modes + +config SOC_CAMERA_PLATFORM + tristate platform camera support + depends on SOC_CAMERA + help + This is a generic SoC camera platform driver, useful for testing + +config VIDEO_PXA27x + tristate PXA27x Quick Capture Interface driver + depends on VIDEO_DEV PXA27x SOC_CAMERA + select VIDEOBUF_DMA_SG + ---help--- + This is a v4l2 driver for the PXA27x Quick Capture Interface + +config VIDEO_SH_MOBILE_CEU + tristate SuperH Mobile CEU Interface driver + depends on VIDEO_DEV SOC_CAMERA + select VIDEOBUF_DMA_CONTIG + ---help--- + This is a v4l2 driver for the SuperH Mobile CEU Interface + # # USB Multimedia device configuration # @@ -913,64 +971,4 @@ config USB_S2255 endif # V4L_USB_DRIVERS -config SOC_CAMERA - tristate SoC camera support - depends on VIDEO_V4L2 HAS_DMA - select VIDEOBUF_GEN - help - SoC Camera is a common API to several cameras, not connecting - over a bus like PCI or USB. For example some i2c camera connected - directly to the data bus of an SoC. - -config SOC_CAMERA_MT9M001 - tristate mt9m001 support - depends on SOC_CAMERA I2C - select GPIO_PCA953X if MT9M001_PCA9536_SWITCH - help - This driver supports MT9M001 cameras from Micron, monochrome - and colour models. - -config MT9M001_PCA9536_SWITCH - bool pca9536 datawidth switch for mt9m001 - depends on SOC_CAMERA_MT9M001 GENERIC_GPIO - help - Select this if your MT9M001 camera uses a PCA9536 I2C GPIO - extender to switch between 8 and 10 bit datawidth modes - -config SOC_CAMERA_MT9V022 - tristate mt9v022 support - depends on SOC_CAMERA I2C - select GPIO_PCA953X if MT9V022_PCA9536_SWITCH - help - This driver supports MT9V022 cameras from Micron - -config MT9V022_PCA9536_SWITCH - bool pca9536 datawidth switch for mt9v022 - depends on SOC_CAMERA_MT9V022 GENERIC_GPIO - help - Select this if your MT9V022 camera uses a PCA9536 I2C GPIO - extender to switch between 8 and 10 bit datawidth modes - -config SOC_CAMERA_PLATFORM -
[linuxtv-commits] [hg:v4l-dvb] au8522: add mechanism to configure IF frequency for vsb and qam
The patch number 8555 was added via Michael Krufky [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Michael Krufky [EMAIL PROTECTED]
au8522: add mechanism to configure IF frequency for vsb and qam
Add a mechanism to configure IF frequency for vsb and qam.
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
---
linux/drivers/media/dvb/frontends/au8522.c | 66 +
linux/drivers/media/dvb/frontends/au8522.h |9 ++
2 files changed, 75 insertions(+)
diff -r 6753aa3aeee3 -r 192791be2116 linux/drivers/media/dvb/frontends/au8522.c
--- a/linux/drivers/media/dvb/frontends/au8522.cSun Jul 27 09:20:20
2008 -0300
+++ b/linux/drivers/media/dvb/frontends/au8522.cSun Jul 27 17:11:28
2008 -0400
@@ -302,6 +302,70 @@ static int au8522_mse2snr_lookup(struct
}
dprintk(%s() snr=%d\n, __func__, *snr);
return ret;
+}
+
+/* 3.25 MHz IF Frequency table */
+static struct {
+ u16 reg;
+ u16 data;
+} if_3_25_mhz_tab[] = {
+ { 0x80b5, 0x00 },
+ { 0x80b6, 0x3d },
+ { 0x80b7, 0xa0 },
+};
+
+/* 4.00 MHz IF Frequency table */
+static struct {
+ u16 reg;
+ u16 data;
+} if_4_mhz_tab[] = {
+ { 0x80b5, 0x00 },
+ { 0x80b6, 0x4b },
+ { 0x80b7, 0xd9 },
+};
+
+/* 6.00 MHz IF Frequency table */
+static struct {
+ u16 reg;
+ u16 data;
+} if_6_mhz_tab[] = {
+ { 0x80b5, 0xfb },
+ { 0x80b6, 0x8e },
+ { 0x80b7, 0x39 },
+};
+
+static int au8522_set_if(struct dvb_frontend *fe, enum au8522_if_freq if_freq)
+{
+ struct au8522_state *state = fe-demodulator_priv;
+ int i;
+
+ switch (if_freq) {
+ case AU8522_IF_3_25MHZ:
+ dprintk(%s() 3.25 MHz\n, __func__);
+ for (i = 0; i ARRAY_SIZE(if_3_25_mhz_tab); i++)
+ au8522_writereg(state,
+ if_3_25_mhz_tab[i].reg,
+ if_3_25_mhz_tab[i].data);
+ break;
+ case AU8522_IF_4MHZ:
+ dprintk(%s() 4.00 MHz\n, __func__);
+ for (i = 0; i ARRAY_SIZE(if_4_mhz_tab); i++)
+ au8522_writereg(state,
+ if_4_mhz_tab[i].reg,
+ if_4_mhz_tab[i].data);
+ break;
+ case AU8522_IF_6MHZ:
+ dprintk(%s() 6.00 MHz\n, __func__);
+ for (i = 0; i ARRAY_SIZE(if_6_mhz_tab); i++)
+ au8522_writereg(state,
+ if_6_mhz_tab[i].reg,
+ if_6_mhz_tab[i].data);
+ break;
+ default:
+ dprintk(%s() IF Frequency not supported\n, __func__);
+ return -EINVAL;
+ }
+ return 0;
}
/* VSB Modulation table */
@@ -438,6 +502,7 @@ static int au8522_enable_modulation(stru
au8522_writereg(state,
VSB_mod_tab[i].reg,
VSB_mod_tab[i].data);
+ au8522_set_if(fe, state-config-vsb_if);
break;
case QAM_64:
case QAM_256:
@@ -446,6 +511,7 @@ static int au8522_enable_modulation(stru
au8522_writereg(state,
QAM_mod_tab[i].reg,
QAM_mod_tab[i].data);
+ au8522_set_if(fe, state-config-qam_if);
break;
default:
dprintk(%s() Invalid modulation\n, __func__);
diff -r 6753aa3aeee3 -r 192791be2116 linux/drivers/media/dvb/frontends/au8522.h
--- a/linux/drivers/media/dvb/frontends/au8522.hSun Jul 27 09:20:20
2008 -0300
+++ b/linux/drivers/media/dvb/frontends/au8522.hSun Jul 27 17:11:28
2008 -0400
@@ -24,6 +24,12 @@
#include linux/dvb/frontend.h
+enum au8522_if_freq {
+ AU8522_IF_6MHZ = 0,
+ AU8522_IF_4MHZ,
+ AU8522_IF_3_25MHZ,
+};
+
struct au8522_config {
/* the demodulator's i2c address */
u8 demod_address;
@@ -32,6 +38,9 @@ struct au8522_config {
#define AU8522_TUNERLOCKING 0
#define AU8522_DEMODLOCKING 1
u8 status_mode;
+
+ enum au8522_if_freq vsb_if;
+ enum au8522_if_freq qam_if;
};
#if defined(CONFIG_DVB_AU8522) || \
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/192791be2116e44269f7e5b213a080e8aa763912
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] au0828: add support for Hauppauge Woodbury
The patch number 8556 was added via Michael Krufky [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Michael Krufky [EMAIL PROTECTED]
au0828: add support for Hauppauge Woodbury
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
---
linux/Documentation/video4linux/CARDLIST.au0828 |1
linux/drivers/media/video/au0828/Kconfig|1
linux/drivers/media/video/au0828/au0828-cards.c |7 +
linux/drivers/media/video/au0828/au0828-cards.h |1
linux/drivers/media/video/au0828/au0828-dvb.c | 21
5 files changed, 31 insertions(+)
diff -r 192791be2116 -r f65f21d8e364
linux/Documentation/video4linux/CARDLIST.au0828
--- a/linux/Documentation/video4linux/CARDLIST.au0828 Sun Jul 27 17:11:28
2008 -0400
+++ b/linux/Documentation/video4linux/CARDLIST.au0828 Sun Jul 27 17:13:20
2008 -0400
@@ -3,3 +3,4 @@
2 - Hauppauge HVR850 (au0828)[2040:7240]
3 - DViCO FusionHDTV USB (au0828)[0fe9:d620]
4 - Hauppauge HVR950Q rev xxF8 (au0828)
[2040:7201,2040:7211,2040:7281]
+ 5 - Hauppauge Woodbury (au0828)[2040:8200]
diff -r 192791be2116 -r f65f21d8e364 linux/drivers/media/video/au0828/Kconfig
--- a/linux/drivers/media/video/au0828/Kconfig Sun Jul 27 17:11:28 2008 -0400
+++ b/linux/drivers/media/video/au0828/Kconfig Sun Jul 27 17:13:20 2008 -0400
@@ -7,6 +7,7 @@ config VIDEO_AU0828
select DVB_AU8522 if !DVB_FE_CUSTOMIZE
select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE
+ select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
---help---
This is a video4linux driver for Auvitek's USB device.
diff -r 192791be2116 -r f65f21d8e364
linux/drivers/media/video/au0828/au0828-cards.c
--- a/linux/drivers/media/video/au0828/au0828-cards.c Sun Jul 27 17:11:28
2008 -0400
+++ b/linux/drivers/media/video/au0828/au0828-cards.c Sun Jul 27 17:13:20
2008 -0400
@@ -37,6 +37,9 @@ struct au0828_board au0828_boards[] = {
},
[AU0828_BOARD_DVICO_FUSIONHDTV7] = {
.name = DViCO FusionHDTV USB,
+ },
+ [AU0828_BOARD_HAUPPAUGE_WOODBURY] = {
+ .name = Hauppauge Woodbury,
},
};
@@ -115,6 +118,7 @@ void au0828_card_setup(struct au0828_dev
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+ case AU0828_BOARD_HAUPPAUGE_WOODBURY:
if (dev-i2c_rc == 0)
hauppauge_eeprom(dev, eeprom+0xa0);
break;
@@ -134,6 +138,7 @@ void au0828_gpio_setup(struct au0828_dev
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+ case AU0828_BOARD_HAUPPAUGE_WOODBURY:
/* GPIO's
* 4 - CS5340
* 5 - AU8522 Demodulator
@@ -205,6 +210,8 @@ struct usb_device_id au0828_usb_id_table
.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
{ USB_DEVICE(0x2040, 0x7281),
.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+ { USB_DEVICE(0x2040, 0x8200),
+ .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
{ },
};
diff -r 192791be2116 -r f65f21d8e364
linux/drivers/media/video/au0828/au0828-cards.h
--- a/linux/drivers/media/video/au0828/au0828-cards.h Sun Jul 27 17:11:28
2008 -0400
+++ b/linux/drivers/media/video/au0828/au0828-cards.h Sun Jul 27 17:13:20
2008 -0400
@@ -24,3 +24,4 @@
#define AU0828_BOARD_HAUPPAUGE_HVR850 2
#define AU0828_BOARD_DVICO_FUSIONHDTV7 3
#define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL 4
+#define AU0828_BOARD_HAUPPAUGE_WOODBURY5
diff -r 192791be2116 -r f65f21d8e364
linux/drivers/media/video/au0828/au0828-dvb.c
--- a/linux/drivers/media/video/au0828/au0828-dvb.c Sun Jul 27 17:11:28
2008 -0400
+++ b/linux/drivers/media/video/au0828/au0828-dvb.c Sun Jul 27 17:13:20
2008 -0400
@@ -30,6 +30,7 @@
#include au8522.h
#include xc5000.h
#include mxl5007t.h
+#include tda18271.h
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
@@ -39,6 +40,13 @@ static struct au8522_config hauppauge_hv
static struct au8522_config hauppauge_hvr950q_config = {
.demod_address = 0x8e 1,
.status_mode = AU8522_DEMODLOCKING,
+};
+
+static struct au8522_config hauppauge_woodbury_config = {
+ .demod_address = 0x8e 1,
+ .status_mode = AU8522_DEMODLOCKING,
+ .qam_if= AU8522_IF_4MHZ,
+ .vsb_if= AU8522_IF_3_25MHZ,
};
[linuxtv-commits] [hg:v4l-dvb] media/video/Kconfig: fix a typo
The patch number 8558 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] media/video/Kconfig: fix a typo Thanks to Hermann Gausterer for pointing this issue. Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/Kconfig |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r 737a00109ede -r 02bfc69e3849 linux/drivers/media/video/Kconfig --- a/linux/drivers/media/video/Kconfig Mon Jul 28 13:10:41 2008 -0300 +++ b/linux/drivers/media/video/Kconfig Mon Jul 28 18:07:35 2008 -0300 @@ -630,7 +630,7 @@ config VIDEO_ZORAN_ZR36060 depends on VIDEO_ZORAN help Say Y to support Zoran boards based on 36060 chips. - This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33 + This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33 and 33 R10 and AverMedia 6 boards. config VIDEO_ZORAN_BUZ --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/02bfc69e384986b9ce6f5a87333a692245e3fa85 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
