diff mbox series

[v2,13/19] media: sunxi: Add support for the A31 MIPI CSI-2 controller

Message ID 20201128142839.517949-14-paul.kocialkowski@bootlin.com
State Superseded
Headers show
Series Allwinner MIPI CSI-2 support for A31/V3s/A83T | expand

Commit Message

Paul Kocialkowski Nov. 28, 2020, 2:28 p.m. UTC 
The A31 MIPI CSI-2 controller is a dedicated MIPI CSI-2 bridge
found on Allwinner SoCs such as the A31 and V3/V3s.

It is a standalone block, connected to the CSI controller on one side
and to the MIPI D-PHY block on the other. It has a dedicated address
space, interrupt line and clock.

It is represented as a V4L2 subdev to the CSI controller and takes a
MIPI CSI-2 sensor as its own subdev, all using the fwnode graph and
media controller API.

Only 8-bit and 10-bit Bayer formats are currently supported.
While up to 4 internal channels to the CSI controller exist, only one
is currently supported by this implementation.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 drivers/media/platform/sunxi/Kconfig          |   1 +
 drivers/media/platform/sunxi/Makefile         |   1 +
 .../platform/sunxi/sun6i-mipi-csi2/Kconfig    |  12 +
 .../platform/sunxi/sun6i-mipi-csi2/Makefile   |   4 +
 .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c   | 591 ++++++++++++++++++
 .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h   | 117 ++++
 6 files changed, 726 insertions(+)
 create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
 create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
 create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
 create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h

Comments

Maxime Ripard Dec. 1, 2020, 12:20 p.m. UTC | #1 
Hi,

On Sat, Nov 28, 2020 at 03:28:33PM +0100, Paul Kocialkowski wrote:
> The A31 MIPI CSI-2 controller is a dedicated MIPI CSI-2 bridge
> found on Allwinner SoCs such as the A31 and V3/V3s.
> 
> It is a standalone block, connected to the CSI controller on one side
> and to the MIPI D-PHY block on the other. It has a dedicated address
> space, interrupt line and clock.
> 
> It is represented as a V4L2 subdev to the CSI controller and takes a
> MIPI CSI-2 sensor as its own subdev, all using the fwnode graph and
> media controller API.
> 
> Only 8-bit and 10-bit Bayer formats are currently supported.
> While up to 4 internal channels to the CSI controller exist, only one
> is currently supported by this implementation.
> 
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> ---
>  drivers/media/platform/sunxi/Kconfig          |   1 +
>  drivers/media/platform/sunxi/Makefile         |   1 +
>  .../platform/sunxi/sun6i-mipi-csi2/Kconfig    |  12 +
>  .../platform/sunxi/sun6i-mipi-csi2/Makefile   |   4 +
>  .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c   | 591 ++++++++++++++++++
>  .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h   | 117 ++++
>  6 files changed, 726 insertions(+)
>  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
>  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
>  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
>  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h
> 
> diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
> index 7151cc249afa..9684e07454ad 100644
> --- a/drivers/media/platform/sunxi/Kconfig
> +++ b/drivers/media/platform/sunxi/Kconfig
> @@ -2,3 +2,4 @@
>  
>  source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
>  source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
> +source "drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig"
> diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/sunxi/Makefile
> index fc537c9f5ca9..887a7cae8fca 100644
> --- a/drivers/media/platform/sunxi/Makefile
> +++ b/drivers/media/platform/sunxi/Makefile
> @@ -2,5 +2,6 @@
>  
>  obj-y		+= sun4i-csi/
>  obj-y		+= sun6i-csi/
> +obj-y		+= sun6i-mipi-csi2/

I'm not sure we need a new folder here, it's only ever tied to sun6i-csi
so it would make more sense to have it in the same folder.

