Commit e9201cb2 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab

media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture

In an effort to distinguish between the core csi engine (to be
represented as the bridge) and the dma engine (the capture video
device), rename the video component to capture, with the appropriate
prefix. No functional change intended.

[Sakari Ailus: fix wrong variable issue (video -> capture) missed in patch]
Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: default avatarMaxime Ripard <maxime@cerno.tech>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0d2b746b
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o sun6i-csi-y += sun6i_csi.o sun6i_csi_bridge.o sun6i_csi_capture.o
obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o
...@@ -662,7 +662,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) ...@@ -662,7 +662,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private)
} }
if (status & CSI_CH_INT_STA_FD_PD) if (status & CSI_CH_INT_STA_FD_PD)
sun6i_video_frame_done(csi_dev); sun6i_csi_capture_frame_done(csi_dev);
regmap_write(regmap, CSI_CH_INT_STA_REG, status); regmap_write(regmap, CSI_CH_INT_STA_REG, status);
...@@ -840,7 +840,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev) ...@@ -840,7 +840,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)
if (ret) if (ret)
goto error_v4l2; goto error_v4l2;
ret = sun6i_video_setup(csi_dev); ret = sun6i_csi_capture_setup(csi_dev);
if (ret) if (ret)
goto error_bridge; goto error_bridge;
...@@ -862,7 +862,7 @@ static int sun6i_csi_remove(struct platform_device *pdev) ...@@ -862,7 +862,7 @@ static int sun6i_csi_remove(struct platform_device *pdev)
{ {
struct sun6i_csi_device *csi_dev = platform_get_drvdata(pdev); struct sun6i_csi_device *csi_dev = platform_get_drvdata(pdev);
sun6i_video_cleanup(csi_dev); sun6i_csi_capture_cleanup(csi_dev);
sun6i_csi_bridge_cleanup(csi_dev); sun6i_csi_bridge_cleanup(csi_dev);
sun6i_csi_v4l2_cleanup(csi_dev); sun6i_csi_v4l2_cleanup(csi_dev);
sun6i_csi_resources_cleanup(csi_dev); sun6i_csi_resources_cleanup(csi_dev);
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <media/videobuf2-v4l2.h> #include <media/videobuf2-v4l2.h>
#include "sun6i_csi_bridge.h" #include "sun6i_csi_bridge.h"
#include "sun6i_video.h" #include "sun6i_csi_capture.h"
#define SUN6I_CSI_NAME "sun6i-csi" #define SUN6I_CSI_NAME "sun6i-csi"
#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" #define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device"
...@@ -57,7 +57,7 @@ struct sun6i_csi_device { ...@@ -57,7 +57,7 @@ struct sun6i_csi_device {
struct sun6i_csi_config config; struct sun6i_csi_config config;
struct sun6i_csi_v4l2 v4l2; struct sun6i_csi_v4l2 v4l2;
struct sun6i_csi_bridge bridge; struct sun6i_csi_bridge bridge;
struct sun6i_video video; struct sun6i_csi_capture capture;
struct regmap *regmap; struct regmap *regmap;
struct clk *clock_mod; struct clk *clock_mod;
......
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
* Author: Yong Deng <yong.deng@magewell.com> * Author: Yong Deng <yong.deng@magewell.com>
*/ */
#ifndef __SUN6I_VIDEO_H__ #ifndef __SUN6I_CAPTURE_H__
#define __SUN6I_VIDEO_H__ #define __SUN6I_CAPTURE_H__
#include <media/v4l2-dev.h> #include <media/v4l2-dev.h>
#include <media/videobuf2-core.h> #include <media/videobuf2-core.h>
struct sun6i_csi_device; struct sun6i_csi_device;
struct sun6i_video { struct sun6i_csi_capture {
struct video_device video_dev; struct video_device video_dev;
struct vb2_queue queue; struct vb2_queue queue;
struct mutex lock; /* Queue lock. */ struct mutex lock; /* Queue lock. */
...@@ -27,9 +27,9 @@ struct sun6i_video { ...@@ -27,9 +27,9 @@ struct sun6i_video {
unsigned int sequence; unsigned int sequence;
}; };
int sun6i_video_setup(struct sun6i_csi_device *csi_dev); int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev);
void sun6i_video_cleanup(struct sun6i_csi_device *csi_dev); void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev);
void sun6i_video_frame_done(struct sun6i_csi_device *csi_dev); void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev);
#endif /* __SUN6I_VIDEO_H__ */ #endif /* __SUN6I_CAPTURE_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment