diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-05 07:54:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:31 -0500 |
commit | 74f38a82376fb1b289d0957429ba45349f0cad62 (patch) | |
tree | 4d887f3bd985b0426e18ec8bec11cdb17080d181 /drivers/media/video/em28xx/em28xx.h | |
parent | 539c96d0fd86bfdcfac75c88b74aa5798439293d (diff) |
V4L/DVB (6948): HVR950 requires additional settings for audio to properly work
Thanks to Markus Rechberger <mrechberger@gmail.com> for retriving those
commands.
Also, MTS firmware is required for audio to work on HVR950.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index abde13ecb4a8..1fb3c230e232 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -178,12 +178,13 @@ struct em28xx_board { | |||
178 | int tuner_type; | 178 | int tuner_type; |
179 | 179 | ||
180 | /* i2c flags */ | 180 | /* i2c flags */ |
181 | unsigned int is_em2800; | ||
182 | unsigned int tda9887_conf; | 181 | unsigned int tda9887_conf; |
183 | 182 | ||
183 | unsigned int is_em2800:1; | ||
184 | unsigned int has_tuner:1; | 184 | unsigned int has_tuner:1; |
185 | unsigned int has_msp34xx:1; | 185 | unsigned int has_msp34xx:1; |
186 | unsigned int mts_firmware:1; | 186 | unsigned int mts_firmware:1; |
187 | unsigned int analog_gpio; | ||
187 | 188 | ||
188 | enum em28xx_decoder decoder; | 189 | enum em28xx_decoder decoder; |
189 | 190 | ||
@@ -217,15 +218,16 @@ struct em28xx { | |||
217 | char name[30]; /* name (including minor) of the device */ | 218 | char name[30]; /* name (including minor) of the device */ |
218 | int model; /* index in the device_data struct */ | 219 | int model; /* index in the device_data struct */ |
219 | int devno; /* marks the number of this device */ | 220 | int devno; /* marks the number of this device */ |
220 | unsigned int is_em2800; | 221 | unsigned int analog_gpio; |
221 | int video_inputs; /* number of video inputs */ | 222 | unsigned int is_em2800:1; |
222 | struct list_head devlist; | ||
223 | unsigned int has_tuner:1; | 223 | unsigned int has_tuner:1; |
224 | unsigned int has_msp34xx:1; | 224 | unsigned int has_msp34xx:1; |
225 | unsigned int has_tda9887:1; | 225 | unsigned int has_tda9887:1; |
226 | |||
227 | unsigned int stream_on:1; /* Locks streams */ | 226 | unsigned int stream_on:1; /* Locks streams */ |
228 | 227 | ||
228 | int video_inputs; /* number of video inputs */ | ||
229 | struct list_head devlist; | ||
230 | |||
229 | u32 i2s_speed; /* I2S speed for audio digital stream */ | 231 | u32 i2s_speed; /* I2S speed for audio digital stream */ |
230 | 232 | ||
231 | enum em28xx_decoder decoder; | 233 | enum em28xx_decoder decoder; |
@@ -351,6 +353,7 @@ extern const unsigned int em28xx_bcount; | |||
351 | #define EM2800_AUDIOSRC_REG 0x08 | 353 | #define EM2800_AUDIOSRC_REG 0x08 |
352 | 354 | ||
353 | /* em28xx registers */ | 355 | /* em28xx registers */ |
356 | #define I2C_CLK_REG 0x06 | ||
354 | #define CHIPID_REG 0x0a | 357 | #define CHIPID_REG 0x0a |
355 | #define USBSUSP_REG 0x0c /* */ | 358 | #define USBSUSP_REG 0x0c /* */ |
356 | 359 | ||