>  obj-y		+= sun8i-di/
>  obj-y		+= sun8i-rotate/
> diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
> new file mode 100644
> index 000000000000..3260591ed5c0
> --- /dev/null
> +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
> @@ -0,0 +1,12 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +config VIDEO_SUN6I_MIPI_CSI2
> +	tristate "Allwinner A31 MIPI CSI-2 Controller Driver"
> +	depends on VIDEO_V4L2 && COMMON_CLK
> +	depends on ARCH_SUNXI || COMPILE_TEST
> +	select PHY_SUN6I_MIPI_DPHY
> +	select MEDIA_CONTROLLER
> +	select VIDEO_V4L2_SUBDEV_API
> +	select REGMAP_MMIO
> +	select V4L2_FWNODE
> +	help
> +	   Support for the Allwinner A31 MIPI CSI-2 Controller.
> diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
> new file mode 100644
> index 000000000000..14e4e03818b5
> --- /dev/null
> +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
> @@ -0,0 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +sun6i-mipi-csi2-y += sun6i_mipi_csi2.o
> +
> +obj-$(CONFIG_VIDEO_SUN6I_MIPI_CSI2) += sun6i-mipi-csi2.o
> diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
> new file mode 100644
> index 000000000000..a6567ef82fb4
> --- /dev/null
> +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
> @@ -0,0 +1,591 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2020 Bootlin
> + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/interrupt.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/phy/phy.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/regmap.h>
> +#include <linux/reset.h>
> +#include <media/v4l2-ctrls.h>
> +#include <media/v4l2-device.h>
> +#include <media/v4l2-fwnode.h>
> +
> +#include "sun6i_mipi_csi2.h"
> +
> +#define MODULE_NAME	"sun6i-mipi-csi2"
> +
> +static const u32 sun6i_mipi_csi2_mbus_codes[] = {
> +	MEDIA_BUS_FMT_SBGGR8_1X8,
> +	MEDIA_BUS_FMT_SGBRG8_1X8,
> +	MEDIA_BUS_FMT_SGRBG8_1X8,
> +	MEDIA_BUS_FMT_SRGGB8_1X8,
> +	MEDIA_BUS_FMT_SBGGR10_1X10,
> +	MEDIA_BUS_FMT_SGBRG10_1X10,
> +	MEDIA_BUS_FMT_SGRBG10_1X10,
> +	MEDIA_BUS_FMT_SRGGB10_1X10,
> +};
> +
> +/* Video */
> +
> +static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on)
> +{
> +	struct sun6i_mipi_csi2_video *video =
> +		sun6i_mipi_csi2_subdev_video(subdev);
> +	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);
> +	struct v4l2_subdev *remote_subdev = video->remote_subdev;
> +	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =
> +		&video->endpoint.bus.mipi_csi2;
> +	union phy_configure_opts dphy_opts = { 0 };
> +	struct phy_configure_opts_mipi_dphy *dphy_cfg = &dphy_opts.mipi_dphy;
> +	struct regmap *regmap = cdev->regmap;
> +	struct v4l2_ctrl *ctrl;
> +	unsigned int lanes_count;
> +	unsigned int bpp;
> +	unsigned long pixel_rate;
> +	u8 data_type = 0;
> +	u32 version = 0;
> +	/* Initialize to 0 to use both in disable label (ret != 0) and off. */
> +	int ret = 0;
> +
> +	if (!remote_subdev)
> +		return -ENODEV;
> +
> +	if (!on) {
> +		v4l2_subdev_call(remote_subdev, video, s_stream, 0);
> +		goto disable;
> +	}
> +
> +	switch (video->mbus_format.code) {
> +	case MEDIA_BUS_FMT_SBGGR8_1X8:
> +	case MEDIA_BUS_FMT_SGBRG8_1X8:
> +	case MEDIA_BUS_FMT_SGRBG8_1X8:
> +	case MEDIA_BUS_FMT_SRGGB8_1X8:
> +		data_type = MIPI_CSI2_DATA_TYPE_RAW8;
> +		bpp = 8;
> +		break;
> +	case MEDIA_BUS_FMT_SBGGR10_1X10:
> +	case MEDIA_BUS_FMT_SGBRG10_1X10:
> +	case MEDIA_BUS_FMT_SGRBG10_1X10:
> +	case MEDIA_BUS_FMT_SRGGB10_1X10:
> +		data_type = MIPI_CSI2_DATA_TYPE_RAW10;
> +		bpp = 10;
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	/* Sensor pixel rate */
> +
> +	ctrl = v4l2_ctrl_find(remote_subdev->ctrl_handler, V4L2_CID_PIXEL_RATE);
> +	if (!ctrl) {
> +		dev_err(cdev->dev,
> +			"%s: no MIPI CSI-2 pixel rate from the sensor\n",
> +			__func__);
> +		return -ENODEV;
> +	}
> +
> +	pixel_rate = (unsigned long)v4l2_ctrl_g_ctrl_int64(ctrl);
> +	if (!pixel_rate) {
> +		dev_err(cdev->dev,
> +			"%s: zero MIPI CSI-2 pixel rate from the sensor\n",
> +			__func__);
> +		return -ENODEV;
> +	}
> +
> +	/* Power management */
> +
> +	ret = pm_runtime_get_sync(cdev->dev);
> +	if (ret < 0) {
> +		pm_runtime_put_noidle(cdev->dev);
> +		return ret;
> +	}
> +
> +	/* D-PHY configuration */
> +
> +	lanes_count = bus_mipi_csi2->num_data_lanes;
> +	phy_mipi_dphy_get_default_config(pixel_rate, bpp, lanes_count,
> +					 dphy_cfg);
> +
> +	/*
> +	 * Note that our hardware is using DDR, which is not taken in account by
> +	 * phy_mipi_dphy_get_default_config when calculating hs_clk_rate from
> +	 * the pixel rate, lanes count and bpp.
> +	 *
> +	 * The resulting clock rate is basically the symbol rate over the whole
> +	 * link. The actual clock rate is calculated with division by two since
> +	 * DDR samples both on rising and falling edges.
> +	 */
> +
> +	dev_dbg(cdev->dev, "A31 MIPI CSI-2 config:\n");
> +	dev_dbg(cdev->dev, "%ld pixels/s, %u bits/pixel, %lu Hz clock\n",
> +		pixel_rate, bpp, dphy_cfg->hs_clk_rate / 2);
> +
> +	ret = phy_reset(cdev->dphy);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to reset MIPI D-PHY\n");
> +		goto error_pm;
> +	}
> +
> +	ret = phy_set_mode_ext(cdev->dphy, PHY_MODE_MIPI_DPHY,
> +			       PHY_MIPI_DPHY_SUBMODE_RX);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to set MIPI D-PHY mode\n");
> +		goto error_pm;
> +	}
> +
> +	ret = phy_configure(cdev->dphy, &dphy_opts);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to configure MIPI D-PHY\n");
> +		goto error_pm;
> +	}
> +
> +	ret = phy_power_on(cdev->dphy);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to power on MIPI D-PHY\n");
> +		goto error_pm;
> +	}
> +
> +	/* MIPI CSI-2 controller setup */
> +
> +	/*
> +	 * The enable flow in the Allwinner BSP is a bit different: the enable
> +	 * and reset bits are set together before starting the CSI controller.
> +	 *
> +	 * In mainline we enable the CSI controller first (due to subdev logic).
> +	 * One reliable way to make this work is to deassert reset, configure
> +	 * registers and enable the controller when everything's ready.
> +	 *
> +	 * However, setting the version enable bit and removing it afterwards
> +	 * appears necessary for capture to work reliably, while replacing it
> +	 * with a delay doesn't do the trick.
> +	 */
> +	regmap_write(regmap, SUN6I_MIPI_CSI2_CTL_REG,
> +		     SUN6I_MIPI_CSI2_CTL_RESET_N |
> +		     SUN6I_MIPI_CSI2_CTL_VERSION_EN |
> +		     SUN6I_MIPI_CSI2_CTL_UNPK_EN);
> +
> +	regmap_read(regmap, SUN6I_MIPI_CSI2_VERSION_REG, &version);
> +
> +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
> +				   SUN6I_MIPI_CSI2_CTL_VERSION_EN, 0);
> +
> +	dev_dbg(cdev->dev, "A31 MIPI CSI-2 version: %04x\n", version);
> +
> +	regmap_write(regmap, SUN6I_MIPI_CSI2_CFG_REG,
> +		     SUN6I_MIPI_CSI2_CFG_CHANNEL_MODE(1) |
> +		     SUN6I_MIPI_CSI2_CFG_LANE_COUNT(lanes_count));
> +
> +	/*
> +	 * Our MIPI CSI-2 controller has internal channels that can be
> +	 * configured to match a specific MIPI CSI-2 virtual channel and/or
> +	 * a specific data type. Each internal channel can be piped to an
> +	 * internal channel of the CSI controller.
> +	 *
> +	 * We set virtual channel numbers to all channels to make sure that
> +	 * virtual channel 0 goes to CSI channel 0 only.
> +	 */
> +	regmap_write(regmap, SUN6I_MIPI_CSI2_VCDT_RX_REG,
> +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(3, 3) |
> +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(2, 2) |
> +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(1, 1) |
> +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(0, 0) |
> +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_DT(0, data_type));
> +
> +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
> +			   SUN6I_MIPI_CSI2_CTL_EN, SUN6I_MIPI_CSI2_CTL_EN);
> +
> +	ret = v4l2_subdev_call(remote_subdev, video, s_stream, 1);
> +	if (ret)
> +		goto disable;
> +
> +	return 0;
> +
> +disable:
> +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
> +			   SUN6I_MIPI_CSI2_CTL_EN, 0);
> +
> +	phy_power_off(cdev->dphy);
> +
> +error_pm:
> +	pm_runtime_put(cdev->dev);
> +
> +	return ret;
> +}
> +
> +static const struct v4l2_subdev_video_ops sun6i_mipi_csi2_subdev_video_ops = {
> +	.s_stream	= sun6i_mipi_csi2_s_stream,
> +};
> +
> +/* Pad */
> +
> +static int
> +sun6i_mipi_csi2_enum_mbus_code(struct v4l2_subdev *subdev,
> +			       struct v4l2_subdev_pad_config *config,
> +			       struct v4l2_subdev_mbus_code_enum *code_enum)
> +{
> +	if (code_enum->index >= ARRAY_SIZE(sun6i_mipi_csi2_mbus_codes))
> +		return -EINVAL;
> +
> +	code_enum->code = sun6i_mipi_csi2_mbus_codes[code_enum->index];
> +
> +	return 0;
> +}
> +
> +static int sun6i_mipi_csi2_get_fmt(struct v4l2_subdev *subdev,
> +				   struct v4l2_subdev_pad_config *config,
> +				   struct v4l2_subdev_format *format)
> +{
> +	struct sun6i_mipi_csi2_video *video =
> +		sun6i_mipi_csi2_subdev_video(subdev);
> +	struct v4l2_mbus_framefmt *mbus_format = &format->format;
> +
> +	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
> +		*mbus_format = *v4l2_subdev_get_try_format(subdev, config,
> +							   format->pad);
> +	else
> +		*mbus_format = video->mbus_format;
> +
> +	return 0;
> +}
> +
> +static int sun6i_mipi_csi2_set_fmt(struct v4l2_subdev *subdev,
> +				   struct v4l2_subdev_pad_config *config,
> +				   struct v4l2_subdev_format *format)
> +{
> +	struct sun6i_mipi_csi2_video *video =
> +		sun6i_mipi_csi2_subdev_video(subdev);
> +	struct v4l2_mbus_framefmt *mbus_format = &format->format;
> +
> +	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
> +		*v4l2_subdev_get_try_format(subdev, config, format->pad) =
> +			*mbus_format;
> +	else
> +		video->mbus_format = *mbus_format;
> +
> +	return 0;
> +}
> +
> +static const struct v4l2_subdev_pad_ops sun6i_mipi_csi2_subdev_pad_ops = {
> +	.enum_mbus_code	= sun6i_mipi_csi2_enum_mbus_code,
> +	.get_fmt	= sun6i_mipi_csi2_get_fmt,
> +	.set_fmt	= sun6i_mipi_csi2_set_fmt,
> +};
> +
> +/* Subdev */
> +
> +static const struct v4l2_subdev_ops sun6i_mipi_csi2_subdev_ops = {
> +	.video		= &sun6i_mipi_csi2_subdev_video_ops,
> +	.pad		= &sun6i_mipi_csi2_subdev_pad_ops,
> +};
> +
> +/* Notifier */
> +
> +static int
> +sun6i_mipi_csi2_notifier_bound(struct v4l2_async_notifier *notifier,
> +			       struct v4l2_subdev *remote_subdev,
> +			       struct v4l2_async_subdev *remote_subdev_async)
> +{
> +	struct v4l2_subdev *subdev = notifier->sd;
> +	struct sun6i_mipi_csi2_video *video =
> +		sun6i_mipi_csi2_subdev_video(subdev);
> +	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);
> +	int source_pad;
> +	int ret;
> +
> +	source_pad = media_entity_get_fwnode_pad(&remote_subdev->entity,
> +						 remote_subdev->fwnode,
> +						 MEDIA_PAD_FL_SOURCE);
> +	if (source_pad < 0)
> +		return source_pad;
> +
> +	ret = media_create_pad_link(&remote_subdev->entity, source_pad,
> +				    &subdev->entity, 0,
> +				    MEDIA_LNK_FL_ENABLED |
> +				    MEDIA_LNK_FL_IMMUTABLE);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to create %s:%u -> %s:%u link\n",
> +			remote_subdev->entity.name, source_pad,
> +			subdev->entity.name, 0);
> +		return ret;
> +	}
> +
> +	video->remote_subdev = remote_subdev;
> +
> +	return 0;
> +}
> +
> +static const
> +struct v4l2_async_notifier_operations sun6i_mipi_csi2_notifier_ops = {
> +	.bound		= sun6i_mipi_csi2_notifier_bound,
> +};
> +
> +/* Media Entity */
> +
> +static const struct media_entity_operations sun6i_mipi_csi2_entity_ops = {
> +	.link_validate	= v4l2_subdev_link_validate,
> +};
> +
> +/* Base Driver */
> +
> +static int __maybe_unused sun6i_mipi_csi2_suspend(struct device *dev)
> +{
> +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
> +
> +	clk_disable_unprepare(cdev->clk_mod);
> +	clk_disable_unprepare(cdev->clk_bus);
> +	reset_control_assert(cdev->reset);
> +
> +	return 0;
> +}
> +
> +static int __maybe_unused sun6i_mipi_csi2_resume(struct device *dev)
> +{
> +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
> +	int ret;
> +
> +	ret = reset_control_deassert(cdev->reset);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to deassert reset\n");
> +		return ret;
> +	}
> +
> +	ret = clk_prepare_enable(cdev->clk_bus);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to enable bus clock\n");
> +		goto error_reset;
> +	}
> +
> +	ret = clk_prepare_enable(cdev->clk_mod);
> +	if (ret) {
> +		dev_err(cdev->dev, "failed to enable module clock\n");
> +		goto error_clk_bus;
> +	}
> +
> +	return 0;
> +
> +error_clk_bus:
> +	clk_disable_unprepare(cdev->clk_bus);
> +
> +error_reset:
> +	reset_control_assert(cdev->reset);
> +
> +	return ret;
> +}

I'm guessing you set the __maybe_unused attribute because you're using
SET_RUNTIME_PM_OPS, but what would happen if runtime_pm isn't selected?
It looks like you don't handle that case.

> +static int sun6i_mipi_csi2_v4l2_setup(struct sun6i_mipi_csi2_dev *cdev)
> +{
> +	struct sun6i_mipi_csi2_video *video = &cdev->video;
> +	struct v4l2_subdev *subdev = &video->subdev;
> +	struct v4l2_async_notifier *notifier = &video->notifier;
> +	struct fwnode_handle *handle;
> +	struct v4l2_fwnode_endpoint *endpoint;
> +	struct v4l2_async_subdev *subdev_async;
> +	int ret;
> +
> +	/* Subdev */
> +
> +	v4l2_subdev_init(subdev, &sun6i_mipi_csi2_subdev_ops);
> +	subdev->dev = cdev->dev;
> +	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> +	strscpy(subdev->name, MODULE_NAME, sizeof(subdev->name));
> +	v4l2_set_subdevdata(subdev, cdev);
> +
> +	/* Entity */
> +
> +	subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
> +	subdev->entity.ops = &sun6i_mipi_csi2_entity_ops;
> +
> +	/* Pads */
> +
> +	video->pads[0].flags = MEDIA_PAD_FL_SINK;
> +	video->pads[1].flags = MEDIA_PAD_FL_SOURCE;
> +
> +	ret = media_entity_pads_init(&subdev->entity, 2, video->pads);
> +	if (ret)
> +		return ret;
> +
> +	/* Endpoint */
> +
> +	handle = fwnode_graph_get_endpoint_by_id(dev_fwnode(cdev->dev), 0, 0,
> +						 FWNODE_GRAPH_ENDPOINT_NEXT);
> +	if (!handle) {
> +		ret = -ENODEV;
> +		goto error_media_entity;
> +	}
> +
> +	endpoint = &video->endpoint;
> +	endpoint->bus_type = V4L2_MBUS_CSI2_DPHY;
> +
> +	ret = v4l2_fwnode_endpoint_parse(handle, endpoint);
> +	fwnode_handle_put(handle);
> +	if (ret)
> +		goto error_media_entity;
> +
> +	/* Notifier */
> +
> +	v4l2_async_notifier_init(notifier);
> +
> +	subdev_async = &video->subdev_async;
> +	ret = v4l2_async_notifier_add_fwnode_remote_subdev(notifier, handle,
> +							   subdev_async);
> +	if (ret)
> +		goto error_media_entity;
> +
> +	video->notifier.ops = &sun6i_mipi_csi2_notifier_ops;
> +
> +	ret = v4l2_async_subdev_notifier_register(subdev, notifier);
> +	if (ret < 0)
> +		goto error_notifier;
> +
> +	/* Subdev */
> +
> +	ret = v4l2_async_register_subdev(subdev);
> +	if (ret < 0)
> +		goto error_notifier_registered;
> +
> +	/* Runtime PM */
> +
> +	pm_runtime_enable(cdev->dev);
> +	pm_runtime_set_suspended(cdev->dev);
> +
> +	return 0;
> +
> +error_notifier_registered:
> +	v4l2_async_notifier_unregister(notifier);
> +error_notifier:
> +	v4l2_async_notifier_cleanup(notifier);
> +error_media_entity:
> +	media_entity_cleanup(&subdev->entity);
> +
> +	return ret;
> +}
> +
> +static int sun6i_mipi_csi2_v4l2_teardown(struct sun6i_mipi_csi2_dev *cdev)
> +{
> +	struct sun6i_mipi_csi2_video *video = &cdev->video;
> +	struct v4l2_subdev *subdev = &video->subdev;
> +	struct v4l2_async_notifier *notifier = &video->notifier;
> +
> +	v4l2_async_unregister_subdev(subdev);
> +	v4l2_async_notifier_unregister(notifier);
> +	v4l2_async_notifier_cleanup(notifier);
> +	media_entity_cleanup(&subdev->entity);
> +	v4l2_device_unregister_subdev(subdev);
> +
> +	return 0;
> +}
> +
> +static const struct regmap_config sun6i_mipi_csi2_regmap_config = {
> +	.reg_bits       = 32,
> +	.reg_stride     = 4,
> +	.val_bits       = 32,
> +	.max_register	= 0x400,
> +};
> +
> +static int sun6i_mipi_csi2_probe(struct platform_device *pdev)
> +{
> +	struct sun6i_mipi_csi2_dev *cdev;
> +	struct resource *res;
> +	void __iomem *io_base;
> +	int ret;
> +
> +	cdev = devm_kzalloc(&pdev->dev, sizeof(*cdev), GFP_KERNEL);
> +	if (!cdev)
> +		return -ENOMEM;
> +
> +	cdev->dev = &pdev->dev;
> +
> +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +	io_base = devm_ioremap_resource(&pdev->dev, res);
> +	if (IS_ERR(io_base))
> +		return PTR_ERR(io_base);
> +
> +	cdev->regmap = devm_regmap_init_mmio(&pdev->dev, io_base,
> +					     &sun6i_mipi_csi2_regmap_config);
> +	if (IS_ERR(cdev->regmap)) {
> +		dev_err(&pdev->dev, "failed to init register map\n");
> +		return PTR_ERR(cdev->regmap);
> +	}
> +
> +	cdev->clk_bus = devm_clk_get(&pdev->dev, "bus");
> +	if (IS_ERR(cdev->clk_bus)) {
> +		dev_err(&pdev->dev, "failed to acquire bus clock\n");
> +		return PTR_ERR(cdev->clk_bus);
> +	}
> +
> +	cdev->clk_mod = devm_clk_get(&pdev->dev, "mod");
> +	if (IS_ERR(cdev->clk_mod)) {
> +		dev_err(&pdev->dev, "failed to acquire mod clock\n");
> +		return PTR_ERR(cdev->clk_mod);
> +	}
> +
> +	cdev->reset = devm_reset_control_get_shared(&pdev->dev, NULL);
> +	if (IS_ERR(cdev->reset)) {
> +		dev_err(&pdev->dev, "failed to get reset controller\n");
> +		return PTR_ERR(cdev->reset);
> +	}
> +
> +	cdev->dphy = devm_phy_get(&pdev->dev, "dphy");
> +	if (IS_ERR(cdev->dphy)) {
> +		dev_err(&pdev->dev, "failed to get the MIPI D-PHY\n");
> +		return PTR_ERR(cdev->dphy);
> +	}
> +
> +	ret = phy_init(cdev->dphy);
> +	if (ret) {
> +		dev_err(&pdev->dev, "failed to initialize the MIPI D-PHY\n");
> +		return ret;
> +	}
> +
> +	platform_set_drvdata(pdev, cdev);
> +
> +	ret = sun6i_mipi_csi2_v4l2_setup(cdev);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +
> +static int sun6i_mipi_csi2_remove(struct platform_device *pdev)
> +{
> +	struct sun6i_mipi_csi2_dev *cdev = platform_get_drvdata(pdev);
> +
> +	phy_exit(cdev->dphy);
> +
> +	return sun6i_mipi_csi2_v4l2_teardown(cdev);

This seem to be the only user and its content is pretty straightforward,
so we shouldn't have a separate function here

> +}
> +
> +static const struct dev_pm_ops sun6i_mipi_csi2_pm_ops = {
> +	SET_RUNTIME_PM_OPS(sun6i_mipi_csi2_suspend, sun6i_mipi_csi2_resume,
> +			   NULL)
> +};
> +
> +static const struct of_device_id sun6i_mipi_csi2_of_match[] = {
> +	{ .compatible = "allwinner,sun6i-a31-mipi-csi2" },
> +	{ .compatible = "allwinner,sun8i-v3s-mipi-csi2", },

There's no need for the v3s compatible here, it will fallback to the a31
one anyway.

Maxime
Paul Kocialkowski Dec. 2, 2020, 2:44 p.m. UTC | #2 
Hi,

On Tue 01 Dec 20, 13:20, Maxime Ripard wrote:
> Hi,

> 

> On Sat, Nov 28, 2020 at 03:28:33PM +0100, Paul Kocialkowski wrote:

> > The A31 MIPI CSI-2 controller is a dedicated MIPI CSI-2 bridge

> > found on Allwinner SoCs such as the A31 and V3/V3s.

> > 

> > It is a standalone block, connected to the CSI controller on one side

> > and to the MIPI D-PHY block on the other. It has a dedicated address

> > space, interrupt line and clock.

> > 

> > It is represented as a V4L2 subdev to the CSI controller and takes a

> > MIPI CSI-2 sensor as its own subdev, all using the fwnode graph and

> > media controller API.

> > 

> > Only 8-bit and 10-bit Bayer formats are currently supported.

> > While up to 4 internal channels to the CSI controller exist, only one

> > is currently supported by this implementation.

> > 

> > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

> > ---

> >  drivers/media/platform/sunxi/Kconfig          |   1 +

> >  drivers/media/platform/sunxi/Makefile         |   1 +

> >  .../platform/sunxi/sun6i-mipi-csi2/Kconfig    |  12 +

> >  .../platform/sunxi/sun6i-mipi-csi2/Makefile   |   4 +

> >  .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c   | 591 ++++++++++++++++++

> >  .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h   | 117 ++++

> >  6 files changed, 726 insertions(+)

> >  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig

> >  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile

> >  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c

> >  create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h

> > 

> > diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig

> > index 7151cc249afa..9684e07454ad 100644

> > --- a/drivers/media/platform/sunxi/Kconfig

> > +++ b/drivers/media/platform/sunxi/Kconfig

> > @@ -2,3 +2,4 @@

> >  

> >  source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"

> >  source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"

> > +source "drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig"

> > diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/sunxi/Makefile

> > index fc537c9f5ca9..887a7cae8fca 100644

> > --- a/drivers/media/platform/sunxi/Makefile

> > +++ b/drivers/media/platform/sunxi/Makefile

> > @@ -2,5 +2,6 @@

> >  

> >  obj-y		+= sun4i-csi/

> >  obj-y		+= sun6i-csi/

> > +obj-y		+= sun6i-mipi-csi2/

> 

> I'm not sure we need a new folder here, it's only ever tied to sun6i-csi

> so it would make more sense to have it in the same folder.


My thinking was that it's a different driver and a different hardware block,
so it's less confusing to have it in a different directory. I think many would
expect the driver to share code with sun6i-csi (in a component driver kind of
way) if it was in the same directory, which is not the case here.

> >  obj-y		+= sun8i-di/

> >  obj-y		+= sun8i-rotate/

> > diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig

> > new file mode 100644

> > index 000000000000..3260591ed5c0

> > --- /dev/null

> > +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig

> > @@ -0,0 +1,12 @@

> > +# SPDX-License-Identifier: GPL-2.0-only

> > +config VIDEO_SUN6I_MIPI_CSI2

> > +	tristate "Allwinner A31 MIPI CSI-2 Controller Driver"

> > +	depends on VIDEO_V4L2 && COMMON_CLK

> > +	depends on ARCH_SUNXI || COMPILE_TEST

> > +	select PHY_SUN6I_MIPI_DPHY

> > +	select MEDIA_CONTROLLER

> > +	select VIDEO_V4L2_SUBDEV_API

> > +	select REGMAP_MMIO

> > +	select V4L2_FWNODE

> > +	help

> > +	   Support for the Allwinner A31 MIPI CSI-2 Controller.

> > diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile

> > new file mode 100644

> > index 000000000000..14e4e03818b5

> > --- /dev/null

> > +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile

> > @@ -0,0 +1,4 @@

> > +# SPDX-License-Identifier: GPL-2.0-only

> > +sun6i-mipi-csi2-y += sun6i_mipi_csi2.o

> > +

> > +obj-$(CONFIG_VIDEO_SUN6I_MIPI_CSI2) += sun6i-mipi-csi2.o

> > diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c

> > new file mode 100644

> > index 000000000000..a6567ef82fb4

> > --- /dev/null

> > +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c

> > @@ -0,0 +1,591 @@

> > +// SPDX-License-Identifier: GPL-2.0+

> > +/*

> > + * Copyright 2020 Bootlin

> > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

> > + */

> > +

> > +#include <linux/clk.h>

> > +#include <linux/interrupt.h>

> > +#include <linux/module.h>

> > +#include <linux/of.h>

> > +#include <linux/of_device.h>

> > +#include <linux/phy/phy.h>

> > +#include <linux/platform_device.h>

> > +#include <linux/pm_runtime.h>

> > +#include <linux/regmap.h>

> > +#include <linux/reset.h>

> > +#include <media/v4l2-ctrls.h>

> > +#include <media/v4l2-device.h>

> > +#include <media/v4l2-fwnode.h>

> > +

> > +#include "sun6i_mipi_csi2.h"

> > +

> > +#define MODULE_NAME	"sun6i-mipi-csi2"

> > +

> > +static const u32 sun6i_mipi_csi2_mbus_codes[] = {

> > +	MEDIA_BUS_FMT_SBGGR8_1X8,

> > +	MEDIA_BUS_FMT_SGBRG8_1X8,

> > +	MEDIA_BUS_FMT_SGRBG8_1X8,

> > +	MEDIA_BUS_FMT_SRGGB8_1X8,

> > +	MEDIA_BUS_FMT_SBGGR10_1X10,

> > +	MEDIA_BUS_FMT_SGBRG10_1X10,

> > +	MEDIA_BUS_FMT_SGRBG10_1X10,

> > +	MEDIA_BUS_FMT_SRGGB10_1X10,

> > +};

> > +

> > +/* Video */

> > +

> > +static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on)

> > +{

> > +	struct sun6i_mipi_csi2_video *video =

> > +		sun6i_mipi_csi2_subdev_video(subdev);

> > +	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);

> > +	struct v4l2_subdev *remote_subdev = video->remote_subdev;

> > +	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =

> > +		&video->endpoint.bus.mipi_csi2;

> > +	union phy_configure_opts dphy_opts = { 0 };

> > +	struct phy_configure_opts_mipi_dphy *dphy_cfg = &dphy_opts.mipi_dphy;

> > +	struct regmap *regmap = cdev->regmap;

> > +	struct v4l2_ctrl *ctrl;

> > +	unsigned int lanes_count;

> > +	unsigned int bpp;

> > +	unsigned long pixel_rate;

> > +	u8 data_type = 0;

> > +	u32 version = 0;

> > +	/* Initialize to 0 to use both in disable label (ret != 0) and off. */

> > +	int ret = 0;

> > +

> > +	if (!remote_subdev)

> > +		return -ENODEV;

> > +

> > +	if (!on) {

> > +		v4l2_subdev_call(remote_subdev, video, s_stream, 0);

> > +		goto disable;

> > +	}

> > +

> > +	switch (video->mbus_format.code) {

> > +	case MEDIA_BUS_FMT_SBGGR8_1X8:

> > +	case MEDIA_BUS_FMT_SGBRG8_1X8:

> > +	case MEDIA_BUS_FMT_SGRBG8_1X8:

> > +	case MEDIA_BUS_FMT_SRGGB8_1X8:

> > +		data_type = MIPI_CSI2_DATA_TYPE_RAW8;

> > +		bpp = 8;

> > +		break;

> > +	case MEDIA_BUS_FMT_SBGGR10_1X10:

> > +	case MEDIA_BUS_FMT_SGBRG10_1X10:

> > +	case MEDIA_BUS_FMT_SGRBG10_1X10:

> > +	case MEDIA_BUS_FMT_SRGGB10_1X10:

> > +		data_type = MIPI_CSI2_DATA_TYPE_RAW10;

> > +		bpp = 10;

> > +		break;

> > +	default:

> > +		return -EINVAL;

> > +	}

> > +

> > +	/* Sensor pixel rate */

> > +

> > +	ctrl = v4l2_ctrl_find(remote_subdev->ctrl_handler, V4L2_CID_PIXEL_RATE);

> > +	if (!ctrl) {

> > +		dev_err(cdev->dev,

> > +			"%s: no MIPI CSI-2 pixel rate from the sensor\n",

> > +			__func__);

> > +		return -ENODEV;

> > +	}

> > +

> > +	pixel_rate = (unsigned long)v4l2_ctrl_g_ctrl_int64(ctrl);

> > +	if (!pixel_rate) {

> > +		dev_err(cdev->dev,

> > +			"%s: zero MIPI CSI-2 pixel rate from the sensor\n",

> > +			__func__);

> > +		return -ENODEV;

> > +	}

> > +

> > +	/* Power management */

> > +

> > +	ret = pm_runtime_get_sync(cdev->dev);

> > +	if (ret < 0) {

> > +		pm_runtime_put_noidle(cdev->dev);

> > +		return ret;

> > +	}

> > +

> > +	/* D-PHY configuration */

> > +

> > +	lanes_count = bus_mipi_csi2->num_data_lanes;

> > +	phy_mipi_dphy_get_default_config(pixel_rate, bpp, lanes_count,

> > +					 dphy_cfg);

> > +

> > +	/*

> > +	 * Note that our hardware is using DDR, which is not taken in account by

> > +	 * phy_mipi_dphy_get_default_config when calculating hs_clk_rate from

> > +	 * the pixel rate, lanes count and bpp.

> > +	 *

> > +	 * The resulting clock rate is basically the symbol rate over the whole

> > +	 * link. The actual clock rate is calculated with division by two since

> > +	 * DDR samples both on rising and falling edges.

> > +	 */

> > +

> > +	dev_dbg(cdev->dev, "A31 MIPI CSI-2 config:\n");

> > +	dev_dbg(cdev->dev, "%ld pixels/s, %u bits/pixel, %lu Hz clock\n",

> > +		pixel_rate, bpp, dphy_cfg->hs_clk_rate / 2);

> > +

> > +	ret = phy_reset(cdev->dphy);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to reset MIPI D-PHY\n");

> > +		goto error_pm;

> > +	}

