From patchwork Fri Mar 19 13:42:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 86939 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 o2JDgwrW026324 for ; Fri, 19 Mar 2010 13:42:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420Ab0CSNm5 (ORCPT ); Fri, 19 Mar 2010 09:42:57 -0400 Received: from poutre.nerim.net ([62.4.16.124]:54301 "EHLO poutre.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752297Ab0CSNm4 (ORCPT ); Fri, 19 Mar 2010 09:42:56 -0400 Received: from localhost (localhost [127.0.0.1]) by poutre.nerim.net (Postfix) with ESMTP id 7E88539DFFC; Fri, 19 Mar 2010 14:42:53 +0100 (CET) X-Virus-Scanned: amavisd-new at nerim.net Received: from poutre.nerim.net ([127.0.0.1]) by localhost (poutre.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iWHQeXGUF4DD; Fri, 19 Mar 2010 14:42:50 +0100 (CET) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by poutre.nerim.net (Postfix) with ESMTP id 1DE9139DFFE; Fri, 19 Mar 2010 14:42:50 +0100 (CET) Date: Fri, 19 Mar 2010 14:42:50 +0100 From: Jean Delvare To: Andy Walls , Mauro Carvalho Chehab Cc: Dmitri Belimov , linux-media@vger.kernel.org, "Timothy D. Lenz" Subject: [PATCH] FusionHDTV: Use quick reads for I2C IR device probing Message-ID: <20100319144250.5553055c@hyperion.delvare> In-Reply-To: <20100316120502.3a9323ac@hyperion.delvare> References: <20100301153645.5d529766@glory.loctelecom.ru> <1267442919.3110.20.camel@palomino.walls.org> <20100316120502.3a9323ac@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-linux-gnu) Mime-Version: 1.0 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]); Fri, 19 Mar 2010 13:42:59 +0000 (UTC) --- linux-2.6.34-rc1.orig/drivers/media/video/cx23885/cx23885-i2c.c 2010-02-25 09:10:33.000000000 +0100 +++ linux-2.6.34-rc1/drivers/media/video/cx23885/cx23885-i2c.c 2010-03-18 13:33:05.000000000 +0100 @@ -365,7 +365,17 @@ int cx23885_i2c_register(struct cx23885_ memset(&info, 0, sizeof(struct i2c_board_info)); strlcpy(info.type, "ir_video", I2C_NAME_SIZE); - i2c_new_probed_device(&bus->i2c_adap, &info, addr_list); + /* + * We can't call i2c_new_probed_device() because it uses + * quick writes for probing and the IR receiver device only + * replies to reads. + */ + if (i2c_smbus_xfer(&bus->i2c_adap, addr_list[0], 0, + I2C_SMBUS_READ, 0, I2C_SMBUS_QUICK, + NULL) >= 0) { + info.addr = addr_list[0]; + i2c_new_device(&bus->i2c_adap, &info); + } } return bus->i2c_rc; --- linux-2.6.34-rc1.orig/drivers/media/video/cx88/cx88-i2c.c 2010-02-25 09:08:40.000000000 +0100 +++ linux-2.6.34-rc1/drivers/media/video/cx88/cx88-i2c.c 2010-03-18 13:33:05.000000000 +0100 @@ -188,10 +188,24 @@ int cx88_i2c_init(struct cx88_core *core 0x18, 0x6b, 0x71, I2C_CLIENT_END }; + const unsigned short *addrp; memset(&info, 0, sizeof(struct i2c_board_info)); strlcpy(info.type, "ir_video", I2C_NAME_SIZE); - i2c_new_probed_device(&core->i2c_adap, &info, addr_list); + /* + * We can't call i2c_new_probed_device() because it uses + * quick writes for probing and at least some R receiver + * devices only reply to reads. + */ + for (addrp = addr_list; *addrp != I2C_CLIENT_END; addrp++) { + if (i2c_smbus_xfer(&core->i2c_adap, *addrp, 0, + I2C_SMBUS_READ, 0, + I2C_SMBUS_QUICK, NULL) >= 0) { + info.addr = *addrp; + i2c_new_device(&core->i2c_adap, &info); + break; + } + } } return core->i2c_rc; }