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

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

drivers/media/platform/sunxi/sun6i-csi/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c

+3 −3
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) 
	}



	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);
@@ -840,7 +840,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev) 
	if (ret)

		goto error_v4l2;



	ret = sun6i_video_setup(csi_dev);

	ret = sun6i_csi_capture_setup(csi_dev);

	if (ret)

		goto error_bridge;
@@ -862,7 +862,7 @@ static int sun6i_csi_remove(struct platform_device *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_v4l2_cleanup(csi_dev);

	sun6i_csi_resources_cleanup(csi_dev);

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <media/videobuf2-v4l2.h>



#include "sun6i_csi_bridge.h"

#include "sun6i_video.h"

#include "sun6i_csi_capture.h"



#define SUN6I_CSI_NAME		"sun6i-csi"

#define SUN6I_CSI_DESCRIPTION	"Allwinner A31 CSI Device"
@@ -57,7 +57,7 @@ struct sun6i_csi_device { 
	struct sun6i_csi_config		config;

	struct sun6i_csi_v4l2		v4l2;

	struct sun6i_csi_bridge		bridge;

	struct sun6i_video		video;

	struct sun6i_csi_capture	capture;



	struct regmap			*regmap;

	struct clk			*clock_mod;