From patchwork Fri Jul 17 20:49:55 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: 36089
X-Patchwork-Delegate: dougsland@redhat.com
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6HKmHF6024693
	for <patchwork-media@patchwork.kernel.org>;
	Fri, 17 Jul 2009 20:48:17 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754340AbZGQUsP (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Fri, 17 Jul 2009 16:48:15 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756878AbZGQUsP
	(ORCPT <rfc822;linux-media-outgoing>);
	Fri, 17 Jul 2009 16:48:15 -0400
Received: from mail1.radix.net ([207.192.128.31]:37826 "EHLO mail1.radix.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754340AbZGQUsP (ORCPT <rfc822;linux-media@vger.kernel.org>);
	Fri, 17 Jul 2009 16:48:15 -0400
Received: from [192.168.1.2] (01-094.155.popsite.net [66.217.131.94])
	(authenticated bits=0)
	by mail1.radix.net (8.13.4/8.13.4) with ESMTP id n6HKlkAo024570;
	Fri, 17 Jul 2009 16:47:47 -0400 (EDT)
Subject: [PATCH 3/3] ir-kbd-i2c: Add support for Z8F0811/Hauppage IR
	transceivers
From: Andy Walls <awalls@radix.net>
To: Jean Delvare <khali@linux-fr.org>
Cc: linux-media@vger.kernel.org, Jarod Wilson <jarod@redhat.com>,
	Mark Lord <lkml@rtr.ca>, Mike Isely <isely@pobox.com>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Janne Grunau <j@jannau.net>
In-Reply-To: <1247862585.10066.16.camel@palomino.walls.org>
References: <1247862585.10066.16.camel@palomino.walls.org>
Date: Fri, 17 Jul 2009 16:49:55 -0400
Message-Id: <1247863795.10066.36.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.

Regards,
Andy
---
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 d754a2d5a376 linux/drivers/media/video/ir-kbd-i2c.c
--- a/linux/drivers/media/video/ir-kbd-i2c.c	Wed Jul 15 07:28:02 2009 -0300
+++ b/linux/drivers/media/video/ir-kbd-i2c.c	Fri Jul 17 16:05:28 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 +726,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 },
 	{ }
 };