From c7d29e2f530654aa0c323aafb94d42a6a718482c Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 18 Jan 2009 19:37:59 -0300
Subject: V4L/DVB (10249): v4l2-common: added v4l2_i2c_tuner_addrs()
Add v4l2_i2c_tuner_addrs() to obtain the various I2C tuner addresses.
This will be used in several drivers, so make this a common function
as we do not want to have these I2C addresses all over the place.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/video/saa7134/saa7134-core.c | 42 ++++++++++++------------------
1 file changed, 16 insertions(+), 26 deletions(-)
(limited to 'drivers/media/video/saa7134')
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index ac23ff53543d..829006ebdf34 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -980,35 +980,25 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
/* initialize hardware #2 */
if (TUNER_ABSENT != dev->tuner_type) {
- if (dev->radio_type != UNSET) {
- v4l2_i2c_new_subdev(&dev->i2c_adap, "tuner", "tuner",
- dev->radio_addr);
- }
- if (dev->tda9887_conf & TDA9887_PRESENT) {
- unsigned short addrs[] = { 0x42, 0x43, 0x4a, 0x4b,
- I2C_CLIENT_END };
+ int has_demod = (dev->tda9887_conf & TDA9887_PRESENT);
- v4l2_i2c_new_probed_subdev(&dev->i2c_adap,
- "tuner", "tuner", addrs);
- }
- if (dev->tuner_addr != ADDR_UNSET) {
+ /* Note: radio tuner address is always filled in,
+ so we do not need to probe for a radio tuner device. */
+ if (dev->radio_type != UNSET)
v4l2_i2c_new_subdev(&dev->i2c_adap,
- "tuner", "tuner", dev->tuner_addr);
+ "tuner", "tuner", dev->radio_addr);
+ if (has_demod)
+ v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
+ "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+ if (dev->tuner_addr == ADDR_UNSET) {
+ enum v4l2_i2c_tuner_type type =
+ has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
+
+ v4l2_i2c_new_probed_subdev(&dev->i2c_adap, "tuner",
+ "tuner", v4l2_i2c_tuner_addrs(type));
} else {
- unsigned short addrs[] = {
- 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */
- 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
- 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
- I2C_CLIENT_END
- };
-
- if (dev->tda9887_conf & TDA9887_PRESENT) {
- v4l2_i2c_new_probed_subdev(&dev->i2c_adap,
- "tuner", "tuner", addrs + 4);
- } else {
- v4l2_i2c_new_probed_subdev(&dev->i2c_adap,
- "tuner", "tuner", addrs);
- }
+ v4l2_i2c_new_subdev(&dev->i2c_adap,
+ "tuner", "tuner", dev->tuner_addr);
}
}
saa7134_board_init2(dev);
--
cgit v1.2.3