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

Commit a8c26dfe authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9201): bt856: convert i2c driver for new i2c API 



- Convert to use v4l2-i2c-drv-legacy.h to be able to handle the new i2c API
- Cleanups
- Use v4l_dbg/v4l_info to have uniform kernel messages

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7fd011fb

drivers/media/video/bt856.c

+49 −169
Original line number Diff line number Diff line
@@ -29,43 +29,24 @@ 
 */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/kernel.h>

#include <linux/major.h>

#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/signal.h>

#include <linux/types.h>

#include <linux/i2c.h>

#include <linux/video_encoder.h>

#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <linux/ioctl.h>

#include <asm/uaccess.h>



#include <linux/i2c.h>

#include <linux/i2c-id.h>

#include <linux/videodev.h>

#include <linux/video_encoder.h>

#include <media/v4l2-common.h>

#include <media/v4l2-i2c-drv-legacy.h>



MODULE_DESCRIPTION("Brooktree-856A video encoder driver");

MODULE_AUTHOR("Mike Bernson & Dave Perks");

MODULE_LICENSE("GPL");





#define I2C_NAME(s) (s)->name





static int debug;

module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-1)");



#define dprintk(num, format, args...) \

	do { \

		if (debug >= num) \

			printk(format, ##args); \

	} while (0)



/* ----------------------------------------------------------------------- */



#define BT856_REG_OFFSET	0xDA
@@ -78,14 +59,9 @@ struct bt856 { 
	int enable;

};



#define   I2C_BT856        0x88



/* ----------------------------------------------------------------------- */



static inline int

bt856_write (struct i2c_client *client,

	     u8                 reg,

	     u8                 value)

static inline int bt856_write(struct i2c_client *client, u8 reg, u8 value)

{

	struct bt856 *encoder = i2c_get_clientdata(client);
@@ -93,46 +69,36 @@ bt856_write (struct i2c_client *client, 
	return i2c_smbus_write_byte_data(client, reg, value);

}



static inline int

bt856_setbit (struct i2c_client *client,

	      u8                 reg,

	      u8                 bit,

	      u8                 value)

static inline int bt856_setbit(struct i2c_client *client, u8 reg, u8 bit, u8 value)

{

	struct bt856 *encoder = i2c_get_clientdata(client);



	return bt856_write(client, reg,

			   (encoder->

			    reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) |

		(encoder->reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) |

				(value ? (1 << bit) : 0));

}



static void

bt856_dump (struct i2c_client *client)

static void bt856_dump(struct i2c_client *client)

{

	int i;

	struct bt856 *encoder = i2c_get_clientdata(client);



	printk(KERN_INFO "%s: register dump:", I2C_NAME(client));

	v4l_info(client, "register dump:\n");

	for (i = 0; i < BT856_NR_REG; i += 2)

		printk(" %02x", encoder->reg[i]);

	printk("\n");

		printk(KERN_CONT " %02x", encoder->reg[i]);

	printk(KERN_CONT "\n");

}



/* ----------------------------------------------------------------------- */



static int

bt856_command (struct i2c_client *client,

	       unsigned int       cmd,

	       void              *arg)

static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	struct bt856 *encoder = i2c_get_clientdata(client);



	switch (cmd) {



	case 0:

		/* This is just for testing!!! */

		dprintk(1, KERN_INFO "bt856: init\n");

		v4l_dbg(1, debug, client, "init\n");

		bt856_write(client, 0xdc, 0x18);

		bt856_write(client, 0xda, 0);

		bt856_write(client, 0xde, 0);
@@ -142,7 +108,6 @@ bt856_command (struct i2c_client *client, 
		bt856_setbit(client, 0xdc, 4, 1);



		switch (encoder->norm) {



		case VIDEO_MODE_NTSC:

			bt856_setbit(client, 0xdc, 2, 0);

			break;
@@ -163,26 +128,23 @@ bt856_command (struct i2c_client *client, 
	{

		struct video_encoder_capability *cap = arg;



		dprintk(1, KERN_INFO "%s: get capabilities\n",

			I2C_NAME(client));

		v4l_dbg(1, debug, client, "get capabilities\n");



		cap->flags = VIDEO_ENCODER_PAL |

			     VIDEO_ENCODER_NTSC |

			     VIDEO_ENCODER_CCIR;

		cap->inputs = 2;

		cap->outputs = 1;

	}

		break;

	}



	case ENCODER_SET_NORM:

	{

		int *iarg = arg;



		dprintk(1, KERN_INFO "%s: set norm %d\n", I2C_NAME(client),

			*iarg);

		v4l_dbg(1, debug, client, "set norm %d\n", *iarg);



		switch (*iarg) {



		case VIDEO_MODE_NTSC:

			bt856_setbit(client, 0xdc, 2, 0);

			break;
@@ -195,27 +157,23 @@ bt856_command (struct i2c_client *client, 


		default:

			return -EINVAL;



		}

		encoder->norm = *iarg;

		if (debug != 0)

			bt856_dump(client);

	}

		break;

	}



	case ENCODER_SET_INPUT:

	{

		int *iarg = arg;



		dprintk(1, KERN_INFO "%s: set input %d\n", I2C_NAME(client),

			*iarg);

		v4l_dbg(1, debug, client, "set input %d\n", *iarg);



		/* We only have video bus.

		 * iarg = 0: input is from bt819

		 * iarg = 1: input is from ZR36060 */



		switch (*iarg) {



		case 0:

			bt856_setbit(client, 0xde, 4, 0);

			bt856_setbit(client, 0xde, 3, 1);
@@ -234,27 +192,24 @@ bt856_command (struct i2c_client *client, 
			break;

		default:

			return -EINVAL;



		}



		if (debug != 0)

			bt856_dump(client);

	}

		break;

	}



	case ENCODER_SET_OUTPUT:

	{

		int *iarg = arg;



		dprintk(1, KERN_INFO "%s: set output %d\n", I2C_NAME(client),

			*iarg);

		v4l_dbg(1, debug, client, "set output %d\n", *iarg);



		/* not much choice of outputs */

		if (*iarg != 0) {

		if (*iarg != 0)

			return -EINVAL;

		}

	}

		break;

	}



	case ENCODER_ENABLE_OUTPUT:

	{
@@ -262,10 +217,9 @@ bt856_command (struct i2c_client *client, 


		encoder->enable = !!*iarg;



		dprintk(1, KERN_INFO "%s: enable output %d\n",

			I2C_NAME(client), encoder->enable);

	}

		v4l_dbg(1, debug, client, "enable output %d\n", encoder->enable);

		break;

	}



	default:

		return -EINVAL;
@@ -276,64 +230,29 @@ bt856_command (struct i2c_client *client, 


/* ----------------------------------------------------------------------- */



/*

 * Generic i2c probe

 * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'

 */

static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END };

static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };



static unsigned short ignore = I2C_CLIENT_END;

I2C_CLIENT_INSMOD;



static struct i2c_client_address_data addr_data = {

	.normal_i2c		= normal_i2c,

	.probe			= &ignore,

	.ignore			= &ignore,

};



static struct i2c_driver i2c_driver_bt856;



static int

bt856_detect_client (struct i2c_adapter *adapter,

		     int                 address,

		     int                 kind)

static int bt856_probe(struct i2c_client *client,

			const struct i2c_device_id *id)

{

	int i;

	struct i2c_client *client;

	struct bt856 *encoder;



	dprintk(1,

		KERN_INFO

		"bt856.c: detecting bt856 client on address 0x%x\n",

		address << 1);



	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return 0;

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return -ENODEV;



	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);

	if (!client)

		return -ENOMEM;

	client->addr = address;

	client->adapter = adapter;

	client->driver = &i2c_driver_bt856;

	strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));

	v4l_info(client, "chip found @ 0x%x (%s)\n",

			client->addr << 1, client->adapter->name);



	encoder = kzalloc(sizeof(struct bt856), GFP_KERNEL);

	if (encoder == NULL) {

		kfree(client);

	if (encoder == NULL)

		return -ENOMEM;

	}

	encoder->norm = VIDEO_MODE_NTSC;

	encoder->enable = 1;

	i2c_set_clientdata(client, encoder);



	i = i2c_attach_client(client);

	if (i) {

		kfree(client);

		kfree(encoder);

		return i;

	}



	bt856_write(client, 0xdc, 0x18);

	bt856_write(client, 0xda, 0);

	bt856_write(client, 0xde, 0);
@@ -359,65 +278,26 @@ bt856_detect_client (struct i2c_adapter *adapter, 


	if (debug != 0)

		bt856_dump(client);



	dprintk(1, KERN_INFO "%s_attach: at address 0x%x\n", I2C_NAME(client),

		client->addr << 1);



	return 0;

}



static int

bt856_attach_adapter (struct i2c_adapter *adapter)

static int bt856_remove(struct i2c_client *client)

{

	dprintk(1,

		KERN_INFO

		"bt856.c: starting probe for adapter %s (0x%x)\n",

		I2C_NAME(adapter), adapter->id);

	return i2c_probe(adapter, &addr_data, &bt856_detect_client);

}



static int

bt856_detach_client (struct i2c_client *client)

{

	struct bt856 *encoder = i2c_get_clientdata(client);

	int err;



	err = i2c_detach_client(client);

	if (err) {

		return err;

	}



	kfree(encoder);

	kfree(client);



	kfree(i2c_get_clientdata(client));

	return 0;

}



/* ----------------------------------------------------------------------- */

static const struct i2c_device_id bt856_id[] = {

	{ "bt856", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, bt856_id);



static struct i2c_driver i2c_driver_bt856 = {

	.driver = {

static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "bt856",

	},



	.id = I2C_DRIVERID_BT856,



	.attach_adapter = bt856_attach_adapter,

	.detach_client = bt856_detach_client,

	.driverid = I2C_DRIVERID_BT856,

	.command = bt856_command,

	.probe = bt856_probe,

	.remove = bt856_remove,

	.id_table = bt856_id,

};
 


static int __init

bt856_init (void)

{

	return i2c_add_driver(&i2c_driver_bt856);

}



static void __exit

bt856_exit (void)

{

	i2c_del_driver(&i2c_driver_bt856);

}



module_init(bt856_init);

module_exit(bt856_exit);