From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 1 Sep 2006 12:25:30 +0000 (-0300)
Subject: V4L/DVB (4513): Split audio decoders from bttv
X-Git-Tag: v2.6.19-rc1~643^2~66
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=897ea1307b40a17cb2d6b8d458eaa1573bf1a45e;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 272b0e0daf2..82ca9ab75aa 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -338,6 +338,34 @@ config VIDEO_M32R_AR_M64278
 menu "Encoders and Decoders"
 	depends on VIDEO_DEV
 
+config VIDEO_TVAUDIO
+	tristate "Support for several audio decoder chips found on bt8xx boards"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for several audio decoder chips found on some bt8xx boards:
+		tda8425, tea6300, tea6420, tea9840, tda985x, tda9874, pic16c54.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tvaudio.
+
+config VIDEO_TDA7432
+	tristate "Support for tda7432 chip"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for tda7432 audio decoder chip found on some bt8xx boards.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tda7432.
+
+config VIDEO_TDA9875
+	tristate "Support for tda9875 chip"
+	depends on VIDEO_DEV && I2C
+	---help---
+	  Support for tda9875 audio decoder chip found on some bt8xx boards.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called tda9875.
+
 config VIDEO_MSP3400
 	tristate "Micronas MSP34xx audio decoders"
 	depends on VIDEO_DEV && I2C
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 231f62b5715..d2753d10745 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -17,7 +17,10 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
 endif
 
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
-obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
+obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
+obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
 obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o
 
 obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index cdcf5565071..7eb83d9f6cd 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -9,6 +9,9 @@ config VIDEO_BT848
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
 	select VIDEO_MSP3400
+	select VIDEO_TVAUDIO
+	select VIDEO_TDA7432
+	select VIDEO_TDA9875
 	---help---
 	  Support for BT848 based frame grabber/overlay boards. This includes
 	  the Miro, Hauppauge and STB boards. Please read the material in