Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits)
  V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.
  V4L/DVB (12004): poll method lose race condition
  V4L/DVB (11894): flexcop-pci: dmesg visible names broken
  V4L/DVB (11892): Siano: smsendian - declare function as extern
  V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol
  V4L/DVB (11890): Siano: smscore - remove redundant code
  V4L/DVB (11889): Siano: smsdvb - add DVB v3 events
  V4L/DVB (11888): Siano: smsusb - remove redundant ifdef
  V4L/DVB (11887): Siano: smscards - add board (target) events
  V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names
  V4L/DVB (11885): Siano: Add new GPIO management interface
  V4L/DVB (11884): Siano: smssdio - revert to stand alone module
  V4L/DVB (11883): Siano: cards - add two additional (USB) devices
  V4L/DVB (11824): Siano: smsusb - change exit func debug msg
  V4L/DVB (11823): Siano: smsusb - fix typo in module description
  V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode
  V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name
  V4L/DVB (11820): Siano: smscore - fix byte ordering bug
  V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug
  V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets
  ...

1 files changed, 84 insertions, 34 deletions

diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 8a106d36e723..6e219c2db841 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -60,7 +60,7 @@ MODULE_PARM_DESC(disable_other_ir, "disable full codes of "
 #define dprintk(fmt, arg...)    if (ir_debug) \
         printk(KERN_DEBUG "%s/ir: " fmt, dev->name , ## arg)
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
-        printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
+        printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg)
 
 /* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */
 static int saa7134_rc5_irq(struct saa7134_dev *dev);
@@ -134,10 +134,10 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
         int gpio;
 
         /* <dev> is needed to access GPIO. Used by the saa_readl macro. */
-        struct saa7134_dev *dev = ir->c.adapter->algo_data;
+        struct saa7134_dev *dev = ir->c->adapter->algo_data;
         if (dev == NULL) {
                 dprintk("get_key_msi_tvanywhere_plus: "
-                        "gir->c.adapter->algo_data is NULL!\n");
+                        "gir->c->adapter->algo_data is NULL!\n");
                 return -EIO;
         }
 
@@ -156,7 +156,7 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
 
         /* GPIO says there is a button press. Get it. */
 
