[media] em28xx: add chip id of the em2765

This chip can be found in the SpeedLink VAD Laplace webcam (1ae7:9003 and 1ae7:9004).

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 033b6cb5fbe8f4bdddd4745d66a91933ea8ff245..54e0362d8e3db2af56786e802dea8e0f79d881e4 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3041,6 +3041,12 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
                case CHIP_ID_EM2750:
                        chip_name = "em2750";
                        break;
+               case CHIP_ID_EM2765:
+                       chip_name = "em2765";
+                       dev->wait_after_write = 0;
+                       dev->is_em25xx = 1;
+                       dev->eeprom_addrwidth_16bit = 1;
+                       break;
                case CHIP_ID_EM2820:
                        chip_name = "em2710/2820";
                        break;
@@ -3151,7 +3157,12 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 
        /* register i2c bus 1 */
        if (dev->def_i2c_bus) {
-               retval = em28xx_i2c_register(dev, 1, EM28XX_I2C_ALGO_EM28XX);
+               if (dev->is_em25xx)
+                       retval = em28xx_i2c_register(dev, 1,
+                                                 EM28XX_I2C_ALGO_EM25XX_BUS_B);
+               else
+                       retval = em28xx_i2c_register(dev, 1,
+                                                       EM28XX_I2C_ALGO_EM28XX);
                if (retval < 0) {
                        em28xx_errdev("%s: em28xx_i2c_register bus 1 - error [%d]!\n",
                                __func__, retval);

diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h
index 8fd3c7f802017d3d44625eb9104bb362b2d73d89..1b0ecd6acfe29e9624578722bf883af8a49f2d73 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/drivers/media/usb/em28xx/em28xx-reg.h
@@ -219,6 +219,7 @@ enum em28xx_chip_id {
        CHIP_ID_EM2860 = 34,
        CHIP_ID_EM2870 = 35,
        CHIP_ID_EM2883 = 36,
+       CHIP_ID_EM2765 = 54,
        CHIP_ID_EM2874 = 65,
        CHIP_ID_EM2884 = 68,
        CHIP_ID_EM28174 = 113,

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index aeee896f814961ec469d3b30cc0e03de6208e65f..7be008f2d8a159697924ff6fb47e59abe70a5f8e 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -482,6 +482,7 @@ struct em28xx {
        int model;              /* index in the device_data struct */
        int devno;              /* marks the number of this device */
        enum em28xx_chip_id chip_id;
+       unsigned int is_em25xx:1;       /* em25xx/em276x/7x/8x family bridge */
 
        unsigned char disconnected:1;   /* device has been diconnected */