openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] marvell-ccic: fill in bus_info 

The bus_info field of struct v4l2_querycap wasn't filled in and
v4l2-compliance complained about that. Fix this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-03-05 04:57:32 -03:00 committed by Mauro Carvalho Chehab
parent 17d3675a8a
commit b7b683938a
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/marvell-ccic/cafe-driver.c
View File

@ -476,6 +476,7 @@ static int cafe_pci_probe(struct pci_dev *pdev,
mcam->plat_power_up = cafe_ctlr_power_up; mcam->plat_power_up = cafe_ctlr_power_up;
mcam->plat_power_down = cafe_ctlr_power_down; mcam->plat_power_down = cafe_ctlr_power_down;
mcam->dev = &pdev->dev; mcam->dev = &pdev->dev;
snprintf(mcam->bus_info, sizeof(mcam->bus_info), "PCI:%s", pci_name(pdev));
/* /*
* Set the clock speed for the XO 1; I don't believe this * Set the clock speed for the XO 1; I don't believe this
* driver has ever run anywhere else. * driver has ever run anywhere else.

3
drivers/media/platform/marvell-ccic/mcam-core.c
View File

@ -1388,8 +1388,11 @@ static int mcam_vidioc_dqbuf(struct file *filp, void *priv,
static int mcam_vidioc_querycap(struct file *file, void *priv, static int mcam_vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *cap) struct v4l2_capability *cap)
{ {
struct mcam_camera *cam = priv;
strcpy(cap->driver, "marvell_ccic"); strcpy(cap->driver, "marvell_ccic");
strcpy(cap->card, "marvell_ccic"); strcpy(cap->card, "marvell_ccic");
strlcpy(cap->bus_info, cam->bus_info, sizeof(cap->bus_info));
cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

2
drivers/media/platform/marvell-ccic/mcam-core.h
View File

@ -163,6 +163,8 @@ struct mcam_camera {
unsigned int nbufs; /* How many are alloc'd */ unsigned int nbufs; /* How many are alloc'd */
int next_buf; /* Next to consume (dev_lock) */ int next_buf; /* Next to consume (dev_lock) */
char bus_info[32]; /* querycap bus_info */
/* DMA buffers - vmalloc mode */ /* DMA buffers - vmalloc mode */
#ifdef MCAM_MODE_VMALLOC #ifdef MCAM_MODE_VMALLOC
unsigned int dma_buf_size; /* allocated size */ unsigned int dma_buf_size; /* allocated size */

1
drivers/media/platform/marvell-ccic/mmp-driver.c
View File

@ -371,6 +371,7 @@ static int mmpcam_probe(struct platform_device *pdev)
mcam->lane = pdata->lane; mcam->lane = pdata->lane;
mcam->chip_id = MCAM_ARMADA610; mcam->chip_id = MCAM_ARMADA610;
mcam->buffer_mode = B_DMA_sg; mcam->buffer_mode = B_DMA_sg;
strlcpy(mcam->bus_info, "platform:mmp-camera", sizeof(mcam->bus_info));
spin_lock_init(&mcam->dev_lock); spin_lock_init(&mcam->dev_lock);
/* /*
* Get our I/O memory. * Get our I/O memory.