Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6c0603 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

[media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip 



Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either
lirc_zilog or ir-kbd-i2c to use.  This is a required step in removing
lirc_zilog's use of the deprecated struct i2c_adapter.id field.

Signed-off-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 41ca2b1a

drivers/media/video/hdpvr/hdpvr-core.c

+5 −0
Original line number Diff line number Diff line
@@ -385,6 +385,11 @@ static int hdpvr_probe(struct usb_interface *interface, 
		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");

		goto error;

	}



	/* until i2c is working properly */

	retval = 0; /* hdpvr_register_i2c_ir(dev); */

	if (retval < 0)

		v4l2_err(&dev->v4l2_dev, "registering i2c IR devices failed\n");

#endif /* CONFIG_I2C */



	/* let the user know what node this device is now attached to */

drivers/media/video/hdpvr/hdpvr-i2c.c

+53 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
 *

 * Copyright (C) 2008      Janne Grunau (j@jannau.net)

 *

 * IR device registration code is

 * Copyright (C) 2010	Andy Walls <awalls@md.metrocast.net>

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License as

 *	published by the Free Software Foundation, version 2.
@@ -22,6 +25,56 @@ 
#define REQTYPE_I2C_WRITE	0xb0

#define REQTYPE_I2C_WRITE_STATT	0xd0



#define Z8F0811_IR_TX_I2C_ADDR	0x70

#define Z8F0811_IR_RX_I2C_ADDR	0x71



static const u8 ir_i2c_addrs[] = {

	Z8F0811_IR_TX_I2C_ADDR,

	Z8F0811_IR_RX_I2C_ADDR,

};



static const char * const ir_devicenames[] = {

	"ir_tx_z8f0811_hdpvr",

	"ir_rx_z8f0811_hdpvr",

};



static int hdpvr_new_i2c_ir(struct hdpvr_device *dev, struct i2c_adapter *adap,

			    const char *type, u8 addr)

{

	struct i2c_board_info info;

	struct IR_i2c_init_data *init_data = &dev->ir_i2c_init_data;

	unsigned short addr_list[2] = { addr, I2C_CLIENT_END };



	memset(&info, 0, sizeof(struct i2c_board_info));

	strlcpy(info.type, type, I2C_NAME_SIZE);



	/* Our default information for ir-kbd-i2c.c to use */

	switch (addr) {

	case Z8F0811_IR_RX_I2C_ADDR:

		init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;

		init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;

		init_data->type = RC_TYPE_RC5;

		init_data->name = "HD PVR";

		info.platform_data = init_data;

		break;

	}



	return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ?

	       -1 : 0;

}



int hdpvr_register_i2c_ir(struct hdpvr_device *dev)

{

	int i;

	int ret = 0;



	for (i = 0; i < ARRAY_SIZE(ir_i2c_addrs); i++)

		ret += hdpvr_new_i2c_ir(dev, dev->i2c_adapter,

					ir_devicenames[i], ir_i2c_addrs[i]);



	return ret;

}



static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,

			  char *data, int len)

{

drivers/media/video/hdpvr/hdpvr.h

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/videodev2.h>



#include <media/v4l2-device.h>

#include <media/ir-kbd-i2c.h>



#define HDPVR_MAJOR_VERSION 0

#define HDPVR_MINOR_VERSION 2
@@ -109,6 +110,9 @@ struct hdpvr_device { 
	/* I2C lock */

	struct mutex		i2c_mutex;



	/* For passing data to ir-kbd-i2c */

	struct IR_i2c_init_data	ir_i2c_init_data;



	/* usb control transfer buffer and lock */

	struct mutex		usbc_mutex;

	u8			*usbc_buf;
@@ -306,6 +310,8 @@ int hdpvr_cancel_queue(struct hdpvr_device *dev); 
/* i2c adapter registration */

int hdpvr_register_i2c_adapter(struct hdpvr_device *dev);



int hdpvr_register_i2c_ir(struct hdpvr_device *dev);



/*========================================================================*/

/* buffer management */

int hdpvr_free_buffers(struct hdpvr_device *dev);