Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 579cea03 编写于 作者: G Guennadi Liakhovetski 提交者： Mauro Carvalho Chehab
浏览文件
操作

[media] V4L: mx3_camera: convert to the new mbus-config subdev operations 

Switch from soc-camera specific .{query,set}_bus_param() to V4L2
subdevice .[gs]_mbus_config() operations.
Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 97a0a611
隐藏空白更改
内联 并排
Showing with 89 addition and 108 deletion
drivers/media/video/mx3_camera.c
浏览文件 @ 579cea03
...@@ -109,6 +109,7 @@ struct mx3_camera_dev { ...@@ -109,6 +109,7 @@ struct mx3_camera_dev {
unsigned long platform_flags; unsigned long platform_flags;
unsigned long mclk; unsigned long mclk;
u16 width_flags; /* max 15 bits */
struct list_head capture; struct list_head capture;
spinlock_t lock; /* Protects video buffer lists */ spinlock_t lock; /* Protects video buffer lists */
...@@ -547,59 +548,28 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd) ...@@ -547,59 +548,28 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
static int test_platform_param(struct mx3_camera_dev *mx3_cam, static int test_platform_param(struct mx3_camera_dev *mx3_cam,
unsigned char buswidth, unsigned long *flags) unsigned char buswidth, unsigned long *flags)
{ {
/*
* If requested data width is supported by the platform, use it or any
* possible lower value - i.MX31 is smart enough to shift bits
*/
if (buswidth > fls(mx3_cam->width_flags))
return -EINVAL;
/* /*
* Platform specified synchronization and pixel clock polarities are * Platform specified synchronization and pixel clock polarities are
* only a recommendation and are only used during probing. MX3x * only a recommendation and are only used during probing. MX3x
* camera interface only works in master mode, i.e., uses HSYNC and * camera interface only works in master mode, i.e., uses HSYNC and
* VSYNC signals from the sensor * VSYNC signals from the sensor
*/ */
*flags = SOCAM_MASTER | *flags = V4L2_MBUS_MASTER |
SOCAM_HSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
SOCAM_HSYNC_ACTIVE_LOW | V4L2_MBUS_HSYNC_ACTIVE_LOW |
SOCAM_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH |
SOCAM_VSYNC_ACTIVE_LOW | V4L2_MBUS_VSYNC_ACTIVE_LOW |
SOCAM_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_RISING |
SOCAM_PCLK_SAMPLE_FALLING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
SOCAM_DATA_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH |
SOCAM_DATA_ACTIVE_LOW; V4L2_MBUS_DATA_ACTIVE_LOW;
/*
* If requested data width is supported by the platform, use it or any
* possible lower value - i.MX31 is smart enough to schift bits
*/
if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)
*flags |= SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_10 |
SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10)
*flags |= SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 |
SOCAM_DATAWIDTH_4;
else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8)
*flags |= SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4;
else if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4)
*flags |= SOCAM_DATAWIDTH_4;
switch (buswidth) {
case 15:
if (!(*flags & SOCAM_DATAWIDTH_15))
return -EINVAL;
break;
case 10:
if (!(*flags & SOCAM_DATAWIDTH_10))
return -EINVAL;
break;
case 8:
if (!(*flags & SOCAM_DATAWIDTH_8))
return -EINVAL;
break;
case 4:
if (!(*flags & SOCAM_DATAWIDTH_4))
return -EINVAL;
break;
default:
dev_warn(mx3_cam->soc_host.v4l2_dev.dev,
"Unsupported bus width %d\n", buswidth);
return -EINVAL;
}
return 0; return 0;
} }
...@@ -607,9 +577,11 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam, ...@@ -607,9 +577,11 @@ static int test_platform_param(struct mx3_camera_dev *mx3_cam,
static int mx3_camera_try_bus_param(struct soc_camera_device *icd, static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
const unsigned int depth) const unsigned int depth)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
unsigned long bus_flags, camera_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long bus_flags, common_flags;
int ret = test_platform_param(mx3_cam, depth, &bus_flags); int ret = test_platform_param(mx3_cam, depth, &bus_flags);
dev_dbg(icd->parent, "request bus width %d bit: %d\n", depth, ret); dev_dbg(icd->parent, "request bus width %d bit: %d\n", depth, ret);
...@@ -617,15 +589,21 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd, ...@@ -617,15 +589,21 @@ static int mx3_camera_try_bus_param(struct soc_camera_device *icd,
if (ret < 0) if (ret < 0)
return ret; return ret;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
if (!ret) {
ret = soc_camera_bus_param_compatible(camera_flags, bus_flags); common_flags = soc_mbus_config_compatible(&cfg,
if (ret < 0) bus_flags);
dev_warn(icd->parent, if (!common_flags) {
"Flags incompatible: camera %lx, host %lx\n", dev_warn(icd->parent,
camera_flags, bus_flags); "Flags incompatible: camera 0x%x, host 0x%lx\n",
cfg.flags, bus_flags);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
}
return ret; return 0;
} }
static bool chan_filter(struct dma_chan *chan, void *arg) static bool chan_filter(struct dma_chan *chan, void *arg)
...@@ -994,9 +972,11 @@ static int mx3_camera_querycap(struct soc_camera_host *ici, ...@@ -994,9 +972,11 @@ static int mx3_camera_querycap(struct soc_camera_host *ici,
static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
unsigned long bus_flags, camera_flags, common_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long bus_flags, common_flags;
u32 dw, sens_conf; u32 dw, sens_conf;
const struct soc_mbus_pixelfmt *fmt; const struct soc_mbus_pixelfmt *fmt;
int buswidth; int buswidth;
...@@ -1008,83 +988,76 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) ...@@ -1008,83 +988,76 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
if (!fmt) if (!fmt)
return -EINVAL; return -EINVAL;
buswidth = fmt->bits_per_sample;
ret = test_platform_param(mx3_cam, buswidth, &bus_flags);
xlate = soc_camera_xlate_by_fourcc(icd, pixfmt); xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
if (!xlate) { if (!xlate) {
dev_warn(dev, "Format %x not found\n", pixfmt); dev_warn(dev, "Format %x not found\n", pixfmt);
return -EINVAL; return -EINVAL;
} }
buswidth = fmt->bits_per_sample;
ret = test_platform_param(mx3_cam, buswidth, &bus_flags);
dev_dbg(dev, "requested bus width %d bit: %d\n", buswidth, ret); dev_dbg(dev, "requested bus width %d bit: %d\n", buswidth, ret);
if (ret < 0) if (ret < 0)
return ret; return ret;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
if (!ret) {
common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags); common_flags = soc_mbus_config_compatible(&cfg,
dev_dbg(dev, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n", bus_flags);
camera_flags, bus_flags, common_flags); if (!common_flags) {
if (!common_flags) { dev_warn(icd->parent,
dev_dbg(dev, "no common flags"); "Flags incompatible: camera 0x%x, host 0x%lx\n",
return -EINVAL; cfg.flags, bus_flags);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
} else {
common_flags = bus_flags;
} }
dev_dbg(dev, "Flags cam: 0x%x host: 0x%lx common: 0x%lx\n",
cfg.flags, bus_flags, common_flags);
/* Make choices, based on platform preferences */ /* Make choices, based on platform preferences */
if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_HSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
if (mx3_cam->platform_flags & MX3_CAMERA_HSP) if (mx3_cam->platform_flags & MX3_CAMERA_HSP)
common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
else else
common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
} }
if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_VSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
if (mx3_cam->platform_flags & MX3_CAMERA_VSP) if (mx3_cam->platform_flags & MX3_CAMERA_VSP)
common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
else else
common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
} }
if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_DATA_ACTIVE_HIGH) &&
(common_flags & SOCAM_DATA_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)) {
if (mx3_cam->platform_flags & MX3_CAMERA_DP) if (mx3_cam->platform_flags & MX3_CAMERA_DP)
common_flags &= ~SOCAM_DATA_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_DATA_ACTIVE_HIGH;
else else
common_flags &= ~SOCAM_DATA_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_DATA_ACTIVE_LOW;
} }
if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) && if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
(common_flags & SOCAM_PCLK_SAMPLE_FALLING)) { (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
if (mx3_cam->platform_flags & MX3_CAMERA_PCP) if (mx3_cam->platform_flags & MX3_CAMERA_PCP)
common_flags &= ~SOCAM_PCLK_SAMPLE_RISING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
else else
common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
} }
/* cfg.flags = common_flags;
* Make the camera work in widest common mode, we'll take care of ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
* the rest if (ret < 0 && ret != -ENOIOCTLCMD) {
*/ dev_dbg(dev, "camera s_mbus_config(0x%lx) returned %d\n",
if (common_flags & SOCAM_DATAWIDTH_15)
common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
SOCAM_DATAWIDTH_15;
else if (common_flags & SOCAM_DATAWIDTH_10)
common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
SOCAM_DATAWIDTH_10;
else if (common_flags & SOCAM_DATAWIDTH_8)
common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
SOCAM_DATAWIDTH_8;
else
common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) |
SOCAM_DATAWIDTH_4;
ret = icd->ops->set_bus_param(icd, common_flags);
if (ret < 0) {
dev_dbg(dev, "camera set_bus_param(%lx) returned %d\n",
common_flags, ret); common_flags, ret);
return ret; return ret;
} }
...@@ -1108,13 +1081,13 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) ...@@ -1108,13 +1081,13 @@ static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
/* This has been set in mx3_camera_activate(), but we clear it above */ /* This has been set in mx3_camera_activate(), but we clear it above */
sens_conf |= CSI_SENS_CONF_DATA_FMT_BAYER; sens_conf |= CSI_SENS_CONF_DATA_FMT_BAYER;
if (common_flags & SOCAM_PCLK_SAMPLE_FALLING) if (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
sens_conf |= 1 << CSI_SENS_CONF_PIX_CLK_POL_SHIFT; sens_conf |= 1 << CSI_SENS_CONF_PIX_CLK_POL_SHIFT;
if (common_flags & SOCAM_HSYNC_ACTIVE_LOW) if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
sens_conf |= 1 << CSI_SENS_CONF_HSYNC_POL_SHIFT; sens_conf |= 1 << CSI_SENS_CONF_HSYNC_POL_SHIFT;
if (common_flags & SOCAM_VSYNC_ACTIVE_LOW) if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
sens_conf |= 1 << CSI_SENS_CONF_VSYNC_POL_SHIFT; sens_conf |= 1 << CSI_SENS_CONF_VSYNC_POL_SHIFT;
if (common_flags & SOCAM_DATA_ACTIVE_LOW) if (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)
sens_conf |= 1 << CSI_SENS_CONF_DATA_POL_SHIFT; sens_conf |= 1 << CSI_SENS_CONF_DATA_POL_SHIFT;
/* Just do what we're asked to do */ /* Just do what we're asked to do */
...@@ -1199,6 +1172,14 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev) ...@@ -1199,6 +1172,14 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
"data widths, using default 8 bit\n"); "data widths, using default 8 bit\n");
mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8; mx3_cam->platform_flags |= MX3_CAMERA_DATAWIDTH_8;
} }
if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_4)
mx3_cam->width_flags = 1 << 3;
if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_8)
mx3_cam->width_flags |= 1 << 7;
if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_10)
mx3_cam->width_flags |= 1 << 9;
if (mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_15)
mx3_cam->width_flags |= 1 << 14;
mx3_cam->mclk = mx3_cam->pdata->mclk_10khz * 10000; mx3_cam->mclk = mx3_cam->pdata->mclk_10khz * 10000;
if (!mx3_cam->mclk) { if (!mx3_cam->mclk) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或