> > +

> > +	ret = phy_set_mode_ext(cdev->dphy, PHY_MODE_MIPI_DPHY,

> > +			       PHY_MIPI_DPHY_SUBMODE_RX);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to set MIPI D-PHY mode\n");

> > +		goto error_pm;

> > +	}

> > +

> > +	ret = phy_configure(cdev->dphy, &dphy_opts);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to configure MIPI D-PHY\n");

> > +		goto error_pm;

> > +	}

> > +

> > +	ret = phy_power_on(cdev->dphy);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to power on MIPI D-PHY\n");

> > +		goto error_pm;

> > +	}

> > +

> > +	/* MIPI CSI-2 controller setup */

> > +

> > +	/*

> > +	 * The enable flow in the Allwinner BSP is a bit different: the enable

> > +	 * and reset bits are set together before starting the CSI controller.

> > +	 *

> > +	 * In mainline we enable the CSI controller first (due to subdev logic).

> > +	 * One reliable way to make this work is to deassert reset, configure

> > +	 * registers and enable the controller when everything's ready.

> > +	 *

> > +	 * However, setting the version enable bit and removing it afterwards

> > +	 * appears necessary for capture to work reliably, while replacing it

> > +	 * with a delay doesn't do the trick.

> > +	 */

> > +	regmap_write(regmap, SUN6I_MIPI_CSI2_CTL_REG,

> > +		     SUN6I_MIPI_CSI2_CTL_RESET_N |

> > +		     SUN6I_MIPI_CSI2_CTL_VERSION_EN |

> > +		     SUN6I_MIPI_CSI2_CTL_UNPK_EN);

> > +

> > +	regmap_read(regmap, SUN6I_MIPI_CSI2_VERSION_REG, &version);

> > +

> > +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,

> > +				   SUN6I_MIPI_CSI2_CTL_VERSION_EN, 0);

> > +

> > +	dev_dbg(cdev->dev, "A31 MIPI CSI-2 version: %04x\n", version);

> > +

> > +	regmap_write(regmap, SUN6I_MIPI_CSI2_CFG_REG,

> > +		     SUN6I_MIPI_CSI2_CFG_CHANNEL_MODE(1) |

> > +		     SUN6I_MIPI_CSI2_CFG_LANE_COUNT(lanes_count));

> > +

> > +	/*

> > +	 * Our MIPI CSI-2 controller has internal channels that can be

> > +	 * configured to match a specific MIPI CSI-2 virtual channel and/or

> > +	 * a specific data type. Each internal channel can be piped to an

> > +	 * internal channel of the CSI controller.

> > +	 *

> > +	 * We set virtual channel numbers to all channels to make sure that

> > +	 * virtual channel 0 goes to CSI channel 0 only.

> > +	 */

> > +	regmap_write(regmap, SUN6I_MIPI_CSI2_VCDT_RX_REG,

> > +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(3, 3) |

> > +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(2, 2) |

> > +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(1, 1) |

> > +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(0, 0) |

> > +		     SUN6I_MIPI_CSI2_VCDT_RX_CH_DT(0, data_type));

> > +

> > +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,

> > +			   SUN6I_MIPI_CSI2_CTL_EN, SUN6I_MIPI_CSI2_CTL_EN);

> > +

> > +	ret = v4l2_subdev_call(remote_subdev, video, s_stream, 1);

> > +	if (ret)

> > +		goto disable;

> > +

> > +	return 0;

> > +

> > +disable:

> > +	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,

> > +			   SUN6I_MIPI_CSI2_CTL_EN, 0);

> > +

> > +	phy_power_off(cdev->dphy);

> > +

> > +error_pm:

> > +	pm_runtime_put(cdev->dev);

> > +

> > +	return ret;

> > +}

> > +

> > +static const struct v4l2_subdev_video_ops sun6i_mipi_csi2_subdev_video_ops = {

> > +	.s_stream	= sun6i_mipi_csi2_s_stream,

> > +};

> > +

> > +/* Pad */

> > +

> > +static int

> > +sun6i_mipi_csi2_enum_mbus_code(struct v4l2_subdev *subdev,

> > +			       struct v4l2_subdev_pad_config *config,

> > +			       struct v4l2_subdev_mbus_code_enum *code_enum)

> > +{

> > +	if (code_enum->index >= ARRAY_SIZE(sun6i_mipi_csi2_mbus_codes))

> > +		return -EINVAL;

> > +

> > +	code_enum->code = sun6i_mipi_csi2_mbus_codes[code_enum->index];

> > +

> > +	return 0;

> > +}

> > +

> > +static int sun6i_mipi_csi2_get_fmt(struct v4l2_subdev *subdev,

> > +				   struct v4l2_subdev_pad_config *config,

> > +				   struct v4l2_subdev_format *format)

> > +{

> > +	struct sun6i_mipi_csi2_video *video =

> > +		sun6i_mipi_csi2_subdev_video(subdev);

> > +	struct v4l2_mbus_framefmt *mbus_format = &format->format;

> > +

> > +	if (format->which == V4L2_SUBDEV_FORMAT_TRY)

> > +		*mbus_format = *v4l2_subdev_get_try_format(subdev, config,

> > +							   format->pad);

> > +	else

> > +		*mbus_format = video->mbus_format;

> > +

> > +	return 0;

> > +}

> > +

> > +static int sun6i_mipi_csi2_set_fmt(struct v4l2_subdev *subdev,

> > +				   struct v4l2_subdev_pad_config *config,

> > +				   struct v4l2_subdev_format *format)

> > +{

> > +	struct sun6i_mipi_csi2_video *video =

> > +		sun6i_mipi_csi2_subdev_video(subdev);

> > +	struct v4l2_mbus_framefmt *mbus_format = &format->format;

> > +

> > +	if (format->which == V4L2_SUBDEV_FORMAT_TRY)

> > +		*v4l2_subdev_get_try_format(subdev, config, format->pad) =

> > +			*mbus_format;

> > +	else

> > +		video->mbus_format = *mbus_format;

> > +

> > +	return 0;

> > +}

> > +

> > +static const struct v4l2_subdev_pad_ops sun6i_mipi_csi2_subdev_pad_ops = {

> > +	.enum_mbus_code	= sun6i_mipi_csi2_enum_mbus_code,

> > +	.get_fmt	= sun6i_mipi_csi2_get_fmt,

> > +	.set_fmt	= sun6i_mipi_csi2_set_fmt,

> > +};

> > +

> > +/* Subdev */

> > +

> > +static const struct v4l2_subdev_ops sun6i_mipi_csi2_subdev_ops = {

> > +	.video		= &sun6i_mipi_csi2_subdev_video_ops,

> > +	.pad		= &sun6i_mipi_csi2_subdev_pad_ops,

> > +};

> > +

> > +/* Notifier */

> > +

> > +static int

> > +sun6i_mipi_csi2_notifier_bound(struct v4l2_async_notifier *notifier,

> > +			       struct v4l2_subdev *remote_subdev,

> > +			       struct v4l2_async_subdev *remote_subdev_async)

> > +{

> > +	struct v4l2_subdev *subdev = notifier->sd;

> > +	struct sun6i_mipi_csi2_video *video =

> > +		sun6i_mipi_csi2_subdev_video(subdev);

> > +	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);

> > +	int source_pad;

> > +	int ret;

> > +

> > +	source_pad = media_entity_get_fwnode_pad(&remote_subdev->entity,

> > +						 remote_subdev->fwnode,

> > +						 MEDIA_PAD_FL_SOURCE);

> > +	if (source_pad < 0)

> > +		return source_pad;

> > +

> > +	ret = media_create_pad_link(&remote_subdev->entity, source_pad,

> > +				    &subdev->entity, 0,

> > +				    MEDIA_LNK_FL_ENABLED |

> > +				    MEDIA_LNK_FL_IMMUTABLE);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to create %s:%u -> %s:%u link\n",

> > +			remote_subdev->entity.name, source_pad,

> > +			subdev->entity.name, 0);

> > +		return ret;

> > +	}

> > +

> > +	video->remote_subdev = remote_subdev;

> > +

> > +	return 0;

> > +}

> > +

> > +static const

> > +struct v4l2_async_notifier_operations sun6i_mipi_csi2_notifier_ops = {

> > +	.bound		= sun6i_mipi_csi2_notifier_bound,

> > +};

> > +

> > +/* Media Entity */

> > +

> > +static const struct media_entity_operations sun6i_mipi_csi2_entity_ops = {

> > +	.link_validate	= v4l2_subdev_link_validate,

> > +};

> > +

> > +/* Base Driver */

> > +

> > +static int __maybe_unused sun6i_mipi_csi2_suspend(struct device *dev)

> > +{

> > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);

> > +

> > +	clk_disable_unprepare(cdev->clk_mod);

> > +	clk_disable_unprepare(cdev->clk_bus);

> > +	reset_control_assert(cdev->reset);

> > +

> > +	return 0;

> > +}

> > +

> > +static int __maybe_unused sun6i_mipi_csi2_resume(struct device *dev)

> > +{

> > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);

> > +	int ret;

> > +

> > +	ret = reset_control_deassert(cdev->reset);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to deassert reset\n");

> > +		return ret;

> > +	}

> > +

> > +	ret = clk_prepare_enable(cdev->clk_bus);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to enable bus clock\n");

> > +		goto error_reset;

> > +	}

> > +

> > +	ret = clk_prepare_enable(cdev->clk_mod);

> > +	if (ret) {

> > +		dev_err(cdev->dev, "failed to enable module clock\n");

> > +		goto error_clk_bus;

> > +	}

> > +

> > +	return 0;

> > +

> > +error_clk_bus:

> > +	clk_disable_unprepare(cdev->clk_bus);

> > +

> > +error_reset:

> > +	reset_control_assert(cdev->reset);

> > +

> > +	return ret;

> > +}

> 

> I'm guessing you set the __maybe_unused attribute because you're using

> SET_RUNTIME_PM_OPS, but what would happen if runtime_pm isn't selected?

> It looks like you don't handle that case.


Indeed, __maybe_unused is because of the conditional definition of
SET_RUNTIME_PM_OPS. If CONFIG_PM is not selected, then I guess the controller
wouldn't be powered and wouldn't work. So I should definitely add a Kconfig
dependency on PM then, right?

Thanks for catching this!

> > +static int sun6i_mipi_csi2_v4l2_setup(struct sun6i_mipi_csi2_dev *cdev)

> > +{

> > +	struct sun6i_mipi_csi2_video *video = &cdev->video;

> > +	struct v4l2_subdev *subdev = &video->subdev;

> > +	struct v4l2_async_notifier *notifier = &video->notifier;

> > +	struct fwnode_handle *handle;

> > +	struct v4l2_fwnode_endpoint *endpoint;

> > +	struct v4l2_async_subdev *subdev_async;

> > +	int ret;

> > +

> > +	/* Subdev */

> > +

> > +	v4l2_subdev_init(subdev, &sun6i_mipi_csi2_subdev_ops);

> > +	subdev->dev = cdev->dev;

> > +	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

> > +	strscpy(subdev->name, MODULE_NAME, sizeof(subdev->name));

> > +	v4l2_set_subdevdata(subdev, cdev);

> > +

> > +	/* Entity */

> > +

> > +	subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;

> > +	subdev->entity.ops = &sun6i_mipi_csi2_entity_ops;

> > +

> > +	/* Pads */

> > +

> > +	video->pads[0].flags = MEDIA_PAD_FL_SINK;

> > +	video->pads[1].flags = MEDIA_PAD_FL_SOURCE;

> > +

> > +	ret = media_entity_pads_init(&subdev->entity, 2, video->pads);

> > +	if (ret)

> > +		return ret;

> > +

> > +	/* Endpoint */

> > +

> > +	handle = fwnode_graph_get_endpoint_by_id(dev_fwnode(cdev->dev), 0, 0,

> > +						 FWNODE_GRAPH_ENDPOINT_NEXT);

> > +	if (!handle) {

> > +		ret = -ENODEV;

> > +		goto error_media_entity;

> > +	}

> > +

> > +	endpoint = &video->endpoint;

> > +	endpoint->bus_type = V4L2_MBUS_CSI2_DPHY;

> > +

> > +	ret = v4l2_fwnode_endpoint_parse(handle, endpoint);

> > +	fwnode_handle_put(handle);

> > +	if (ret)

> > +		goto error_media_entity;

> > +

> > +	/* Notifier */

> > +

> > +	v4l2_async_notifier_init(notifier);

> > +

> > +	subdev_async = &video->subdev_async;

> > +	ret = v4l2_async_notifier_add_fwnode_remote_subdev(notifier, handle,

> > +							   subdev_async);

> > +	if (ret)

> > +		goto error_media_entity;

> > +

> > +	video->notifier.ops = &sun6i_mipi_csi2_notifier_ops;

> > +

> > +	ret = v4l2_async_subdev_notifier_register(subdev, notifier);

> > +	if (ret < 0)

> > +		goto error_notifier;

> > +

> > +	/* Subdev */

> > +

> > +	ret = v4l2_async_register_subdev(subdev);

> > +	if (ret < 0)

> > +		goto error_notifier_registered;

> > +

> > +	/* Runtime PM */

> > +

> > +	pm_runtime_enable(cdev->dev);

> > +	pm_runtime_set_suspended(cdev->dev);

> > +

> > +	return 0;

> > +

> > +error_notifier_registered:

> > +	v4l2_async_notifier_unregister(notifier);

> > +error_notifier:

> > +	v4l2_async_notifier_cleanup(notifier);

> > +error_media_entity:

> > +	media_entity_cleanup(&subdev->entity);

> > +

> > +	return ret;

> > +}

> > +

> > +static int sun6i_mipi_csi2_v4l2_teardown(struct sun6i_mipi_csi2_dev *cdev)

> > +{

> > +	struct sun6i_mipi_csi2_video *video = &cdev->video;

> > +	struct v4l2_subdev *subdev = &video->subdev;

> > +	struct v4l2_async_notifier *notifier = &video->notifier;

> > +

> > +	v4l2_async_unregister_subdev(subdev);

> > +	v4l2_async_notifier_unregister(notifier);

> > +	v4l2_async_notifier_cleanup(notifier);

> > +	media_entity_cleanup(&subdev->entity);

> > +	v4l2_device_unregister_subdev(subdev);

> > +

> > +	return 0;

> > +}

> > +

> > +static const struct regmap_config sun6i_mipi_csi2_regmap_config = {

> > +	.reg_bits       = 32,

> > +	.reg_stride     = 4,

> > +	.val_bits       = 32,

> > +	.max_register	= 0x400,

> > +};

> > +

> > +static int sun6i_mipi_csi2_probe(struct platform_device *pdev)

> > +{

> > +	struct sun6i_mipi_csi2_dev *cdev;

> > +	struct resource *res;

> > +	void __iomem *io_base;

> > +	int ret;

> > +

> > +	cdev = devm_kzalloc(&pdev->dev, sizeof(*cdev), GFP_KERNEL);

> > +	if (!cdev)

> > +		return -ENOMEM;

> > +

> > +	cdev->dev = &pdev->dev;

> > +

> > +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

> > +	io_base = devm_ioremap_resource(&pdev->dev, res);

> > +	if (IS_ERR(io_base))

> > +		return PTR_ERR(io_base);

> > +

> > +	cdev->regmap = devm_regmap_init_mmio(&pdev->dev, io_base,

> > +					     &sun6i_mipi_csi2_regmap_config);

> > +	if (IS_ERR(cdev->regmap)) {

> > +		dev_err(&pdev->dev, "failed to init register map\n");

> > +		return PTR_ERR(cdev->regmap);

> > +	}

> > +

> > +	cdev->clk_bus = devm_clk_get(&pdev->dev, "bus");

> > +	if (IS_ERR(cdev->clk_bus)) {

> > +		dev_err(&pdev->dev, "failed to acquire bus clock\n");

> > +		return PTR_ERR(cdev->clk_bus);

> > +	}

> > +

> > +	cdev->clk_mod = devm_clk_get(&pdev->dev, "mod");

> > +	if (IS_ERR(cdev->clk_mod)) {

> > +		dev_err(&pdev->dev, "failed to acquire mod clock\n");

> > +		return PTR_ERR(cdev->clk_mod);

> > +	}

> > +

> > +	cdev->reset = devm_reset_control_get_shared(&pdev->dev, NULL);

> > +	if (IS_ERR(cdev->reset)) {

> > +		dev_err(&pdev->dev, "failed to get reset controller\n");

> > +		return PTR_ERR(cdev->reset);

> > +	}

> > +

> > +	cdev->dphy = devm_phy_get(&pdev->dev, "dphy");

> > +	if (IS_ERR(cdev->dphy)) {

> > +		dev_err(&pdev->dev, "failed to get the MIPI D-PHY\n");

> > +		return PTR_ERR(cdev->dphy);

> > +	}

> > +

> > +	ret = phy_init(cdev->dphy);

> > +	if (ret) {

> > +		dev_err(&pdev->dev, "failed to initialize the MIPI D-PHY\n");

> > +		return ret;

> > +	}

> > +

> > +	platform_set_drvdata(pdev, cdev);

> > +

> > +	ret = sun6i_mipi_csi2_v4l2_setup(cdev);

> > +	if (ret)

> > +		return ret;

> > +

> > +	return 0;

> > +}

> > +

> > +static int sun6i_mipi_csi2_remove(struct platform_device *pdev)

> > +{

> > +	struct sun6i_mipi_csi2_dev *cdev = platform_get_drvdata(pdev);

> > +

> > +	phy_exit(cdev->dphy);

> > +

> > +	return sun6i_mipi_csi2_v4l2_teardown(cdev);

> 

> This seem to be the only user and its content is pretty straightforward,

> so we shouldn't have a separate function here


This is for symmetry with sun6i_mipi_csi2_v4l2_setup and the intent is to split
v4l2 setup/teardown from driver resources, which makes things clearer and nicer
to read overall.

What are the downsides and why is it a problem that it has a single caller?

> > +}

> > +

> > +static const struct dev_pm_ops sun6i_mipi_csi2_pm_ops = {

> > +	SET_RUNTIME_PM_OPS(sun6i_mipi_csi2_suspend, sun6i_mipi_csi2_resume,

> > +			   NULL)

> > +};

> > +

> > +static const struct of_device_id sun6i_mipi_csi2_of_match[] = {

> > +	{ .compatible = "allwinner,sun6i-a31-mipi-csi2" },

> > +	{ .compatible = "allwinner,sun8i-v3s-mipi-csi2", },

> 

> There's no need for the v3s compatible here, it will fallback to the a31

> one anyway.


Understood.

Thanks for the review!

Cheers,

Paul


-- 
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
Maxime Ripard Dec. 2, 2020, 3:48 p.m. UTC | #3 
On Wed, Dec 02, 2020 at 03:44:47PM +0100, Paul Kocialkowski wrote:
> > > +static int __maybe_unused sun6i_mipi_csi2_suspend(struct device *dev)
> > > +{
> > > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
> > > +
> > > +	clk_disable_unprepare(cdev->clk_mod);
> > > +	clk_disable_unprepare(cdev->clk_bus);
> > > +	reset_control_assert(cdev->reset);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int __maybe_unused sun6i_mipi_csi2_resume(struct device *dev)
> > > +{
> > > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
> > > +	int ret;
> > > +
> > > +	ret = reset_control_deassert(cdev->reset);
> > > +	if (ret) {
> > > +		dev_err(cdev->dev, "failed to deassert reset\n");
> > > +		return ret;
> > > +	}
> > > +
> > > +	ret = clk_prepare_enable(cdev->clk_bus);
> > > +	if (ret) {
> > > +		dev_err(cdev->dev, "failed to enable bus clock\n");
> > > +		goto error_reset;
> > > +	}
> > > +
> > > +	ret = clk_prepare_enable(cdev->clk_mod);
> > > +	if (ret) {
> > > +		dev_err(cdev->dev, "failed to enable module clock\n");
> > > +		goto error_clk_bus;
> > > +	}
> > > +
> > > +	return 0;
> > > +
> > > +error_clk_bus:
> > > +	clk_disable_unprepare(cdev->clk_bus);
> > > +
> > > +error_reset:
> > > +	reset_control_assert(cdev->reset);
> > > +
> > > +	return ret;
> > > +}
> > 
> > I'm guessing you set the __maybe_unused attribute because you're using
> > SET_RUNTIME_PM_OPS, but what would happen if runtime_pm isn't selected?
> > It looks like you don't handle that case.
> 
> Indeed, __maybe_unused is because of the conditional definition of
> SET_RUNTIME_PM_OPS. If CONFIG_PM is not selected, then I guess the controller
> wouldn't be powered and wouldn't work. So I should definitely add a Kconfig
> dependency on PM then, right?

There's two ways we can do it. What you suggested is one, the other is
to have something like our SPI driver to call directly the resume
function if there's no runtime pm support.

Maxime
Paul Kocialkowski Dec. 2, 2020, 4:09 p.m. UTC | #4 
Hi,

On Wed 02 Dec 20, 16:48, Maxime Ripard wrote:
> On Wed, Dec 02, 2020 at 03:44:47PM +0100, Paul Kocialkowski wrote:

> > > > +static int __maybe_unused sun6i_mipi_csi2_suspend(struct device *dev)

> > > > +{

> > > > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);

> > > > +

> > > > +	clk_disable_unprepare(cdev->clk_mod);

> > > > +	clk_disable_unprepare(cdev->clk_bus);

> > > > +	reset_control_assert(cdev->reset);

> > > > +

> > > > +	return 0;

> > > > +}

> > > > +

> > > > +static int __maybe_unused sun6i_mipi_csi2_resume(struct device *dev)

> > > > +{

> > > > +	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);

> > > > +	int ret;

> > > > +

> > > > +	ret = reset_control_deassert(cdev->reset);

> > > > +	if (ret) {

> > > > +		dev_err(cdev->dev, "failed to deassert reset\n");

> > > > +		return ret;

> > > > +	}

> > > > +

> > > > +	ret = clk_prepare_enable(cdev->clk_bus);

> > > > +	if (ret) {

> > > > +		dev_err(cdev->dev, "failed to enable bus clock\n");

> > > > +		goto error_reset;

> > > > +	}

> > > > +

> > > > +	ret = clk_prepare_enable(cdev->clk_mod);

> > > > +	if (ret) {

> > > > +		dev_err(cdev->dev, "failed to enable module clock\n");

> > > > +		goto error_clk_bus;

> > > > +	}

> > > > +

> > > > +	return 0;

> > > > +

> > > > +error_clk_bus:

> > > > +	clk_disable_unprepare(cdev->clk_bus);

> > > > +

> > > > +error_reset:

> > > > +	reset_control_assert(cdev->reset);

> > > > +

> > > > +	return ret;

> > > > +}

> > > 

> > > I'm guessing you set the __maybe_unused attribute because you're using

> > > SET_RUNTIME_PM_OPS, but what would happen if runtime_pm isn't selected?

> > > It looks like you don't handle that case.

> > 

> > Indeed, __maybe_unused is because of the conditional definition of

> > SET_RUNTIME_PM_OPS. If CONFIG_PM is not selected, then I guess the controller

> > wouldn't be powered and wouldn't work. So I should definitely add a Kconfig

> > dependency on PM then, right?

> 

> There's two ways we can do it. What you suggested is one, the other is

> to have something like our SPI driver to call directly the resume

> function if there's no runtime pm support.


Understood! I think I'll stick to depending on PM (unless you prefer not to)
but it's good to know.

Cheers,

Paul

-- 
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
diff mbox series

Patch

diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
index 7151cc249afa..9684e07454ad 100644
--- a/drivers/media/platform/sunxi/Kconfig
+++ b/drivers/media/platform/sunxi/Kconfig
@@ -2,3 +2,4 @@ 
 
 source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
 source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
+source "drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig"
diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/sunxi/Makefile
index fc537c9f5ca9..887a7cae8fca 100644
--- a/drivers/media/platform/sunxi/Makefile
+++ b/drivers/media/platform/sunxi/Makefile
@@ -2,5 +2,6 @@ 
 
 obj-y		+= sun4i-csi/
 obj-y		+= sun6i-csi/
+obj-y		+= sun6i-mipi-csi2/
 obj-y		+= sun8i-di/
 obj-y		+= sun8i-rotate/
diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
new file mode 100644
index 000000000000..3260591ed5c0
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
@@ -0,0 +1,12 @@ 
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SUN6I_MIPI_CSI2
+	tristate "Allwinner A31 MIPI CSI-2 Controller Driver"
+	depends on VIDEO_V4L2 && COMMON_CLK
+	depends on ARCH_SUNXI || COMPILE_TEST
+	select PHY_SUN6I_MIPI_DPHY
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select REGMAP_MMIO
+	select V4L2_FWNODE
+	help
+	   Support for the Allwinner A31 MIPI CSI-2 Controller.
diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
new file mode 100644
index 000000000000..14e4e03818b5
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
@@ -0,0 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0-only
+sun6i-mipi-csi2-y += sun6i_mipi_csi2.o
+
+obj-$(CONFIG_VIDEO_SUN6I_MIPI_CSI2) += sun6i-mipi-csi2.o
diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
new file mode 100644
index 000000000000..a6567ef82fb4
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
@@ -0,0 +1,591 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2020 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
+
+#include "sun6i_mipi_csi2.h"
+
+#define MODULE_NAME	"sun6i-mipi-csi2"
+
+static const u32 sun6i_mipi_csi2_mbus_codes[] = {
+	MEDIA_BUS_FMT_SBGGR8_1X8,
+	MEDIA_BUS_FMT_SGBRG8_1X8,
+	MEDIA_BUS_FMT_SGRBG8_1X8,
+	MEDIA_BUS_FMT_SRGGB8_1X8,
+	MEDIA_BUS_FMT_SBGGR10_1X10,
+	MEDIA_BUS_FMT_SGBRG10_1X10,
+	MEDIA_BUS_FMT_SGRBG10_1X10,
+	MEDIA_BUS_FMT_SRGGB10_1X10,
+};
+
+/* Video */
+
+static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on)
+{
+	struct sun6i_mipi_csi2_video *video =
+		sun6i_mipi_csi2_subdev_video(subdev);
+	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);
+	struct v4l2_subdev *remote_subdev = video->remote_subdev;
+	struct v4l2_fwnode_bus_mipi_csi2 *bus_mipi_csi2 =
+		&video->endpoint.bus.mipi_csi2;
+	union phy_configure_opts dphy_opts = { 0 };
+	struct phy_configure_opts_mipi_dphy *dphy_cfg = &dphy_opts.mipi_dphy;
+	struct regmap *regmap = cdev->regmap;
+	struct v4l2_ctrl *ctrl;
+	unsigned int lanes_count;
+	unsigned int bpp;
+	unsigned long pixel_rate;
+	u8 data_type = 0;
+	u32 version = 0;
+	/* Initialize to 0 to use both in disable label (ret != 0) and off. */
+	int ret = 0;
+
+	if (!remote_subdev)
+		return -ENODEV;
+
+	if (!on) {
+		v4l2_subdev_call(remote_subdev, video, s_stream, 0);
+		goto disable;
+	}
+
+	switch (video->mbus_format.code) {
+	case MEDIA_BUS_FMT_SBGGR8_1X8:
+	case MEDIA_BUS_FMT_SGBRG8_1X8:
+	case MEDIA_BUS_FMT_SGRBG8_1X8:
+	case MEDIA_BUS_FMT_SRGGB8_1X8:
+		data_type = MIPI_CSI2_DATA_TYPE_RAW8;
+		bpp = 8;
+		break;
+	case MEDIA_BUS_FMT_SBGGR10_1X10:
+	case MEDIA_BUS_FMT_SGBRG10_1X10:
+	case MEDIA_BUS_FMT_SGRBG10_1X10:
+	case MEDIA_BUS_FMT_SRGGB10_1X10:
+		data_type = MIPI_CSI2_DATA_TYPE_RAW10;
+		bpp = 10;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/* Sensor pixel rate */
+
+	ctrl = v4l2_ctrl_find(remote_subdev->ctrl_handler, V4L2_CID_PIXEL_RATE);
+	if (!ctrl) {
+		dev_err(cdev->dev,
+			"%s: no MIPI CSI-2 pixel rate from the sensor\n",
+			__func__);
+		return -ENODEV;
+	}
+
+	pixel_rate = (unsigned long)v4l2_ctrl_g_ctrl_int64(ctrl);
+	if (!pixel_rate) {
+		dev_err(cdev->dev,
+			"%s: zero MIPI CSI-2 pixel rate from the sensor\n",
+			__func__);
+		return -ENODEV;
+	}
+
+	/* Power management */
+
+	ret = pm_runtime_get_sync(cdev->dev);
+	if (ret < 0) {
+		pm_runtime_put_noidle(cdev->dev);
+		return ret;
+	}
+
+	/* D-PHY configuration */
+
+	lanes_count = bus_mipi_csi2->num_data_lanes;
+	phy_mipi_dphy_get_default_config(pixel_rate, bpp, lanes_count,
+					 dphy_cfg);
+
+	/*
+	 * Note that our hardware is using DDR, which is not taken in account by
+	 * phy_mipi_dphy_get_default_config when calculating hs_clk_rate from
+	 * the pixel rate, lanes count and bpp.
+	 *
+	 * The resulting clock rate is basically the symbol rate over the whole
+	 * link. The actual clock rate is calculated with division by two since
+	 * DDR samples both on rising and falling edges.
+	 */
+
+	dev_dbg(cdev->dev, "A31 MIPI CSI-2 config:\n");
+	dev_dbg(cdev->dev, "%ld pixels/s, %u bits/pixel, %lu Hz clock\n",
+		pixel_rate, bpp, dphy_cfg->hs_clk_rate / 2);
+
+	ret = phy_reset(cdev->dphy);
+	if (ret) {
+		dev_err(cdev->dev, "failed to reset MIPI D-PHY\n");
+		goto error_pm;
+	}
+
+	ret = phy_set_mode_ext(cdev->dphy, PHY_MODE_MIPI_DPHY,
+			       PHY_MIPI_DPHY_SUBMODE_RX);
+	if (ret) {
+		dev_err(cdev->dev, "failed to set MIPI D-PHY mode\n");
+		goto error_pm;
+	}
+
+	ret = phy_configure(cdev->dphy, &dphy_opts);
+	if (ret) {
+		dev_err(cdev->dev, "failed to configure MIPI D-PHY\n");
+		goto error_pm;
+	}
+
+	ret = phy_power_on(cdev->dphy);
+	if (ret) {
+		dev_err(cdev->dev, "failed to power on MIPI D-PHY\n");
+		goto error_pm;
+	}
+
+	/* MIPI CSI-2 controller setup */
+
+	/*
+	 * The enable flow in the Allwinner BSP is a bit different: the enable
+	 * and reset bits are set together before starting the CSI controller.
+	 *
+	 * In mainline we enable the CSI controller first (due to subdev logic).
+	 * One reliable way to make this work is to deassert reset, configure
+	 * registers and enable the controller when everything's ready.
+	 *
+	 * However, setting the version enable bit and removing it afterwards
+	 * appears necessary for capture to work reliably, while replacing it
+	 * with a delay doesn't do the trick.
+	 */
+	regmap_write(regmap, SUN6I_MIPI_CSI2_CTL_REG,
+		     SUN6I_MIPI_CSI2_CTL_RESET_N |
+		     SUN6I_MIPI_CSI2_CTL_VERSION_EN |
+		     SUN6I_MIPI_CSI2_CTL_UNPK_EN);
+
+	regmap_read(regmap, SUN6I_MIPI_CSI2_VERSION_REG, &version);
+
+	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
+				   SUN6I_MIPI_CSI2_CTL_VERSION_EN, 0);
+
+	dev_dbg(cdev->dev, "A31 MIPI CSI-2 version: %04x\n", version);
+
+	regmap_write(regmap, SUN6I_MIPI_CSI2_CFG_REG,
+		     SUN6I_MIPI_CSI2_CFG_CHANNEL_MODE(1) |
+		     SUN6I_MIPI_CSI2_CFG_LANE_COUNT(lanes_count));
+
+	/*
+	 * Our MIPI CSI-2 controller has internal channels that can be
+	 * configured to match a specific MIPI CSI-2 virtual channel and/or
+	 * a specific data type. Each internal channel can be piped to an
+	 * internal channel of the CSI controller.
+	 *
+	 * We set virtual channel numbers to all channels to make sure that
+	 * virtual channel 0 goes to CSI channel 0 only.
+	 */
+	regmap_write(regmap, SUN6I_MIPI_CSI2_VCDT_RX_REG,
+		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(3, 3) |
+		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(2, 2) |
+		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(1, 1) |
+		     SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(0, 0) |
+		     SUN6I_MIPI_CSI2_VCDT_RX_CH_DT(0, data_type));
+
+	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
+			   SUN6I_MIPI_CSI2_CTL_EN, SUN6I_MIPI_CSI2_CTL_EN);
+
+	ret = v4l2_subdev_call(remote_subdev, video, s_stream, 1);
+	if (ret)
+		goto disable;
+
+	return 0;
+
+disable:
+	regmap_update_bits(regmap, SUN6I_MIPI_CSI2_CTL_REG,
+			   SUN6I_MIPI_CSI2_CTL_EN, 0);
+
+	phy_power_off(cdev->dphy);
+
+error_pm:
+	pm_runtime_put(cdev->dev);
+
+	return ret;
+}
+
+static const struct v4l2_subdev_video_ops sun6i_mipi_csi2_subdev_video_ops = {
+	.s_stream	= sun6i_mipi_csi2_s_stream,
+};
+
+/* Pad */
+
+static int
+sun6i_mipi_csi2_enum_mbus_code(struct v4l2_subdev *subdev,
+			       struct v4l2_subdev_pad_config *config,
+			       struct v4l2_subdev_mbus_code_enum *code_enum)
+{
+	if (code_enum->index >= ARRAY_SIZE(sun6i_mipi_csi2_mbus_codes))
+		return -EINVAL;
+
+	code_enum->code = sun6i_mipi_csi2_mbus_codes[code_enum->index];
+
+	return 0;
+}
+
+static int sun6i_mipi_csi2_get_fmt(struct v4l2_subdev *subdev,
+				   struct v4l2_subdev_pad_config *config,
+				   struct v4l2_subdev_format *format)
+{
+	struct sun6i_mipi_csi2_video *video =
+		sun6i_mipi_csi2_subdev_video(subdev);
+	struct v4l2_mbus_framefmt *mbus_format = &format->format;
+
+	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
+		*mbus_format = *v4l2_subdev_get_try_format(subdev, config,
+							   format->pad);
+	else
+		*mbus_format = video->mbus_format;
+
+	return 0;
+}
+
+static int sun6i_mipi_csi2_set_fmt(struct v4l2_subdev *subdev,
+				   struct v4l2_subdev_pad_config *config,
+				   struct v4l2_subdev_format *format)
+{
+	struct sun6i_mipi_csi2_video *video =
+		sun6i_mipi_csi2_subdev_video(subdev);
+	struct v4l2_mbus_framefmt *mbus_format = &format->format;
+
+	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
+		*v4l2_subdev_get_try_format(subdev, config, format->pad) =
+			*mbus_format;
+	else
+		video->mbus_format = *mbus_format;
+
+	return 0;
+}
+
+static const struct v4l2_subdev_pad_ops sun6i_mipi_csi2_subdev_pad_ops = {
+	.enum_mbus_code	= sun6i_mipi_csi2_enum_mbus_code,
+	.get_fmt	= sun6i_mipi_csi2_get_fmt,
+	.set_fmt	= sun6i_mipi_csi2_set_fmt,
+};
+
+/* Subdev */
+
+static const struct v4l2_subdev_ops sun6i_mipi_csi2_subdev_ops = {
+	.video		= &sun6i_mipi_csi2_subdev_video_ops,
+	.pad		= &sun6i_mipi_csi2_subdev_pad_ops,
+};
+
+/* Notifier */
+
+static int
+sun6i_mipi_csi2_notifier_bound(struct v4l2_async_notifier *notifier,
+			       struct v4l2_subdev *remote_subdev,
+			       struct v4l2_async_subdev *remote_subdev_async)
+{
+	struct v4l2_subdev *subdev = notifier->sd;
+	struct sun6i_mipi_csi2_video *video =
+		sun6i_mipi_csi2_subdev_video(subdev);
+	struct sun6i_mipi_csi2_dev *cdev = sun6i_mipi_csi2_video_dev(video);
+	int source_pad;
+	int ret;
+
+	source_pad = media_entity_get_fwnode_pad(&remote_subdev->entity,
+						 remote_subdev->fwnode,
+						 MEDIA_PAD_FL_SOURCE);
+	if (source_pad < 0)
+		return source_pad;
+
+	ret = media_create_pad_link(&remote_subdev->entity, source_pad,
+				    &subdev->entity, 0,
+				    MEDIA_LNK_FL_ENABLED |
+				    MEDIA_LNK_FL_IMMUTABLE);
+	if (ret) {
+		dev_err(cdev->dev, "failed to create %s:%u -> %s:%u link\n",
+			remote_subdev->entity.name, source_pad,
+			subdev->entity.name, 0);
+		return ret;
+	}
+
+	video->remote_subdev = remote_subdev;
+
+	return 0;
+}
+
+static const
+struct v4l2_async_notifier_operations sun6i_mipi_csi2_notifier_ops = {
+	.bound		= sun6i_mipi_csi2_notifier_bound,
+};
+
+/* Media Entity */
+
+static const struct media_entity_operations sun6i_mipi_csi2_entity_ops = {
+	.link_validate	= v4l2_subdev_link_validate,
+};
+
+/* Base Driver */
+
+static int __maybe_unused sun6i_mipi_csi2_suspend(struct device *dev)
+{
+	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
+
+	clk_disable_unprepare(cdev->clk_mod);
+	clk_disable_unprepare(cdev->clk_bus);
+	reset_control_assert(cdev->reset);
+
+	return 0;
+}
+
+static int __maybe_unused sun6i_mipi_csi2_resume(struct device *dev)
+{
+	struct sun6i_mipi_csi2_dev *cdev = dev_get_drvdata(dev);
+	int ret;
+
+	ret = reset_control_deassert(cdev->reset);
+	if (ret) {
+		dev_err(cdev->dev, "failed to deassert reset\n");
+		return ret;
+	}
+
+	ret = clk_prepare_enable(cdev->clk_bus);
+	if (ret) {
+		dev_err(cdev->dev, "failed to enable bus clock\n");
+		goto error_reset;
+	}
+
+	ret = clk_prepare_enable(cdev->clk_mod);
+	if (ret) {
+		dev_err(cdev->dev, "failed to enable module clock\n");
+		goto error_clk_bus;
+	}
+
+	return 0;
+
+error_clk_bus:
+	clk_disable_unprepare(cdev->clk_bus);
+
+error_reset:
+	reset_control_assert(cdev->reset);
+
+	return ret;
+}
+
+static int sun6i_mipi_csi2_v4l2_setup(struct sun6i_mipi_csi2_dev *cdev)
+{
+	struct sun6i_mipi_csi2_video *video = &cdev->video;
+	struct v4l2_subdev *subdev = &video->subdev;
+	struct v4l2_async_notifier *notifier = &video->notifier;
+	struct fwnode_handle *handle;
+	struct v4l2_fwnode_endpoint *endpoint;
+	struct v4l2_async_subdev *subdev_async;
+	int ret;
+
+	/* Subdev */
+
+	v4l2_subdev_init(subdev, &sun6i_mipi_csi2_subdev_ops);
+	subdev->dev = cdev->dev;
+	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+	strscpy(subdev->name, MODULE_NAME, sizeof(subdev->name));
+	v4l2_set_subdevdata(subdev, cdev);
+
+	/* Entity */
+
+	subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
+	subdev->entity.ops = &sun6i_mipi_csi2_entity_ops;
+
+	/* Pads */
+
+	video->pads[0].flags = MEDIA_PAD_FL_SINK;
+	video->pads[1].flags = MEDIA_PAD_FL_SOURCE;
+
+	ret = media_entity_pads_init(&subdev->entity, 2, video->pads);
+	if (ret)
+		return ret;
+
+	/* Endpoint */
+
+	handle = fwnode_graph_get_endpoint_by_id(dev_fwnode(cdev->dev), 0, 0,
+						 FWNODE_GRAPH_ENDPOINT_NEXT);
+	if (!handle) {
+		ret = -ENODEV;
+		goto error_media_entity;
+	}
+
+	endpoint = &video->endpoint;
+	endpoint->bus_type = V4L2_MBUS_CSI2_DPHY;
+
+	ret = v4l2_fwnode_endpoint_parse(handle, endpoint);
+	fwnode_handle_put(handle);
+	if (ret)
+		goto error_media_entity;
+
+	/* Notifier */
+
+	v4l2_async_notifier_init(notifier);
+
+	subdev_async = &video->subdev_async;
+	ret = v4l2_async_notifier_add_fwnode_remote_subdev(notifier, handle,
+							   subdev_async);
+	if (ret)
+		goto error_media_entity;
+
+	video->notifier.ops = &sun6i_mipi_csi2_notifier_ops;
+
+	ret = v4l2_async_subdev_notifier_register(subdev, notifier);
+	if (ret < 0)
+		goto error_notifier;
+
+	/* Subdev */
+
+	ret = v4l2_async_register_subdev(subdev);
+	if (ret < 0)
+		goto error_notifier_registered;
+
+	/* Runtime PM */
+
+	pm_runtime_enable(cdev->dev);
+	pm_runtime_set_suspended(cdev->dev);
+
+	return 0;
+
+error_notifier_registered:
+	v4l2_async_notifier_unregister(notifier);
+error_notifier:
+	v4l2_async_notifier_cleanup(notifier);
+error_media_entity:
+	media_entity_cleanup(&subdev->entity);
+
+	return ret;
+}
+
+static int sun6i_mipi_csi2_v4l2_teardown(struct sun6i_mipi_csi2_dev *cdev)
+{
+	struct sun6i_mipi_csi2_video *video = &cdev->video;
+	struct v4l2_subdev *subdev = &video->subdev;
+	struct v4l2_async_notifier *notifier = &video->notifier;
+
+	v4l2_async_unregister_subdev(subdev);
+	v4l2_async_notifier_unregister(notifier);
+	v4l2_async_notifier_cleanup(notifier);
+	media_entity_cleanup(&subdev->entity);
+	v4l2_device_unregister_subdev(subdev);
+
+	return 0;
+}
+
+static const struct regmap_config sun6i_mipi_csi2_regmap_config = {
+	.reg_bits       = 32,
+	.reg_stride     = 4,
+	.val_bits       = 32,
+	.max_register	= 0x400,
+};
+
+static int sun6i_mipi_csi2_probe(struct platform_device *pdev)
+{
+	struct sun6i_mipi_csi2_dev *cdev;
+	struct resource *res;
+	void __iomem *io_base;
+	int ret;
+
+	cdev = devm_kzalloc(&pdev->dev, sizeof(*cdev), GFP_KERNEL);
+	if (!cdev)
+		return -ENOMEM;
+
+	cdev->dev = &pdev->dev;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	io_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(io_base))
+		return PTR_ERR(io_base);
+
+	cdev->regmap = devm_regmap_init_mmio(&pdev->dev, io_base,
+					     &sun6i_mipi_csi2_regmap_config);
+	if (IS_ERR(cdev->regmap)) {
+		dev_err(&pdev->dev, "failed to init register map\n");
+		return PTR_ERR(cdev->regmap);
+	}
+
+	cdev->clk_bus = devm_clk_get(&pdev->dev, "bus");
+	if (IS_ERR(cdev->clk_bus)) {
+		dev_err(&pdev->dev, "failed to acquire bus clock\n");
+		return PTR_ERR(cdev->clk_bus);
+	}
+
+	cdev->clk_mod = devm_clk_get(&pdev->dev, "mod");
+	if (IS_ERR(cdev->clk_mod)) {
+		dev_err(&pdev->dev, "failed to acquire mod clock\n");
+		return PTR_ERR(cdev->clk_mod);
+	}
+
+	cdev->reset = devm_reset_control_get_shared(&pdev->dev, NULL);
+	if (IS_ERR(cdev->reset)) {
+		dev_err(&pdev->dev, "failed to get reset controller\n");
+		return PTR_ERR(cdev->reset);
+	}
+
+	cdev->dphy = devm_phy_get(&pdev->dev, "dphy");
+	if (IS_ERR(cdev->dphy)) {
+		dev_err(&pdev->dev, "failed to get the MIPI D-PHY\n");
+		return PTR_ERR(cdev->dphy);
+	}
+
+	ret = phy_init(cdev->dphy);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to initialize the MIPI D-PHY\n");
+		return ret;
+	}
+
+	platform_set_drvdata(pdev, cdev);
+
+	ret = sun6i_mipi_csi2_v4l2_setup(cdev);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int sun6i_mipi_csi2_remove(struct platform_device *pdev)
+{
+	struct sun6i_mipi_csi2_dev *cdev = platform_get_drvdata(pdev);
+
+	phy_exit(cdev->dphy);
+
+	return sun6i_mipi_csi2_v4l2_teardown(cdev);
+}
+
+static const struct dev_pm_ops sun6i_mipi_csi2_pm_ops = {
+	SET_RUNTIME_PM_OPS(sun6i_mipi_csi2_suspend, sun6i_mipi_csi2_resume,
+			   NULL)
+};
+
+static const struct of_device_id sun6i_mipi_csi2_of_match[] = {
+	{ .compatible = "allwinner,sun6i-a31-mipi-csi2" },
+	{ .compatible = "allwinner,sun8i-v3s-mipi-csi2", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, sun6i_mipi_csi2_of_match);
+
+static struct platform_driver sun6i_mipi_csi2_platform_driver = {
+	.probe = sun6i_mipi_csi2_probe,
+	.remove = sun6i_mipi_csi2_remove,
+	.driver = {
+		.name = MODULE_NAME,
+		.of_match_table = of_match_ptr(sun6i_mipi_csi2_of_match),
+		.pm = &sun6i_mipi_csi2_pm_ops,
+	},
+};
+module_platform_driver(sun6i_mipi_csi2_platform_driver);
+
+MODULE_DESCRIPTION("Allwinner A31 MIPI CSI-2 Controller Driver");
+MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h
new file mode 100644
index 000000000000..b132ac8873b6
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h
@@ -0,0 +1,117 @@ 
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020 Bootlin
+ * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+ */
+
+#ifndef __SUN6I_MIPI_CSI2_H__
+#define __SUN6I_MIPI_CSI2_H__
+
+#include <linux/phy/phy.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
+
+#define SUN6I_MIPI_CSI2_CTL_REG				0x0
+#define SUN6I_MIPI_CSI2_CTL_RESET_N			BIT(31)
+#define SUN6I_MIPI_CSI2_CTL_VERSION_EN			BIT(30)
+#define SUN6I_MIPI_CSI2_CTL_UNPK_EN			BIT(1)
+#define SUN6I_MIPI_CSI2_CTL_EN				BIT(0)
+#define SUN6I_MIPI_CSI2_CFG_REG				0x4
+#define SUN6I_MIPI_CSI2_CFG_CHANNEL_MODE(v)		((((v) - 1) << 8) & \
+							 GENMASK(9, 8))
+#define SUN6I_MIPI_CSI2_CFG_LANE_COUNT(v)		(((v) - 1) & GENMASK(1, 0))
+#define SUN6I_MIPI_CSI2_VCDT_RX_REG			0x8
+#define SUN6I_MIPI_CSI2_VCDT_RX_CH_VC(ch, vc)		(((vc) & GENMASK(1, 0)) << \
+							 ((ch) * 8 + 6))
+#define SUN6I_MIPI_CSI2_VCDT_RX_CH_DT(ch, t)		(((t) & GENMASK(5, 0)) << \
+							 ((ch) * 8))
+#define SUN6I_MIPI_CSI2_RX_PKT_NUM_REG			0xc
+
+#define SUN6I_MIPI_CSI2_VERSION_REG			0x3c
+
+#define SUN6I_MIPI_CSI2_CH_BASE				0x1000
+#define SUN6I_MIPI_CSI2_CH_OFFSET			0x100
+
+#define SUN6I_MIPI_CSI2_CH_CFG_REG			0x40
+#define SUN6I_MIPI_CSI2_CH_INT_EN_REG			0x50
+#define SUN6I_MIPI_CSI2_CH_INT_EN_EOT_ERR		BIT(29)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_CHKSUM_ERR		BIT(28)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_ECC_WRN		BIT(27)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_ECC_ERR		BIT(26)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_LINE_SYNC_ERR		BIT(25)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_FRAME_SYNC_ERR	BIT(24)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_EMB_DATA		BIT(18)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_PF			BIT(17)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_PH_UPDATE		BIT(16)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_LINE_START_SYNC	BIT(11)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_LINE_END_SYNC	BIT(10)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_FRAME_START_SYNC	BIT(9)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_FRAME_END_SYNC	BIT(8)
+#define SUN6I_MIPI_CSI2_CH_INT_EN_FIFO_OVER		BIT(0)
+
+#define SUN6I_MIPI_CSI2_CH_INT_PD_REG			0x58
+#define SUN6I_MIPI_CSI2_CH_INT_PD_EOT_ERR		BIT(29)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_CHKSUM_ERR		BIT(28)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_ECC_WRN		BIT(27)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_ECC_ERR		BIT(26)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_LINE_SYNC_ERR		BIT(25)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_FRAME_SYNC_ERR	BIT(24)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_EMB_DATA		BIT(18)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_PF			BIT(17)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_PH_UPDATE		BIT(16)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_LINE_START_SYNC	BIT(11)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_LINE_END_SYNC		BIT(10)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_FRAME_START_SYNC	BIT(9)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_FRAME_END_SYNC	BIT(8)
+#define SUN6I_MIPI_CSI2_CH_INT_PD_FIFO_OVER		BIT(0)
+
+#define SUN6I_MIPI_CSI2_CH_DT_TRIGGER_REG		0x60
+#define SUN6I_MIPI_CSI2_CH_CUR_PH_REG			0x70
+#define SUN6I_MIPI_CSI2_CH_ECC_REG			0x74
+#define SUN6I_MIPI_CSI2_CH_CKS_REG			0x78
+#define SUN6I_MIPI_CSI2_CH_FRAME_NUM_REG		0x7c
+#define SUN6I_MIPI_CSI2_CH_LINE_NUM_REG			0x80
+
+#define SUN6I_MIPI_CSI2_CH_REG(reg, ch) \
+	(SUN6I_MIPI_CSI2_CH_BASE + SUN6I_MIPI_CSI2_CH_OFFSET * (ch) + (reg))
+
+enum mipi_csi2_data_type {
+	MIPI_CSI2_DATA_TYPE_RAW8	= 0x2a,
+	MIPI_CSI2_DATA_TYPE_RAW10	= 0x2b,
+	MIPI_CSI2_DATA_TYPE_RAW12	= 0x2c,
+};
+
+struct sun6i_mipi_csi2_video {
+	struct v4l2_fwnode_endpoint endpoint;
+	struct v4l2_subdev subdev;
+	struct media_pad pads[2];
+
+	struct v4l2_async_subdev subdev_async;
+	struct v4l2_async_notifier notifier;
+
+	struct v4l2_subdev *remote_subdev;
+
+	struct v4l2_mbus_framefmt mbus_format;
+};
+
+struct sun6i_mipi_csi2_dev {
+	struct device *dev;
+
+	struct regmap *regmap;
+	struct clk *clk_bus;
+	struct clk *clk_mod;
+	struct reset_control *reset;
+	struct phy *dphy;
+
+	struct sun6i_mipi_csi2_video video;
+};
+
+#define sun6i_mipi_csi2_subdev_video(subdev) \
+	container_of(subdev, struct sun6i_mipi_csi2_video, subdev)
+
+#define sun6i_mipi_csi2_video_dev(video) \
+	container_of(video, struct sun6i_mipi_csi2_dev, video)
+
+#endif /* __SUN6I_MIPI_CSI2_H__ */