V4L/DVB (4205): Merge tda9887 module into tuner.

Most uses a tda988[5/6/7] IF demodulator as part of the device.
Having this as a separate stuff makes harder to configure it, since there
are some tda9887 options that are tuner-dependent and should be bound into
tuner-types structures.
This patch merges tda9887 module into tuner. More work is required to make
tuner-types to properly use it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index fce30d341887..d829d8f8c1f6 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -425,9 +425,19 @@ static int attach_inform(struct i2c_client *client)
         struct em28xx *dev = client->adapter->algo_data;
 
         switch (client->addr << 1) {
-                case 0x86:
+                case 0x43:
+                case 0x4b:
+                {
+                        struct tuner_setup tun_setup;
+
+                        tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
+                        tun_setup.type = TUNER_TDA9887;
+                        tun_setup.addr = client->addr;
+
+                        em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
                         em28xx_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
                         break;
+                }
                 case 0x42:
                         dprintk1(1,"attach_inform: saa7114 detected.\n");
                         break;
@@ -453,6 +463,7 @@ static int attach_inform(struct i2c_client *client)
                 case 0xba:
                         dprintk1(1,"attach_inform: tvp5150 detected.\n");
                         break;
+
                 default:
                         dprintk1(1,"attach inform: detected I2C address %x\n", client->addr << 1);
                         dev->tuner_addr = client->addr;