shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: vip: remove unused head-file

Browse Source 
Add deinit gpiod for camera sensor when probe failed.
The video_device->ctrl_handler = NULL in soc_camera, in order to
VIDIOC_CTRL call v4l2_ioctl_ops.

Change-Id: Idf2d8bf2c8d56ec921084dcd74220ed3c5541427
Signed-off-by: Peng Zhou <benjo.zhou@rock-chips.com>
This commit is contained in:
Peng Zhou
2017-11-14 11:42:52 +08:00
committed by Tao Huang
parent 12e3fb626f
commit 00b6248f20
3 changed files with 1443 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/soc_camera/soc_camera.c
View File

@@ -2046,6 +2046,8 @@ enodrv:
eadddev:
soc_camera_clock_stop(ici);
}
soc_camera_power_off(icd->pdev, ssdd, NULL);
eadd:
if (icd->vdev) {
video_device_release(icd->vdev);
@@ -2383,7 +2385,7 @@ static int video_dev_create(struct soc_camera_device *icd)
vdev->fops = &soc_camera_fops;
vdev->ioctl_ops = &soc_camera_ioctl_ops;
vdev->release = video_device_release;
vdev->ctrl_handler = &icd->ctrl_handler;
vdev->ctrl_handler = NULL;
vdev->lock = &ici->host_lock;
icd->vdev = vdev;

2840
drivers/media/video/generic_sensor.h
View File

File diff suppressed because it is too large Load Diff

3
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -38,7 +38,6 @@
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/videobuf-core.h>
#include <linux/rockchip/iomap.h>
#include "../../video/rockchip/rga/rga.h"
#include "../../../drivers/soc/rockchip/rk30_camera.h"
@@ -3267,7 +3266,7 @@ static int rk_camera_cif_iomux(struct device *dev)
strcpy(state_str,"cif_pin_all");
if(CHIP_NAME == 3288){
__raw_writel(((1<<1)|(1<<(1+16))),RK_GRF_VIRT+0x0380);
write_grf_reg(0x0380, ((1 << 1) | (1 << (1 + 16))));
}else if(CHIP_NAME == 3368){
write_grf_reg(0x0900, ((1 << 1) | (1 << (1 + 16))));
}