diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-01 08:25:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:32 -0400 |
commit | 897ea1307b40a17cb2d6b8d458eaa1573bf1a45e (patch) | |
tree | add369021b910b1fd63b0159880ec0733df7bee4 | |
parent | f70a7a918adeebe6be4a72742bff9399210c7541 (diff) |
V4L/DVB (4513): Split audio decoders from bttv
Several audio decoders were just bound as if they were part of
bttv driver. In fact, they are generic enough to be used by other
drivers as well, since they use I2C event bus to communicate.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/Kconfig | 28 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 5 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/Kconfig | 3 |
3 files changed, 35 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 272b0e0daf2a..82ca9ab75aa8 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -338,6 +338,34 @@ config VIDEO_M32R_AR_M64278 | |||
338 | menu "Encoders and Decoders" | 338 | menu "Encoders and Decoders" |
339 | depends on VIDEO_DEV | 339 | depends on VIDEO_DEV |
340 | 340 | ||
341 | config VIDEO_TVAUDIO | ||
342 | tristate "Support for several audio decoder chips found on bt8xx boards" | ||
343 | depends on VIDEO_DEV && I2C | ||
344 | ---help--- | ||
345 | Support for several audio decoder chips found on some bt8xx boards: | ||
346 | tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54. | ||
347 | |||
348 | To compile this driver as a module, choose M here: the | ||
349 | module will be called tvaudio. | ||
350 | |||
351 | config VIDEO_TDA7432 | ||
352 | tristate "Support for tda7432 chip" | ||
353 | depends on VIDEO_DEV && I2C | ||
354 | ---help--- | ||
355 | Support for tda7432 audio decoder chip found on some bt8xx boards. | ||
356 | |||
357 | To compile this driver as a module, choose M here: the | ||
358 | module will be called tda7432. | ||
359 | |||
360 | config VIDEO_TDA9875 | ||
361 | tristate "Support for tda9875 chip" | ||
362 | depends on VIDEO_DEV && I2C | ||
363 | ---help--- | ||
364 | Support for tda9875 audio decoder chip found on some bt8xx boards. | ||
365 | |||
366 | To compile this driver as a module, choose M here: the | ||
367 | module will be called tda9875. | ||
368 | |||
341 | config VIDEO_MSP3400 | 369 | config VIDEO_MSP3400 |
342 | tristate "Micronas MSP34xx audio decoders" | 370 | tristate "Micronas MSP34xx audio decoders" |
343 | depends on VIDEO_DEV && I2C | 371 | depends on VIDEO_DEV && I2C |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 231f62b5715c..d2753d10745d 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -17,7 +17,10 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y) | |||
17 | endif | 17 | endif |
18 | 18 | ||
19 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | 19 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ |
20 | obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o | 20 | obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o |
21 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o | ||
22 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o | ||
23 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o | ||
21 | obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o | 24 | obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o |
22 | 25 | ||
23 | obj-$(CONFIG_VIDEO_ZR36120) += zoran.o | 26 | obj-$(CONFIG_VIDEO_ZR36120) += zoran.o |
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig index cdcf55650714..7eb83d9f6cd9 100644 --- a/drivers/media/video/bt8xx/Kconfig +++ b/drivers/media/video/bt8xx/Kconfig | |||
@@ -9,6 +9,9 @@ config VIDEO_BT848 | |||
9 | select VIDEO_TUNER | 9 | select VIDEO_TUNER |
10 | select VIDEO_TVEEPROM | 10 | select VIDEO_TVEEPROM |
11 | select VIDEO_MSP3400 | 11 | select VIDEO_MSP3400 |
12 | select VIDEO_TVAUDIO | ||
13 | select VIDEO_TDA7432 | ||
14 | select VIDEO_TDA9875 | ||
12 | ---help--- | 15 | ---help--- |
13 | Support for BT848 based frame grabber/overlay boards. This includes | 16 | Support for BT848 based frame grabber/overlay boards. This includes |
14 | the Miro, Hauppauge and STB boards. Please read the material in | 17 | the Miro, Hauppauge and STB boards. Please read the material in |