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

Commit 0a63172a authored by Manjunath Hadli's avatar Manjunath Hadli Committed by Mauro Carvalho Chehab
Browse files

[media] davinci: vpif: make generic changes to re-use the vpif drivers on da850/omap-l138 soc 



change the dm646x specific strings in the driver to make
them generic across platforms. In this case change all the
strings which have a dm646x connotation to vpif which is a
platform independent ip.

Signed-off-by: default avatarManjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b1fc4230

drivers/media/video/davinci/vpif.c

+1 −1
Original line number Diff line number Diff line 
/*

 * vpif - DM646x Video Port Interface driver

 * vpif - Video Port Interface driver

 * VPIF is a receiver and transmitter for video data. It has two channels(0, 1)

 * that receiveing video byte stream and two channels(2, 3) for video output.

 * The hardware supports SDTV, HDTV formats, raw data capture.

drivers/media/video/davinci/vpif_capture.c

+4 −5
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ static int vpif_querycap(struct file *file, void *priv, 


	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));

	strlcpy(cap->bus_info, "DM646x Platform", sizeof(cap->bus_info));

	strlcpy(cap->bus_info, "VPIF Platform", sizeof(cap->bus_info));

	strlcpy(cap->card, config->card_name, sizeof(cap->card));



	return 0;
@@ -2190,7 +2190,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {

		for (i = res->start; i <= res->end; i++) {

			if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,

					"DM646x_Capture",

					"VPIF_Capture",

				(void *)(&vpif_obj.dev[k]->channel_id))) {

				err = -EBUSY;

				i--;
@@ -2219,7 +2219,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
		vfd->v4l2_dev = &vpif_obj.v4l2_dev;

		vfd->release = video_device_release;

		snprintf(vfd->name, sizeof(vfd->name),

			 "DM646x_VPIFCapture_DRIVER_V%s",

			 "VPIF_Capture_DRIVER_V%s",

			 VPIF_CAPTURE_VERSION);

		/* Set video_dev to the video device */

		ch->video_dev = vfd;
@@ -2278,8 +2278,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
			vpif_obj.sd[i]->grp_id = 1 << i;

	}



	v4l2_info(&vpif_obj.v4l2_dev,

			"DM646x VPIF capture driver initialized\n");

	v4l2_info(&vpif_obj.v4l2_dev, "VPIF capture driver initialized\n");

	return 0;



probe_subdev_out:

drivers/media/video/davinci/vpif_display.c

+7 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ MODULE_DESCRIPTION("TI DaVinci VPIF Display driver"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(VPIF_DISPLAY_VERSION);



#define DM646X_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)

#define VPIF_V4L2_STD (V4L2_STD_525_60 | V4L2_STD_625_50)



#define vpif_err(fmt, arg...)	v4l2_err(&vpif_obj.v4l2_dev, fmt, ## arg)

#define vpif_dbg(level, debug, fmt, arg...)	\
@@ -972,7 +972,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) 
	struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];

	int ret = 0;



	if (!(*std_id & DM646X_V4L2_STD))

	if (!(*std_id & VPIF_V4L2_STD))

		return -EINVAL;



	if (common->started) {
@@ -1223,7 +1223,7 @@ static int vpif_enum_output(struct file *file, void *fh, 


	strcpy(output->name, config->output[output->index]);

	output->type = V4L2_OUTPUT_TYPE_ANALOG;

	output->std = DM646X_V4L2_STD;

	output->std = VPIF_V4L2_STD;



	return 0;

}
@@ -1608,7 +1608,7 @@ static struct video_device vpif_video_template = { 
	.name		= "vpif",

	.fops		= &vpif_fops,

	.ioctl_ops	= &vpif_ioctl_ops,

	.tvnorms	= DM646X_V4L2_STD,

	.tvnorms	= VPIF_V4L2_STD,

	.current_norm	= V4L2_STD_625_50,



};
@@ -1710,7 +1710,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, k))) {

		for (i = res->start; i <= res->end; i++) {

			if (request_irq(i, vpif_channel_isr, IRQF_DISABLED,

					"DM646x_Display",

					"VPIF_Display",

				(void *)(&vpif_obj.dev[k]->channel_id))) {

				err = -EBUSY;

				goto vpif_int_err;
@@ -1740,7 +1740,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
		vfd->v4l2_dev = &vpif_obj.v4l2_dev;

		vfd->release = video_device_release;

		snprintf(vfd->name, sizeof(vfd->name),

			 "DM646x_VPIFDisplay_DRIVER_V%s",

			 "VPIF_Display_DRIVER_V%s",

			 VPIF_DISPLAY_VERSION);



		/* Set video_dev to the video device */
@@ -1826,7 +1826,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
	}



	v4l2_info(&vpif_obj.v4l2_dev,

			"DM646x VPIF display driver initialized\n");

			" VPIF display driver initialized\n");

	return 0;



probe_subdev_out:

drivers/media/video/davinci/vpif_display.h

+1 −1
Original line number Diff line number Diff line 
/*

 * DM646x display header file

 * VPIF display header file

 *

 * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/

 *