From patchwork Thu Feb 4 02:43:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 76886 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o142i2eJ028408 for ; Thu, 4 Feb 2010 02:44:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753674Ab0BDCoB (ORCPT ); Wed, 3 Feb 2010 21:44:01 -0500 Received: from bombadil.infradead.org ([18.85.46.34]:43160 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280Ab0BDCn7 (ORCPT ); Wed, 3 Feb 2010 21:43:59 -0500 Received: from 200-158-193-135.dsl.telesp.net.br ([200.158.193.135] helo=[192.168.30.170]) by bombadil.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux)) id 1NcrhD-0007lg-Ii; Thu, 04 Feb 2010 02:43:56 +0000 Message-ID: <4B6A3468.3070700@infradead.org> Date: Thu, 04 Feb 2010 00:43:52 -0200 From: Mauro Carvalho Chehab User-Agent: Thunderbird 2.0.0.22 (X11/20090609) MIME-Version: 1.0 To: Stefan Ringel CC: Devin Heitmueller , linux-media@vger.kernel.org Subject: Re: [PATCH 14/15] - zl10353 References: <4B673790.3030706@arcor.de> <4B675B19.3080705@redhat.com> <4B685FB9.1010805@arcor.de> <4B688507.606@redhat.com> <4B688E41.2050806@arcor.de> <4B689094.2070204@redhat.com> <4B6894FE.6010202@arcor.de> <4B69D83D.5050809@arcor.de> <4B69D8CC.2030008@arcor.de> <4B69DEDA.3020200@arcor.de> <829197381002031249w5542bccfpccfa8554e7c6b280@mail.gmail.com> <4B69E575.5010201@arcor.de> In-Reply-To: <4B69E575.5010201@arcor.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Feb 2010 02:44:02 +0000 (UTC) diff --git a/linux/drivers/media/dvb/frontends/zl10353.c b/linux/drivers/media/dvb/frontends/zl10353.c --- a/linux/drivers/media/dvb/frontends/zl10353.c +++ b/linux/drivers/media/dvb/frontends/zl10353.c @@ -597,6 +597,10 @@ static int zl10353_init(struct dvb_front zl10353_read_register(state, 0x51) != zl10353_reset_attach[2]) { rc = zl10353_write(fe, zl10353_reset_attach, sizeof(zl10353_reset_attach)); + + if (state->i2c->id == I2C_HW_B_TM6000) { + /* Do special init needed by tm6000 driver */ + } #if 1 if (debug_regs) zl10353_dump_regs(fe); diff --git a/linux/drivers/staging/tm6000/tm6000-i2c.c b/linux/drivers/staging/tm6000/tm6000-i2c.c --- a/linux/drivers/staging/tm6000/tm6000-i2c.c +++ b/linux/drivers/staging/tm6000/tm6000-i2c.c @@ -33,8 +33,6 @@ #include "tuner-xc2028.h" -/*FIXME: Hack to avoid needing to patch i2c-id.h */ -#define I2C_HW_B_TM6000 I2C_HW_B_EM28XX /* ----------------------------------------------------------- */ static unsigned int i2c_debug = 0; diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -42,6 +42,7 @@ #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ #define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */ #define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */ +#define I2C_HW_B_TM6000 0x010026 /* TM5600/6000/6010 video bridge */ /* --- SGI adapters */ #define I2C_HW_SGI_VINO 0x160000