-        if (1 != i2c_master_recv(&ir->c, &b, 1)) {
+        if (1 != i2c_master_recv(ir->c, &b, 1)) {
                 i2cdprintk("read error\n");
                 return -EIO;
         }
@@ -179,7 +179,7 @@ static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         unsigned char b;
 
         /* poll IR chip */
-        if (1 != i2c_master_recv(&ir->c,&b,1)) {
+        if (1 != i2c_master_recv(ir->c, &b, 1)) {
                 i2cdprintk("read error\n");
                 return -EIO;
         }
@@ -202,7 +202,7 @@ static int get_key_hvr1110(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         unsigned char buf[5], cod4, code3, code4;
 
         /* poll IR chip */
-        if (5 != i2c_master_recv(&ir->c,buf,5))
+        if (5 != i2c_master_recv(ir->c, buf, 5))
                 return -EIO;
 
         cod4    = buf[4];
@@ -224,7 +224,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         unsigned char data[12];
         u32 gpio;
 
-        struct saa7134_dev *dev = ir->c.adapter->algo_data;
+        struct saa7134_dev *dev = ir->c->adapter->algo_data;
 
         /* rising SAA7134_GPIO_GPRESCAN reads the status */
         saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
@@ -235,9 +235,9 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
         if (0x400000 & ~gpio)
                 return 0; /* No button press */
 
-        ir->c.addr = 0x5a >> 1;
+        ir->c->addr = 0x5a >> 1;
 
-        if (12 != i2c_master_recv(&ir->c, data, 12)) {
+        if (12 != i2c_master_recv(ir->c, data, 12)) {
                 i2cdprintk("read error\n");
                 return -EIO;
         }
@@ -267,7 +267,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
         unsigned int start = 0,parity = 0,code = 0;
 
         /* poll IR chip */
-        if (4 != i2c_master_recv(&ir->c, b, 4)) {
+        if (4 != i2c_master_recv(ir->c, b, 4)) {
                 i2cdprintk("read error\n");
                 return -EIO;
         }
@@ -447,6 +447,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
         case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
         case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
+        case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
         case SAA7134_BOARD_AVERMEDIA_M102:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
@@ -506,7 +507,10 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_407FM:
         case SAA7134_BOARD_BEHOLD_409:
         case SAA7134_BOARD_BEHOLD_505FM:
+        case SAA7134_BOARD_BEHOLD_505RDS:
         case SAA7134_BOARD_BEHOLD_507_9FM:
+        case SAA7134_BOARD_BEHOLD_507RDS_MK3:
+        case SAA7134_BOARD_BEHOLD_507RDS_MK5:
                 ir_codes     = ir_codes_manli;
                 mask_keycode = 0x003f00;
                 mask_keyup   = 0x004000;
@@ -678,55 +682,101 @@ void saa7134_input_fini(struct saa7134_dev *dev)
         dev->remote = NULL;
 }
 
-void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
+void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
 {
+        struct i2c_board_info info;
+        struct IR_i2c_init_data init_data;
+        const unsigned short addr_list[] = {
+                0x7a, 0x47, 0x71, 0x2d,
+                I2C_CLIENT_END
+        };
+
+        struct i2c_msg msg_msi = {
+                .addr = 0x50,
+                .flags = I2C_M_RD,
+                .len = 0,
+                .buf = NULL,
+        };
+
+        int rc;
+
         if (disable_ir) {
-                dprintk("Found supported i2c remote, but IR has been disabled\n");
-                ir->get_key=NULL;
+                dprintk("IR has been disabled, not probing for i2c remote\n");
                 return;
         }
 
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        memset(&init_data, 0, sizeof(struct IR_i2c_init_data));
+        strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+
         switch (dev->board) {
         case SAA7134_BOARD_PINNACLE_PCTV_110i:
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
-                snprintf(ir->c.name, sizeof(ir->c.name), "Pinnacle PCTV");
+                init_data.name = "Pinnacle PCTV";
                 if (pinnacle_remote == 0) {
-                        ir->get_key   = get_key_pinnacle_color;
-                        ir->ir_codes = ir_codes_pinnacle_color;
+                        init_data.get_key = get_key_pinnacle_color;
+                        init_data.ir_codes = ir_codes_pinnacle_color;
                 } else {
-                        ir->get_key   = get_key_pinnacle_grey;
-                        ir->ir_codes = ir_codes_pinnacle_grey;
+                        init_data.get_key = get_key_pinnacle_grey;
+                        init_data.ir_codes = ir_codes_pinnacle_grey;
                 }
                 break;
         case SAA7134_BOARD_UPMOST_PURPLE_TV:
-                snprintf(ir->c.name, sizeof(ir->c.name), "Purple TV");
-                ir->get_key   = get_key_purpletv;
-                ir->ir_codes  = ir_codes_purpletv;
+                init_data.name = "Purple TV";
+                init_data.get_key = get_key_purpletv;
+                init_data.ir_codes = ir_codes_purpletv;
                 break;
         case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
-                snprintf(ir->c.name, sizeof(ir->c.name), "MSI TV@nywhere Plus");
-                ir->get_key  = get_key_msi_tvanywhere_plus;
-                ir->ir_codes = ir_codes_msi_tvanywhere_plus;
+                init_data.name = "MSI TV@nywhere Plus";
+                init_data.get_key = get_key_msi_tvanywhere_plus;
+                init_data.ir_codes = ir_codes_msi_tvanywhere_plus;
+                info.addr = 0x30;
+                /* MSI TV@nywhere Plus controller doesn't seem to
+                   respond to probes unless we read something from
+                   an existing device. Weird...
+                   REVISIT: might no longer be needed */
+                rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
+                dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
+                        msg_msi.addr, dev->i2c_adap.name,
+                        (1 == rc) ? "yes" : "no");
                 break;
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
-                snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110");
-                ir->get_key   = get_key_hvr1110;
-                ir->ir_codes  = ir_codes_hauppauge_new;
-                break;
-        case SAA7134_BOARD_BEHOLD_607_9FM:
+                init_data.name = "HVR 1110";
+                init_data.get_key = get_key_hvr1110;
+                init_data.ir_codes = ir_codes_hauppauge_new;
+                break;
+        case SAA7134_BOARD_BEHOLD_607FM_MK3:
+        case SAA7134_BOARD_BEHOLD_607FM_MK5:
+        case SAA7134_BOARD_BEHOLD_609FM_MK3:
+        case SAA7134_BOARD_BEHOLD_609FM_MK5:
+        case SAA7134_BOARD_BEHOLD_607RDS_MK3:
+        case SAA7134_BOARD_BEHOLD_607RDS_MK5:
+        case SAA7134_BOARD_BEHOLD_609RDS_MK3:
+        case SAA7134_BOARD_BEHOLD_609RDS_MK5:
         case SAA7134_BOARD_BEHOLD_M6:
         case SAA7134_BOARD_BEHOLD_M63:
         case SAA7134_BOARD_BEHOLD_M6_EXTRA:
         case SAA7134_BOARD_BEHOLD_H6:
-                snprintf(ir->c.name, sizeof(ir->c.name), "BeholdTV");
-                ir->get_key   = get_key_beholdm6xx;
-                ir->ir_codes  = ir_codes_behold;
+                init_data.name = "BeholdTV";
+                init_data.get_key = get_key_beholdm6xx;
+                init_data.ir_codes = ir_codes_behold;
                 break;
-        default:
-                dprintk("Shouldn't get here: Unknown board %x for I2C IR?\n",dev->board);
+        case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
+        case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
+                info.addr = 0x40;
                 break;
         }
 
+        if (init_data.name)
+                info.platform_data = &init_data;
+        /* No need to probe if address is known */
+        if (info.addr) {
+                i2c_new_device(&dev->i2c_adap, &info);
+                return;
+        }
+
+        /* Address not known, fallback to probing */
+        i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
 }
 
 static int saa7134_rc5_irq(struct saa7134_dev *dev)