From patchwork Wed Jul 22 01:33:50 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andy Walls <awalls@radix.net>
X-Patchwork-Id: 1354
Return-path: <linux-media-owner@vger.kernel.org>
Envelope-to: mchehab@infradead.org
Delivery-date: Wed, 22 Jul 2009 01:32:11 +0000
Received: from bombadil.infradead.org [18.85.46.34]
	by pedra.chehab.org with IMAP (fetchmail-6.3.6)
	for <mchehab@localhost> (single-drop);
	Tue, 21 Jul 2009 22:35:13 -0300 (BRT)
Received: from vger.kernel.org ([209.132.176.167])
	by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux))
	id 1MTQgl-0005Bc-CE; Wed, 22 Jul 2009 01:32:11 +0000
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750804AbZGVBcI (ORCPT <rfc822; kmpark@infradead.org> + 1 other);
	Tue, 21 Jul 2009 21:32:08 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751780AbZGVBcI
	(ORCPT <rfc822;linux-media-outgoing>);
	Tue, 21 Jul 2009 21:32:08 -0400
Received: from mail1.radix.net ([207.192.128.31]:56941 "EHLO mail1.radix.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750804AbZGVBcH (ORCPT <rfc822;linux-media@vger.kernel.org>);
	Tue, 21 Jul 2009 21:32:07 -0400
Received: from [192.168.1.2] (02-132.155.popsite.net [66.217.132.132])
	(authenticated bits=0)
	by mail1.radix.net (8.13.4/8.13.4) with ESMTP id n6M1VeTZ021807;
	Tue, 21 Jul 2009 21:31:41 -0400 (EDT)
Subject: [PATCH v2 4/4] ir-kbd-i2c: Add support for Z8F0811/Hauppage IR
	transceivers
From: Andy Walls <awalls@radix.net>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
	linux-media@vger.kernel.org
Cc: Jean Delvare <khali@linux-fr.org>, Mark Lord <lkml@rtr.ca>,
	Jarod Wilson <jarod@redhat.com>, Mike Isely <isely@pobox.com>,
	Hans Verkuil <hverkuil@xs4all.nl>, Janne Grunau <j@jannau.net>
Date: Tue, 21 Jul 2009 21:33:50 -0400
Message-Id: <1248226430.3191.65.camel@palomino.walls.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) 
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org

This patch adds support for Zilog Z8F0811 IR transceiver chips on
CX2341[68] based boards to ir-kbd-i2c for both the old i2c binding model
and the new i2c binding model.

Signed-off-by: Andy Walls <awalls@radix.net>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
---
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff -r 6477aa1782d5 linux/drivers/media/video/ir-kbd-i2c.c
--- a/linux/drivers/media/video/ir-kbd-i2c.c	Tue Jul 21 09:17:24 2009 -0300
+++ b/linux/drivers/media/video/ir-kbd-i2c.c	Tue Jul 21 20:55:54 2009 -0400
@@ -442,9 +442,11 @@
 	case 0x47:
 	case 0x71:
 	case 0x2d:
-		if (adap->id == I2C_HW_B_CX2388x) {
+		if (adap->id == I2C_HW_B_CX2388x ||
+		    adap->id == I2C_HW_B_CX2341X) {
 			/* Handled by cx88-input */
-			name        = "CX2388x remote";
+			name = adap->id == I2C_HW_B_CX2341X ? "CX2341x remote"
+							    : "CX2388x remote";
 			ir_type     = IR_TYPE_RC5;
 			ir->get_key = get_key_haup_xvr;
 			if (hauppauge == 1) {
@@ -697,7 +728,8 @@
 static const struct i2c_device_id ir_kbd_id[] = {
 	/* Generic entry for any IR receiver */
 	{ "ir_video", 0 },
-	/* IR device specific entries could be added here */
+	/* IR device specific entries should be added here */
+	{ "ir_rx_z8f0811_haup", 0 },
 	{ }
 };