From patchwork Tue Mar 26 17:38:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17648 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UKXp9-0002ut-Ka; Tue, 26 Mar 2013 18:38:15 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1UKXp8-0000Xs-JB; Tue, 26 Mar 2013 18:38:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754300Ab3CZRh7 (ORCPT + 1 other); Tue, 26 Mar 2013 13:37:59 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:44498 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754477Ab3CZRh5 (ORCPT ); Tue, 26 Mar 2013 13:37:57 -0400 Received: by mail-bk0-f50.google.com with SMTP id jg1so339465bkc.23 for ; Tue, 26 Mar 2013 10:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=BenVLJSF3vSwGNQz+T9avw4cq/PhO4nwH97sbqrKFXo=; b=LRSfEPTCPraVB+YQIPpHuY8hvijViT2dfTAqh57w/1HJzCTh/iYWOuNLhv1XIyIWc5 WsW73dVRmikvEfrAhSvJ/MKY9NcZLfeIpCYX9xYNIH7+2U7aATCDZ+VgIDtrpKj4tFwf G8cnWDwIcBoPI7zM0dnYGp4dVmVlGwnhsBzqITXlAiXKtkMXcCaZwk10FkEoctpLf66g 58hgEUMaLVU3hiZHI4pMlLPicPYbAEDNQ/iaqnlAREig4pd6xhpyCjGnYGJbeP3Lemq1 To9Vnu734pFrS5KFOIhVjNOncOKNi205lt4Zgt5iFaH5qw5/Eowj87PNGvrcWpQ7e2XM 3qcw== X-Received: by 10.205.100.198 with SMTP id cx6mr8384515bkc.106.1364319475572; Tue, 26 Mar 2013 10:37:55 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-88-153-205-122.unitymediagroup.de. [88.153.205.122]) by mx.google.com with ESMTPS id gm14sm4366233bkc.7.2013.03.26.10.37.54 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 10:37:55 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH v3 2/5] em28xx: add chip id of the em2765 Date: Tue, 26 Mar 2013 18:38:37 +0100 Message-Id: <1364319520-6628-3-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364319520-6628-1-git-send-email-fschaefer.oss@googlemail.com> References: <1364319520-6628-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.26.172720 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This chip can be found in the SpeedLink VAD Laplace webcam (1ae7:9003 and 1ae7:9004). Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-cards.c | 13 ++++++++++++- drivers/media/usb/em28xx/em28xx-reg.h | 1 + drivers/media/usb/em28xx/em28xx.h | 1 + 3 Dateien geändert, 14 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 033b6cb..54e0362 100644 --- 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 8fd3c7f..1b0ecd6 100644 --- 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 aeee896..7be008f 100644 --- 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 */