From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v6 38/43] media: sun6i-csi: Cleanup headers and includes, update copyright lines
Date: Fri, 26 Aug 2022 20:32:35 +0200 [thread overview]
Message-ID: <20220826183240.604834-39-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220826183240.604834-1-paul.kocialkowski@bootlin.com>
Cleanup includes, update copyright lines and some cosmetic changes.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 15 +++++--------
.../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ++++-----
.../sunxi/sun6i-csi/sun6i_csi_capture.c | 4 ++--
.../sunxi/sun6i-csi/sun6i_csi_capture.h | 22 ++++++++++++++-----
.../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 9 ++++----
5 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index 75d9f7edf828..eaf62cab0b64 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -1,18 +1,14 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
- * All rights reserved.
* Author: Yong Deng <yong.deng@magewell.com>
+ * Copyright 2021-2022 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
*/
#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
#include <linux/err.h>
-#include <linux/fs.h>
#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/ioctl.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -20,12 +16,12 @@
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <linux/reset.h>
-#include <linux/sched.h>
-#include <linux/sizes.h>
-#include <linux/slab.h>
+#include <media/v4l2-device.h>
#include <media/v4l2-mc.h>
#include "sun6i_csi.h"
+#include "sun6i_csi_bridge.h"
+#include "sun6i_csi_capture.h"
#include "sun6i_csi_reg.h"
/* Media */
@@ -375,4 +371,5 @@ module_platform_driver(sun6i_csi_platform_driver);
MODULE_DESCRIPTION("Allwinner A31 Camera Sensor Interface driver");
MODULE_AUTHOR("Yong Deng <yong.deng@magewell.com>");
+MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>");
MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index e3f9c49bb829..fd6e98b66f12 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -1,15 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
- * All rights reserved.
* Author: Yong Deng <yong.deng@magewell.com>
+ * Copyright 2021-2022 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
*/
-#ifndef __SUN6I_CSI_H__
-#define __SUN6I_CSI_H__
+#ifndef _SUN6I_CSI_H_
+#define _SUN6I_CSI_H_
#include <media/v4l2-device.h>
-#include <media/v4l2-fwnode.h>
#include <media/videobuf2-v4l2.h>
#include "sun6i_csi_bridge.h"
@@ -49,4 +49,4 @@ struct sun6i_csi_variant {
unsigned long clock_mod_rate;
};
-#endif /* __SUN6I_CSI_H__ */
+#endif
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
index e5ebe7a50c6f..36ddc190a919 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
- * All rights reserved.
* Author: Yong Deng <yong.deng@magewell.com>
+ * Copyright 2021-2022 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
*/
#include <linux/of.h>
#include <linux/regmap.h>
-
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
#include <media/v4l2-ioctl.h>
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
index 59c57bcefeec..ceceb030aef6 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
@@ -1,15 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
- * All rights reserved.
* Author: Yong Deng <yong.deng@magewell.com>
+ * Copyright 2021-2022 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
*/
-#ifndef __SUN6I_CAPTURE_H__
-#define __SUN6I_CAPTURE_H__
+#ifndef _SUN6I_CAPTURE_H_
+#define _SUN6I_CAPTURE_H_
-#include <media/v4l2-dev.h>
-#include <media/videobuf2-core.h>
+#include <media/v4l2-device.h>
#define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture"
@@ -57,21 +57,31 @@ struct sun6i_csi_capture {
struct v4l2_format format;
};
+/* Helpers */
+
void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
unsigned int *width, unsigned int *height);
void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev,
u32 *pixelformat, u32 *field);
+/* Format */
+
const
struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 pixelformat);
+/* Capture */
+
void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev);
void sun6i_csi_capture_state_update(struct sun6i_csi_device *csi_dev);
+/* State */
+
void sun6i_csi_capture_sync(struct sun6i_csi_device *csi_dev);
void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev);
+/* Capture */
+
int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev);
void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev);
-#endif /* __SUN6I_CAPTURE_H__ */
+#endif
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
index 1e4a07f26d1d..e01c5b9c2d60 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
@@ -1,12 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)
- * All rights reserved.
* Author: Yong Deng <yong.deng@magewell.com>
+ * Copyright 2021-2022 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
*/
-#ifndef __SUN6I_CSI_REG_H__
-#define __SUN6I_CSI_REG_H__
+#ifndef _SUN6I_CSI_REG_H_
+#define _SUN6I_CSI_REG_H_
#include <linux/kernel.h>
@@ -180,4 +181,4 @@
#define SUN6I_CSI_CH_FIFO_STAT_REG 0x98
#define SUN6I_CSI_CH_PCLK_STAT_REG 0x9c
-#endif /* __SUN6I_CSI_REG_H__ */
+#endif
--
2.37.1
next prev parent reply other threads:[~2022-08-26 18:33 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 18:31 [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 01/43] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 02/43] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 03/43] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 04/43] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 05/43] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 06/43] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 07/43] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 08/43] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 09/43] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 10/43] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 11/43] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 12/43] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski
2022-10-31 9:06 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 13/43] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 14/43] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 15/43] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 16/43] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-10-31 9:10 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 17/43] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 18/43] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-10-31 9:15 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 19/43] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 20/43] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 21/43] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 22/43] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 23/43] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 24/43] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 25/43] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 26/43] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 27/43] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 28/43] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 29/43] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 30/43] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 31/43] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 32/43] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 33/43] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 34/43] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 35/43] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 36/43] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-10-31 9:18 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 37/43] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-08-26 18:32 ` Paul Kocialkowski [this message]
2022-08-26 18:32 ` [PATCH v6 39/43] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 40/43] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 41/43] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 42/43] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 43/43] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-09-07 8:47 ` [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Hans Verkuil
2022-09-07 10:03 ` Paul Kocialkowski
2022-10-21 14:13 ` Paul Kocialkowski
2022-10-31 9:21 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826183240.604834-39-paul.kocialkowski@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=jernej.skrabec@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.org \
--cc=yong.deng@magewell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox