media: v4l: Add support for the Cadence MIPI-CSI2 RX
Subsystems (3)
v8 cover media: v4l: Add support for the Cadence MIPI-CSI2 RX
Hi,
Here is another attempt at supporting the MIPI-CSI2 RX block from Cadence.
This IP block is able to receive CSI data over up to 4 lanes, and split it to over 4 streams. Those streams are basically the interfaces to the video grabbers that will perform the capture.
It is able to map streams to both CSI datatypes and virtual channels, dynamically. This is unclear at this point what the right way to support it would be, so the driver only uses a static mapping between the virtual channels and streams, and ignores the data types.
Let me know what you think!
Maxime
Changes from v7:
- Changed calls to usleep_range to udelay
- Rebased on top of 4.16
- Renamed the reg variable in _get_resources to dev_cfg
- Checked for the clk_prepare_enable return codes
- Fixed a race condition in concurrent calls to s_stream by moving from the atomic counter to a mutex.
Changes from v6:
- Added Sakari's Acked-by
- Added Kconfig help
- Removed the comment in the probe next to the kmalloc
Changes from v5:
- Use SPDX license header
- Fix the lane mapping logic and map unused logical lanes only to unused physical lanes. Added a comment to explain why.
Changes from v4:
- Rebased on top of 4.15
- Fixed a lane mapping issue that prevented the CSI2-RX device to operate properly.
- Reworded the output endpoints documentation in the binding
Changes from v3:
- Removed stale printk
- Propagate start/stop functions error code to s_stream
- Renamed the DT bindings files
- Clarified the output ports wording in the DT binding doc
- Added a define for the maximum number of lanes
- Rebased on top of Sakari's serie
- Gathered tags based on the reviews
Changes from v2:
- Added reference counting for the controller initialisation
- Fixed checkpatch warnings
- Moved the sensor initialisation after the DPHY configuration
- Renamed the sensor fields to source for consistency
- Defined some variables
- Renamed a few structures variables
- Added internal and external phy errors messages
- Reworked the binding slighty by making the external D-PHY optional
- Moved the notifier registration in the probe function
- Removed some clocks that are not system clocks
- Added clocks enabling where needed
- Added the code to remap the data lanes
- Changed the memory allocator for the non-devm function, and a comment explaining why
- Reworked the binding wording
Changes from v1:
- Amended the DT bindings as suggested by Rob
- Rebase on top of 4.13-rc1 and latest Niklas' serie iteration
Maxime Ripard (2):
dt-bindings: media: Add Cadence MIPI-CSI2 RX Device Tree bindings
v4l: cadence: Add Cadence MIPI-CSI2 RX driver
.../devicetree/bindings/media/cdns,csi2rx.txt | 100 +++++ drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 2 + drivers/media/platform/cadence/Kconfig | 17 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2rx.c | 499 +++++++++++++++++++++ 6 files changed, 620 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.txt create mode 100644 drivers/media/platform/cadence/Kconfig create mode 100644 drivers/media/platform/cadence/Makefile create mode 100644 drivers/media/platform/cadence/cdns-csi2rx.c
Signature · 6 lines
2.14.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20180215133335.9335-1-maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org
PATCH v8 1/2 dt-bindings: media: Add Cadence MIPI-CSI2 RX Device Tree bindings
The Cadence MIPI-CSI2 RX controller is a CSI2RX bridge that supports up to 4 CSI-2 lanes, and can route the frames to up to 4 streams, depending on the hardware implementation.
It can operate with an external D-PHY, an internal one or no D-PHY at all in some configurations.
--- .../devicetree/bindings/media/cdns,csi2rx.txt | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.txt
Documentation/devicetree/bindings/media/cdns,csi2rx.txt new file +100 -0
@@ -0,0 +1,100 @@ +Cadence MIPI-CSI2 RX controller +=============================== + +The Cadence MIPI-CSI2 RX controller is a CSI-2 bridge supporting up to 4 CSI +lanes in input, and 4 different pixel streams in output. + +Required properties: + - compatible: must be set to "cdns,csi2rx" and an SoC-specific compatible + - reg: base address and size of the memory mapped region + - clocks: phandles to the clocks driving the controller + - clock-names: must contain: + * sys_clk: main clock + * p_clk: register bank clock + * pixel_if[0-3]_clk: pixel stream output clock, one for each stream + implemented in hardware, between 0 and 3 + +Optional properties: + - phys: phandle to the external D-PHY, phy-names must be provided + - phy-names: must contain "dphy", if the implementation uses an + external D-PHY + +Required subnodes: + - ports: A ports node with one port child node per device input and output + port, in accordance with the video interface bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + port nodes are numbered as follows: + + Port Description + ----------------------------- + 0 CSI-2 input + 1 Stream 0 output + 2 Stream 1 output + 3 Stream 2 output + 4 Stream 3 output + + The stream output port nodes are optional if they are not + connected to anything at the hardware level or implemented + in the design.Since there is only one endpoint per port, + the endpoints are not numbered. + + +Example: + +csi2rx: csi-bridge@0d060000 { + compatible = "cdns,csi2rx"; + reg = <0x0d060000 0x1000>; + clocks = <&byteclock>, <&byteclock> + <&coreclock>, <&coreclock>, + <&coreclock>, <&coreclock>; + clock-names = "sys_clk", "p_clk", + "pixel_if0_clk", "pixel_if1_clk", + "pixel_if2_clk", "pixel_if3_clk"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csi2rx_in_sensor: endpoint { + remote-endpoint = <&sensor_out_csi2rx>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + + csi2rx_out_grabber0: endpoint { + remote-endpoint = <&grabber0_in_csi2rx>; + }; + }; + + port@2 { + reg = <2>; + + csi2rx_out_grabber1: endpoint { + remote-endpoint = <&grabber1_in_csi2rx>; + }; + }; + + port@3 { + reg = <3>; + + csi2rx_out_grabber2: endpoint { + remote-endpoint = <&grabber2_in_csi2rx>; + }; + }; + + port@4 { + reg = <4>; + + csi2rx_out_grabber3: endpoint { + remote-endpoint = <&grabber3_in_csi2rx>; + }; + }; + }; +};
Signature · 6 lines
2.14.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v8 1/2] dt-bindings: media: Add Cadence MIPI-CSI2 RX Device Tree bindings
Hi Maxime,
Thanks for your patch.
Quoted 4 lines · Maxime Ripard
The Cadence MIPI-CSI2 RX controller is a CSI2RX bridge that supports up to 4 CSI-2 lanes, and can route the frames to up to 4 streams, depending on the hardware implementation.
Quoted 8 lines
It can operate with an external D-PHY, an internal one or no D-PHY at all in some configurations.
Acked-by Rob Herring <[email protected]>Acked-by Benoit Parrot <[email protected]>Acked-by Sakari Ailus <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
Shall this file be added to MAINTAINERS? This can be done in a follow up patch, but if you respin please consider it.
Quoted 114 lines
--- .../devicetree/bindings/media/cdns,csi2rx.txt | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.txtDocumentation/devicetree/bindings/media/cdns,csi2rx.txt new file +100
-0@@ -0,0 +1,100 @@ +Cadence MIPI-CSI2 RX controller +=============================== + +The Cadence MIPI-CSI2 RX controller is a CSI-2 bridge supporting up to 4 CSI +lanes in input, and 4 different pixel streams in output. + +Required properties: + - compatible: must be set to "cdns,csi2rx" and an SoC-specific compatible + - reg: base address and size of the memory mapped region + - clocks: phandles to the clocks driving the controller + - clock-names: must contain: + * sys_clk: main clock + * p_clk: register bank clock + * pixel_if[0-3]_clk: pixel stream output clock, one for each stream + implemented in hardware, between 0 and 3 + +Optional properties: + - phys: phandle to the external D-PHY, phy-names must be provided + - phy-names: must contain "dphy", if the implementation uses an + external D-PHY + +Required subnodes: + - ports: A ports node with one port child node per device input and output + port, in accordance with the video interface bindings defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. The + port nodes are numbered as follows: + + Port Description + ----------------------------- + 0 CSI-2 input + 1 Stream 0 output + 2 Stream 1 output + 3 Stream 2 output + 4 Stream 3 output + + The stream output port nodes are optional if they are not + connected to anything at the hardware level or implemented + in the design.Since there is only one endpoint per port, + the endpoints are not numbered. + + +Example: + +csi2rx: csi-bridge@0d060000 { + compatible = "cdns,csi2rx"; + reg = <0x0d060000 0x1000>; + clocks = <&byteclock>, <&byteclock> + <&coreclock>, <&coreclock>, + <&coreclock>, <&coreclock>; + clock-names = "sys_clk", "p_clk", + "pixel_if0_clk", "pixel_if1_clk", + "pixel_if2_clk", "pixel_if3_clk"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csi2rx_in_sensor: endpoint { + remote-endpoint = <&sensor_out_csi2rx>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + + csi2rx_out_grabber0: endpoint { + remote-endpoint = <&grabber0_in_csi2rx>; + }; + }; + + port@2 { + reg = <2>; + + csi2rx_out_grabber1: endpoint { + remote-endpoint = <&grabber1_in_csi2rx>; + }; + }; + + port@3 { + reg = <3>; + + csi2rx_out_grabber2: endpoint { + remote-endpoint = <&grabber2_in_csi2rx>; + }; + }; + + port@4 { + reg = <4>; + + csi2rx_out_grabber3: endpoint { + remote-endpoint = <&grabber3_in_csi2rx>; + }; + }; + }; +};Signature · 1 line
2.14.3
Signature · 2 lines
Regards, Niklas S�derlund
PATCH v8 2/2 v4l: cadence: Add Cadence MIPI-CSI2 RX driver
In reply to a message not in the archiveThe Cadence CSI-2 RX Controller is an hardware block meant to be used as a bridge between a CSI-2 bus and pixel grabbers.
It supports operating with internal or external D-PHY, with up to 4 lanes, or without any D-PHY. The current code only supports the latter case.
It also support dynamic mapping of the CSI-2 virtual channels to the associated pixel grabbers, but that isn't allowed at the moment either.
--- drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 2 + drivers/media/platform/cadence/Kconfig | 17 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2rx.c | 499 +++++++++++++++++++++++++++ 5 files changed, 520 insertions(+) create mode 100644 drivers/media/platform/cadence/Kconfig create mode 100644 drivers/media/platform/cadence/Makefile create mode 100644 drivers/media/platform/cadence/cdns-csi2rx.c
drivers/media/platform/Kconfig +1 -0
@@ -26,6 +26,7 @@ config VIDEO_VIA_CAMERA # # Platform multimedia device configuration # +source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/davinci/Kconfig"
drivers/media/platform/Makefile +2 -0
@@ -3,6 +3,8 @@ # Makefile for the video capture/playback device drivers. # +obj-$(CONFIG_VIDEO_CADENCE) += cadence/ + obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
drivers/media/platform/cadence/Kconfig new file +17 -0
@@ -0,0 +1,17 @@ +config VIDEO_CADENCE + bool "Cadence Video Devices" + +if VIDEO_CADENCE + +config VIDEO_CADENCE_CSI2RX + tristate "Cadence MIPI-CSI2 RX Controller" + depends on MEDIA_CONTROLLER + depends on VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Cadence MIPI CSI2 Receiver controller. + + To compile this driver as a module, choose M here: the module will be + called cdns-csi2rx. + +endif
drivers/media/platform/cadence/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_CADENCE_CSI2RX) += cdns-csi2rx.o
drivers/media/platform/cadence/cdns-csi2rx.c new file +499 -0
499 lines not on this page · raw message
Signature · 6 lines
2.14.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v8 2/2] v4l: cadence: Add Cadence MIPI-CSI2 RX driver
Maxime,
Thank you for the patch.
Maxime Ripard <[email protected]> wrote on Thu [2018-Feb-15 14:33:35 +0100]:
Quoted 422 lines
The Cadence CSI-2 RX Controller is an hardware block meant to be used as a bridge between a CSI-2 bus and pixel grabbers.
It supports operating with internal or external D-PHY, with up to 4 lanes, or without any D-PHY. The current code only supports the latter case.
It also support dynamic mapping of the CSI-2 virtual channels to the associated pixel grabbers, but that isn't allowed at the moment either.
Acked-by Sakari Ailus <[email protected]>Signed-off-by Maxime Ripard <[email protected]>--- drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 2 + drivers/media/platform/cadence/Kconfig | 17 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2rx.c | 499 +++++++++++++++++++++++++++ 5 files changed, 520 insertions(+) create mode 100644 drivers/media/platform/cadence/Kconfig create mode 100644 drivers/media/platform/cadence/Makefile create mode 100644 drivers/media/platform/cadence/cdns-csi2rx.cdrivers/media/platform/Kconfig +1
-0@@ -26,6 +26,7 @@ config VIDEO_VIA_CAMERA # # Platform multimedia device configuration # +source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/davinci/Kconfig"drivers/media/platform/Makefile +2
-0@@ -3,6 +3,8 @@ # Makefile for the video capture/playback device drivers. # +obj-$(CONFIG_VIDEO_CADENCE) += cadence/ + obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.odrivers/media/platform/cadence/Kconfig new file +17
-0@@ -0,0 +1,17 @@ +config VIDEO_CADENCE + bool "Cadence Video Devices" + +if VIDEO_CADENCE + +config VIDEO_CADENCE_CSI2RX + tristate "Cadence MIPI-CSI2 RX Controller" + depends on MEDIA_CONTROLLER + depends on VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Cadence MIPI CSI2 Receiver controller. + + To compile this driver as a module, choose M here: the module will be + called cdns-csi2rx. + +endifdrivers/media/platform/cadence/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_CADENCE_CSI2RX) += cdns-csi2rx.odrivers/media/platform/cadence/cdns-csi2rx.c new file +339
-0@@ -0,0 +1,499 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Driver for Cadence MIPI-CSI2 RX Controller v1.3 +* +* Copyright (C) 2017 Cadence Design Systems Inc. +*/ + +#include <linux/atomic.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/slab.h> + +#include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define CSI2RX_DEVICE_CFG_REG 0x000 + +#define CSI2RX_SOFT_RESET_REG 0x004 +#define CSI2RX_SOFT_RESET_PROTOCOL BIT(1) +#define CSI2RX_SOFT_RESET_FRONT BIT(0) + +#define CSI2RX_STATIC_CFG_REG 0x008 +#define CSI2RX_STATIC_CFG_DLANE_MAP (llane, plane) ((plane) << (16 + (llane) * 4)) +#define CSI2RX_STATIC_CFG_LANES_MASK GENMASK(11, 8) + +#define CSI2RX_STREAM_BASE (n) (((n) + 1) * 0x100) + +#define CSI2RX_STREAM_CTRL_REG (n) (CSI2RX_STREAM_BASE(n) + 0x000) +#define CSI2RX_STREAM_CTRL_START BIT(0) + +#define CSI2RX_STREAM_DATA_CFG_REG (n) (CSI2RX_STREAM_BASE(n) + 0x008) +#define CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT BIT(31) +#define CSI2RX_STREAM_DATA_CFG_VC_SELECT (n) BIT((n) + 16) + +#define CSI2RX_STREAM_CFG_REG (n) (CSI2RX_STREAM_BASE(n) + 0x00c) +#define CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF (1 << 8) + +#define CSI2RX_LANES_MAX 4 +#define CSI2RX_STREAMS_MAX 4 + +enum csi2rx_pads { +CSI2RX_PAD_SINK , +CSI2RX_PAD_SOURCE_STREAM0 , +CSI2RX_PAD_SOURCE_STREAM1 , +CSI2RX_PAD_SOURCE_STREAM2 , +CSI2RX_PAD_SOURCE_STREAM3 , +CSI2RX_PAD_MAX , +}; + +struct csi2rx_priv { +struct device *dev; +unsigned int count; + +/* +* Used to prevent race conditions between multiple, +* concurrent calls to start and stop. +*/ +struct mutex lock; + +void __iomem *base; +struct clk *sys_clk; +struct clk *p_clk; +struct clk *pixel_clk[CSI2RX_STREAMS_MAX ]; +struct phy *dphy; + +u8 lanes[CSI2RX_LANES_MAX ]; +u8 num_lanes; +u8 max_lanes; +u8 max_streams; +bool has_internal_dphy; + +struct v4l2_subdev subdev; +struct v4l2_async_notifier notifier; +struct media_pad pads[CSI2RX_PAD_MAX ]; + +/* Remote source */ +struct v4l2_async_subdev asd; +struct v4l2_subdev *source_subdev; +int source_pad; +}; + +static inline +struct csi2rx_priv *v4l2_subdev_to_csi2rx (struct v4l2_subdev *subdev) +{ + return container_of(subdev, struct csi2rx_priv, subdev); +} + +static void csi2rx_reset (struct csi2rx_priv *csi2rx) +{ +writel (CSI2RX_SOFT_RESET_PROTOCOL |CSI2RX_SOFT_RESET_FRONT , + csi2rx->base +CSI2RX_SOFT_RESET_REG ); + +udelay (10 ); + +writel (0 , csi2rx->base +CSI2RX_SOFT_RESET_REG ); +} + +static int csi2rx_start (struct csi2rx_priv *csi2rx) +{ +unsigned int i; +unsigned long lanes_used =0 ; +u32 reg; +int ret; + + ret =clk_prepare_enable (csi2rx->p_clk); +if (ret) +return ret; + +csi2rx_reset (csi2rx); + + reg = csi2rx->num_lanes <<8 ; +for (i =0 ; i < csi2rx->num_lanes; i++) { + reg |=CSI2RX_STATIC_CFG_DLANE_MAP (i, csi2rx->lanes[i]); +set_bit (csi2rx->lanes[i], &lanes_used); + } + +/* +* Even the unused lanes need to be mapped. In order to avoid +* to map twice to the same physical lane, keep the lanes used +* in the previous loop, and only map unused physical lanes to +* the rest of our logical lanes. +*/ +for (i = csi2rx->num_lanes; i < csi2rx->max_lanes; i++) { +unsigned int idx =find_first_zero_bit (&lanes_used, +sizeof (lanes_used)); +set_bit (idx, &lanes_used); + reg |=CSI2RX_STATIC_CFG_DLANE_MAP (i, i +1 ); + } + +writel (reg, csi2rx->base +CSI2RX_STATIC_CFG_REG ); + + ret =v4l2_subdev_call (csi2rx->source_subdev, video, s_stream, true); +if (ret) + goto err_disable_pclk; + +/* +* Create a static mapping between the CSI virtual channels +* and the output stream. +* +* This should be enhanced, but v4l2 lacks the support for +* changing that mapping dynamically. +* +* We also cannot enable and disable independant streams here, +* hence the reference counting. +*/ +for (i =0 ; i < csi2rx->max_streams; i++) { + ret =clk_prepare_enable (csi2rx->pixel_clk[i]); +if (ret) + goto err_disable_pixclk; + +writel (CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF , + csi2rx->base +CSI2RX_STREAM_CFG_REG (i)); + +writel (CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT | +CSI2RX_STREAM_DATA_CFG_VC_SELECT (i), + csi2rx->base +CSI2RX_STREAM_DATA_CFG_REG (i)); + +writel (CSI2RX_STREAM_CTRL_START , + csi2rx->base +CSI2RX_STREAM_CTRL_REG (i)); + } + + ret =clk_prepare_enable (csi2rx->sys_clk); +if (ret) + goto err_disable_pixclk; + +clk_disable_unprepare (csi2rx->p_clk); + +return 0 ; + +err_disable_pixclk: +for (; i >=0 ; i--) +clk_disable_unprepare (csi2rx->pixel_clk[i]); + +err_disable_pclk: +clk_disable_unprepare (csi2rx->p_clk); + +return ret; +} + +static int csi2rx_stop (struct csi2rx_priv *csi2rx) +{ +unsigned int i; + +clk_prepare_enable (csi2rx->p_clk); +clk_disable_unprepare (csi2rx->sys_clk); + +for (i =0 ; i < csi2rx->max_streams; i++) { +writel (0 , csi2rx->base +CSI2RX_STREAM_CTRL_REG (i)); + +clk_disable_unprepare (csi2rx->pixel_clk[i]); + } + +clk_disable_unprepare (csi2rx->p_clk); + +return v4l2_subdev_call (csi2rx->source_subdev, video, s_stream, false); +} + +static int csi2rx_s_stream (struct v4l2_subdev *subdev,int enable) +{ +struct csi2rx_priv *csi2rx =v4l2_subdev_to_csi2rx (subdev); +int ret =0 ; + +mutex_lock (&csi2rx->lock); + +if (enable) { +/* +* If we're not the first users, there's no need to +* enable the whole controller. +*/ +if (!csi2rx->count) { + ret =csi2rx_start (csi2rx); +if (ret) + goto out; + } + + csi2rx->count++; + }else { + csi2rx->count--; + +/* +* Let the last user turn off the lights. +*/ +if (!csi2rx->count) { + ret =csi2rx_stop (csi2rx); +if (ret) + goto out; + } + } + +out: +mutex_unlock (&csi2rx->lock); +return ret; +} + +static const struct v4l2_subdev_video_ops csi2rx_video_ops = { + .s_stream = csi2rx_s_stream, +}; + +static const struct v4l2_subdev_ops csi2rx_subdev_ops = { + .video = &csi2rx_video_ops, +}; + +static int csi2rx_async_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *s_subdev, +struct v4l2_async_subdev *asd) +{ +struct v4l2_subdev *subdev = notifier->sd; +struct csi2rx_priv *csi2rx =v4l2_subdev_to_csi2rx (subdev); + + csi2rx->source_pad =media_entity_get_fwnode_pad (&s_subdev->entity, + s_subdev->fwnode, +MEDIA_PAD_FL_SOURCE ); +if (csi2rx->source_pad <0 ) { +dev_err (csi2rx->dev,"Couldn't find output pad for subdev %s\n" , + s_subdev->name); +return csi2rx->source_pad; + } + + csi2rx->source_subdev = s_subdev; + +dev_dbg (csi2rx->dev,"Bound %s pad: %d\n" , s_subdev->name, + csi2rx->source_pad); + +return media_create_pad_link (&csi2rx->source_subdev->entity, + csi2rx->source_pad, + &csi2rx->subdev.entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +} + +static const struct v4l2_async_notifier_operations csi2rx_notifier_ops = { + .bound = csi2rx_async_bound, +}; + +static int csi2rx_get_resources (struct csi2rx_priv *csi2rx, +struct platform_device *pdev) +{ +struct resource *res; +unsigned char i; +u32 dev_cfg; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + csi2rx->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (csi2rx->base)) +return PTR_ERR (csi2rx->base); + + csi2rx->sys_clk =devm_clk_get (&pdev->dev,"sys_clk" ); +if (IS_ERR (csi2rx->sys_clk)) { +dev_err (&pdev->dev,"Couldn't get sys clock\n" ); +return PTR_ERR (csi2rx->sys_clk); + } + + csi2rx->p_clk =devm_clk_get (&pdev->dev,"p_clk" ); +if (IS_ERR (csi2rx->p_clk)) { +dev_err (&pdev->dev,"Couldn't get P clock\n" ); +return PTR_ERR (csi2rx->p_clk); + } + + csi2rx->dphy =devm_phy_optional_get (&pdev->dev,"dphy" ); +if (IS_ERR (csi2rx->dphy)) { +dev_err (&pdev->dev,"Couldn't get external D-PHY\n" ); +return PTR_ERR (csi2rx->dphy); + } + +/* +* FIXME: Once we'll have external D-PHY support, the check +* will need to be removed. +*/ +if (csi2rx->dphy) { +dev_err (&pdev->dev,"External D-PHY not supported yet\n" ); +return -EINVAL ; + } + +clk_prepare_enable (csi2rx->p_clk); + dev_cfg =readl (csi2rx->base +CSI2RX_DEVICE_CFG_REG ); +clk_disable_unprepare (csi2rx->p_clk); + + csi2rx->max_lanes = dev_cfg &7 ; +if (csi2rx->max_lanes >CSI2RX_LANES_MAX ) { +dev_err (&pdev->dev,"Invalid number of lanes: %u\n" , + csi2rx->max_lanes); +return -EINVAL ; + } + + csi2rx->max_streams = (dev_cfg >>4 ) &7 ; +if (csi2rx->max_streams >CSI2RX_STREAMS_MAX ) { +dev_err (&pdev->dev,"Invalid number of streams: %u\n" , + csi2rx->max_streams); +return -EINVAL ; + } +
drivers/media/platform/cadence/cdns-csi2rx.c line 349
Quoted 10 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +10
-0+ csi2rx->has_internal_dphy = dev_cfg &BIT (3 ) ? true : false; + +/* +* FIXME: Once we'll have internal D-PHY support, the check +* will need to be removed. +*/ +if (csi2rx->has_internal_dphy) { +dev_err (&pdev->dev,"Internal D-PHY not supported yet\n" ); +return -EINVAL ; + }
As one of the more critical thing is usually how the CSI2 Receiver interact with a DPHY when can we expect this part of the driver to be implemented?
Regards,
Benoit
[snip]
Re: [PATCH v8 2/2] v4l: cadence: Add Cadence MIPI-CSI2 RX driver
Hi Benoit,
Quoted 11 lines · Benoit Parrot
drivers/media/platform/cadence/cdns-csi2rx.c line 349
Quoted 8 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +8
-0+/* +* FIXME: Once we'll have internal D-PHY support, the check +* will need to be removed. +*/ +if (csi2rx->has_internal_dphy) { +dev_err (&pdev->dev,"Internal D-PHY not supported yet\n" ); +return -EINVAL ; + }As one of the more critical thing is usually how the CSI2 Receiver interact with a DPHY when can we expect this part of the driver to be implemented?
That's definitely on my radar, but it isn't implemented by any hardware or simulation at the moment. When that is done, we will obviously do it.
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v8 2/2] v4l: cadence: Add Cadence MIPI-CSI2 RX driver
In reply to Maxime RipardHi Maxime,
Thanks for your patch.
Quoted 53 lines · Maxime Ripard
The Cadence CSI-2 RX Controller is an hardware block meant to be used as a bridge between a CSI-2 bus and pixel grabbers.
It supports operating with internal or external D-PHY, with up to 4 lanes, or without any D-PHY. The current code only supports the latter case.
It also support dynamic mapping of the CSI-2 virtual channels to the associated pixel grabbers, but that isn't allowed at the moment either.
Acked-by Sakari Ailus <[email protected]>Signed-off-by Maxime Ripard <[email protected]>--- drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 2 + drivers/media/platform/cadence/Kconfig | 17 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2rx.c | 499 +++++++++++++++++++++++++++ 5 files changed, 520 insertions(+) create mode 100644 drivers/media/platform/cadence/Kconfig create mode 100644 drivers/media/platform/cadence/Makefile create mode 100644 drivers/media/platform/cadence/cdns-csi2rx.cdrivers/media/platform/Kconfig +1
-0@@ -26,6 +26,7 @@ config VIDEO_VIA_CAMERA # # Platform multimedia device configuration # +source "drivers/media/platform/cadence/Kconfig" source "drivers/media/platform/davinci/Kconfig"drivers/media/platform/Makefile +2
-0@@ -3,6 +3,8 @@ # Makefile for the video capture/playback device drivers. # +obj-$(CONFIG_VIDEO_CADENCE) += cadence/ + obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.odrivers/media/platform/cadence/Kconfig new file +0
-0
drivers/media/platform/cadence/Kconfig line 2
Quoted 2 lines
drivers/media/platform/cadence/Kconfig new file +2
-0@@ -0,0 +1,17 @@ +config VIDEO_CADENCE + bool "Cadence Video Devices"
I'm no expert on Kconfig best practices so if nothing else I might learn something. There is no need to add a description to this option as it only groups the Cadence drivers?
Quoted 28 lines
drivers/media/platform/cadence/Kconfig new file +15
-0+ +if VIDEO_CADENCE + +config VIDEO_CADENCE_CSI2RX + tristate "Cadence MIPI-CSI2 RX Controller" + depends on MEDIA_CONTROLLER + depends on VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Cadence MIPI CSI2 Receiver controller. + + To compile this driver as a module, choose M here: the module will be + called cdns-csi2rx. + +endifdrivers/media/platform/cadence/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_CADENCE_CSI2RX) += cdns-csi2rx.odrivers/media/platform/cadence/cdns-csi2rx.c new file +0
-0
drivers/media/platform/cadence/cdns-csi2rx.c line 8
Quoted 8 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +8
-0@@ -0,0 +1,499 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Driver for Cadence MIPI-CSI2 RX Controller v1.3 +* +* Copyright (C) 2017 Cadence Design Systems Inc. +*/ + +#include <linux/atomic.h>
No longer need as you now use a mutex, right? Same comment for TX patch-set.
drivers/media/platform/cadence/cdns-csi2rx.c line 17
Quoted 9 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +9
-0+#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/slab.h>
I think you also can drop slab.h, same comment for TX patch-set.
Quoted 125 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +125
-0+ +#include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define CSI2RX_DEVICE_CFG_REG 0x000 + +#define CSI2RX_SOFT_RESET_REG 0x004 +#define CSI2RX_SOFT_RESET_PROTOCOL BIT(1) +#define CSI2RX_SOFT_RESET_FRONT BIT(0) + +#define CSI2RX_STATIC_CFG_REG 0x008 +#define CSI2RX_STATIC_CFG_DLANE_MAP (llane, plane) ((plane) << (16 + (llane) * 4)) +#define CSI2RX_STATIC_CFG_LANES_MASK GENMASK(11, 8) + +#define CSI2RX_STREAM_BASE (n) (((n) + 1) * 0x100) + +#define CSI2RX_STREAM_CTRL_REG (n) (CSI2RX_STREAM_BASE(n) + 0x000) +#define CSI2RX_STREAM_CTRL_START BIT(0) + +#define CSI2RX_STREAM_DATA_CFG_REG (n) (CSI2RX_STREAM_BASE(n) + 0x008) +#define CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT BIT(31) +#define CSI2RX_STREAM_DATA_CFG_VC_SELECT (n) BIT((n) + 16) + +#define CSI2RX_STREAM_CFG_REG (n) (CSI2RX_STREAM_BASE(n) + 0x00c) +#define CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF (1 << 8) + +#define CSI2RX_LANES_MAX 4 +#define CSI2RX_STREAMS_MAX 4 + +enum csi2rx_pads { +CSI2RX_PAD_SINK , +CSI2RX_PAD_SOURCE_STREAM0 , +CSI2RX_PAD_SOURCE_STREAM1 , +CSI2RX_PAD_SOURCE_STREAM2 , +CSI2RX_PAD_SOURCE_STREAM3 , +CSI2RX_PAD_MAX , +}; + +struct csi2rx_priv { +struct device *dev; +unsigned int count; + +/* +* Used to prevent race conditions between multiple, +* concurrent calls to start and stop. +*/ +struct mutex lock; + +void __iomem *base; +struct clk *sys_clk; +struct clk *p_clk; +struct clk *pixel_clk[CSI2RX_STREAMS_MAX ]; +struct phy *dphy; + +u8 lanes[CSI2RX_LANES_MAX ]; +u8 num_lanes; +u8 max_lanes; +u8 max_streams; +bool has_internal_dphy; + +struct v4l2_subdev subdev; +struct v4l2_async_notifier notifier; +struct media_pad pads[CSI2RX_PAD_MAX ]; + +/* Remote source */ +struct v4l2_async_subdev asd; +struct v4l2_subdev *source_subdev; +int source_pad; +}; + +static inline +struct csi2rx_priv *v4l2_subdev_to_csi2rx (struct v4l2_subdev *subdev) +{ + return container_of(subdev, struct csi2rx_priv, subdev); +} + +static void csi2rx_reset (struct csi2rx_priv *csi2rx) +{ +writel (CSI2RX_SOFT_RESET_PROTOCOL |CSI2RX_SOFT_RESET_FRONT , + csi2rx->base +CSI2RX_SOFT_RESET_REG ); + +udelay (10 ); + +writel (0 , csi2rx->base +CSI2RX_SOFT_RESET_REG ); +} + +static int csi2rx_start (struct csi2rx_priv *csi2rx) +{ +unsigned int i; +unsigned long lanes_used =0 ; +u32 reg; +int ret; + + ret =clk_prepare_enable (csi2rx->p_clk); +if (ret) +return ret; + +csi2rx_reset (csi2rx); + + reg = csi2rx->num_lanes <<8 ; +for (i =0 ; i < csi2rx->num_lanes; i++) { + reg |=CSI2RX_STATIC_CFG_DLANE_MAP (i, csi2rx->lanes[i]); +set_bit (csi2rx->lanes[i], &lanes_used); + } + +/* +* Even the unused lanes need to be mapped. In order to avoid +* to map twice to the same physical lane, keep the lanes used +* in the previous loop, and only map unused physical lanes to +* the rest of our logical lanes. +*/ +for (i = csi2rx->num_lanes; i < csi2rx->max_lanes; i++) { +unsigned int idx =find_first_zero_bit (&lanes_used, +sizeof (lanes_used)); +set_bit (idx, &lanes_used); + reg |=CSI2RX_STATIC_CFG_DLANE_MAP (i, i +1 ); + } + +writel (reg, csi2rx->base +CSI2RX_STATIC_CFG_REG ); + + ret =v4l2_subdev_call (csi2rx->source_subdev, video, s_stream, true); +if (ret) + goto err_disable_pclk;
drivers/media/platform/cadence/cdns-csi2rx.c line 152
Quoted 10 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +10
-0+ +/* +* Create a static mapping between the CSI virtual channels +* and the output stream. +* +* This should be enhanced, but v4l2 lacks the support for +* changing that mapping dynamically. +* +* We also cannot enable and disable independant streams here, +* hence the reference counting.
s/independant/independent/
Quoted 337 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +337
-0+*/ +for (i =0 ; i < csi2rx->max_streams; i++) { + ret =clk_prepare_enable (csi2rx->pixel_clk[i]); +if (ret) + goto err_disable_pixclk; + +writel (CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF , + csi2rx->base +CSI2RX_STREAM_CFG_REG (i)); + +writel (CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT | +CSI2RX_STREAM_DATA_CFG_VC_SELECT (i), + csi2rx->base +CSI2RX_STREAM_DATA_CFG_REG (i)); + +writel (CSI2RX_STREAM_CTRL_START , + csi2rx->base +CSI2RX_STREAM_CTRL_REG (i)); + } + + ret =clk_prepare_enable (csi2rx->sys_clk); +if (ret) + goto err_disable_pixclk; + +clk_disable_unprepare (csi2rx->p_clk); + +return 0 ; + +err_disable_pixclk: +for (; i >=0 ; i--) +clk_disable_unprepare (csi2rx->pixel_clk[i]); + +err_disable_pclk: +clk_disable_unprepare (csi2rx->p_clk); + +return ret; +} + +static int csi2rx_stop (struct csi2rx_priv *csi2rx) +{ +unsigned int i; + +clk_prepare_enable (csi2rx->p_clk); +clk_disable_unprepare (csi2rx->sys_clk); + +for (i =0 ; i < csi2rx->max_streams; i++) { +writel (0 , csi2rx->base +CSI2RX_STREAM_CTRL_REG (i)); + +clk_disable_unprepare (csi2rx->pixel_clk[i]); + } + +clk_disable_unprepare (csi2rx->p_clk); + +return v4l2_subdev_call (csi2rx->source_subdev, video, s_stream, false); +} + +static int csi2rx_s_stream (struct v4l2_subdev *subdev,int enable) +{ +struct csi2rx_priv *csi2rx =v4l2_subdev_to_csi2rx (subdev); +int ret =0 ; + +mutex_lock (&csi2rx->lock); + +if (enable) { +/* +* If we're not the first users, there's no need to +* enable the whole controller. +*/ +if (!csi2rx->count) { + ret =csi2rx_start (csi2rx); +if (ret) + goto out; + } + + csi2rx->count++; + }else { + csi2rx->count--; + +/* +* Let the last user turn off the lights. +*/ +if (!csi2rx->count) { + ret =csi2rx_stop (csi2rx); +if (ret) + goto out; + } + } + +out: +mutex_unlock (&csi2rx->lock); +return ret; +} + +static const struct v4l2_subdev_video_ops csi2rx_video_ops = { + .s_stream = csi2rx_s_stream, +}; + +static const struct v4l2_subdev_ops csi2rx_subdev_ops = { + .video = &csi2rx_video_ops, +}; + +static int csi2rx_async_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *s_subdev, +struct v4l2_async_subdev *asd) +{ +struct v4l2_subdev *subdev = notifier->sd; +struct csi2rx_priv *csi2rx =v4l2_subdev_to_csi2rx (subdev); + + csi2rx->source_pad =media_entity_get_fwnode_pad (&s_subdev->entity, + s_subdev->fwnode, +MEDIA_PAD_FL_SOURCE ); +if (csi2rx->source_pad <0 ) { +dev_err (csi2rx->dev,"Couldn't find output pad for subdev %s\n" , + s_subdev->name); +return csi2rx->source_pad; + } + + csi2rx->source_subdev = s_subdev; + +dev_dbg (csi2rx->dev,"Bound %s pad: %d\n" , s_subdev->name, + csi2rx->source_pad); + +return media_create_pad_link (&csi2rx->source_subdev->entity, + csi2rx->source_pad, + &csi2rx->subdev.entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +} + +static const struct v4l2_async_notifier_operations csi2rx_notifier_ops = { + .bound = csi2rx_async_bound, +}; + +static int csi2rx_get_resources (struct csi2rx_priv *csi2rx, +struct platform_device *pdev) +{ +struct resource *res; +unsigned char i; +u32 dev_cfg; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + csi2rx->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (csi2rx->base)) +return PTR_ERR (csi2rx->base); + + csi2rx->sys_clk =devm_clk_get (&pdev->dev,"sys_clk" ); +if (IS_ERR (csi2rx->sys_clk)) { +dev_err (&pdev->dev,"Couldn't get sys clock\n" ); +return PTR_ERR (csi2rx->sys_clk); + } + + csi2rx->p_clk =devm_clk_get (&pdev->dev,"p_clk" ); +if (IS_ERR (csi2rx->p_clk)) { +dev_err (&pdev->dev,"Couldn't get P clock\n" ); +return PTR_ERR (csi2rx->p_clk); + } + + csi2rx->dphy =devm_phy_optional_get (&pdev->dev,"dphy" ); +if (IS_ERR (csi2rx->dphy)) { +dev_err (&pdev->dev,"Couldn't get external D-PHY\n" ); +return PTR_ERR (csi2rx->dphy); + } + +/* +* FIXME: Once we'll have external D-PHY support, the check +* will need to be removed. +*/ +if (csi2rx->dphy) { +dev_err (&pdev->dev,"External D-PHY not supported yet\n" ); +return -EINVAL ; + } + +clk_prepare_enable (csi2rx->p_clk); + dev_cfg =readl (csi2rx->base +CSI2RX_DEVICE_CFG_REG ); +clk_disable_unprepare (csi2rx->p_clk); + + csi2rx->max_lanes = dev_cfg &7 ; +if (csi2rx->max_lanes >CSI2RX_LANES_MAX ) { +dev_err (&pdev->dev,"Invalid number of lanes: %u\n" , + csi2rx->max_lanes); +return -EINVAL ; + } + + csi2rx->max_streams = (dev_cfg >>4 ) &7 ; +if (csi2rx->max_streams >CSI2RX_STREAMS_MAX ) { +dev_err (&pdev->dev,"Invalid number of streams: %u\n" , + csi2rx->max_streams); +return -EINVAL ; + } + + csi2rx->has_internal_dphy = dev_cfg &BIT (3 ) ? true : false; + +/* +* FIXME: Once we'll have internal D-PHY support, the check +* will need to be removed. +*/ +if (csi2rx->has_internal_dphy) { +dev_err (&pdev->dev,"Internal D-PHY not supported yet\n" ); +return -EINVAL ; + } + +for (i =0 ; i < csi2rx->max_streams; i++) { +char clk_name[16 ]; + +snprintf (clk_name,sizeof (clk_name),"pixel_if%u_clk" , i); + csi2rx->pixel_clk[i] =devm_clk_get (&pdev->dev, clk_name); +if (IS_ERR (csi2rx->pixel_clk[i])) { +dev_err (&pdev->dev,"Couldn't get clock %s\n" , clk_name); +return PTR_ERR (csi2rx->pixel_clk[i]); + } + } + +return 0 ; +} + +static int csi2rx_parse_dt (struct csi2rx_priv *csi2rx) +{ +struct v4l2_fwnode_endpoint v4l2_ep; +struct fwnode_handle *fwh; +struct device_node *ep; +int ret; + + ep =of_graph_get_endpoint_by_regs (csi2rx->dev->of_node,0 ,0 ); +if (!ep) +return -EINVAL ; + + fwh =of_fwnode_handle (ep); + ret =v4l2_fwnode_endpoint_parse (fwh, &v4l2_ep); +if (ret) { +dev_err (csi2rx->dev,"Could not parse v4l2 endpoint\n" ); +of_node_put (ep); +return ret; + } + +if (v4l2_ep.bus_type !=V4L2_MBUS_CSI2 ) { +dev_err (csi2rx->dev,"Unsupported media bus type: 0x%x\n" , + v4l2_ep.bus_type); +of_node_put (ep); +return -EINVAL ; + } + +memcpy (csi2rx->lanes, v4l2_ep.bus.mipi_csi2.data_lanes, +sizeof (csi2rx->lanes)); + csi2rx->num_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; +if (csi2rx->num_lanes > csi2rx->max_lanes) { +dev_err (csi2rx->dev,"Unsupported number of data-lanes: %d\n" , + csi2rx->num_lanes); +of_node_put (ep); +return -EINVAL ; + } + + csi2rx->asd.match.fwnode =fwnode_graph_get_remote_port_parent (fwh); + csi2rx->asd.match_type =V4L2_ASYNC_MATCH_FWNODE ; +of_node_put (ep); + + csi2rx->notifier.subdevs =devm_kzalloc (csi2rx->dev, +sizeof (*csi2rx->notifier.subdevs), +GFP_KERNEL ); +if (!csi2rx->notifier.subdevs) +return -ENOMEM ; + + csi2rx->notifier.subdevs[0 ] = &csi2rx->asd; + csi2rx->notifier.num_subdevs =1 ; + csi2rx->notifier.ops = &csi2rx_notifier_ops; + +return v4l2_async_subdev_notifier_register (&csi2rx->subdev, + &csi2rx->notifier); +} + +static int csi2rx_probe (struct platform_device *pdev) +{ +struct csi2rx_priv *csi2rx; +unsigned int i; +int ret; + + csi2rx =kzalloc (sizeof (*csi2rx),GFP_KERNEL ); +if (!csi2rx) +return -ENOMEM ; +platform_set_drvdata (pdev, csi2rx); + csi2rx->dev = &pdev->dev; +mutex_init (&csi2rx->lock); + + ret =csi2rx_get_resources (csi2rx, pdev); +if (ret) + goto err_free_priv; + + ret =csi2rx_parse_dt (csi2rx); +if (ret) + goto err_free_priv; + + csi2rx->subdev.owner =THIS_MODULE ; + csi2rx->subdev.dev = &pdev->dev; +v4l2_subdev_init (&csi2rx->subdev, &csi2rx_subdev_ops); +v4l2_set_subdevdata (&csi2rx->subdev, &pdev->dev); +snprintf (csi2rx->subdev.name,V4L2_SUBDEV_NAME_SIZE ,"%s.%s" , +KBUILD_MODNAME ,dev_name (&pdev->dev)); + +/* Create our media pads */ + csi2rx->subdev.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + csi2rx->pads[CSI2RX_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; +for (i =CSI2RX_PAD_SOURCE_STREAM0 ; i <CSI2RX_PAD_MAX ; i++) + csi2rx->pads[i].flags =MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&csi2rx->subdev.entity,CSI2RX_PAD_MAX , + csi2rx->pads); +if (ret) + goto err_free_priv; + + ret =v4l2_async_register_subdev (&csi2rx->subdev); +if (ret <0 ) + goto err_free_priv; + +dev_info (&pdev->dev, +"Probed CSI2RX with %u/%u lanes, %u streams, %s D-PHY\n" , + csi2rx->num_lanes, csi2rx->max_lanes, csi2rx->max_streams, + csi2rx->has_internal_dphy ?"internal" :"no" ); + +return 0 ; + +err_free_priv: +kfree (csi2rx); +return ret; +} + +static int csi2rx_remove (struct platform_device *pdev) +{ +struct csi2rx_priv *csi2rx =platform_get_drvdata (pdev); + +v4l2_async_unregister_subdev (&csi2rx->subdev); +kfree (csi2rx); + +return 0 ; +} + +static const struct of_device_id csi2rx_of_table[] = { + { .compatible ="cdns,csi2rx" }, + { }, +}; +MODULE_DEVICE_TABLE (of, csi2rx_of_table); +
drivers/media/platform/cadence/cdns-csi2rx.c line 499
Quoted 10 lines
drivers/media/platform/cadence/cdns-csi2rx.c new file +10
-0+static struct platform_driver csi2rx_driver = { + .probe = csi2rx_probe, + .remove = csi2rx_remove, + + .driver = { + .name ="cdns-csi2rx" , + .of_match_table = csi2rx_of_table, + }, +}; +module_platform_driver (csi2rx_driver);
Missing, MODULE_LICENSE, MODULE_DESCRIPTION and MODULE_LICENSE :-) And then maybe add a MAINTAINERS entry. With these small issues address feel free to add.
Quoted 3 lines
Signature · 1 line
2.14.3
Signature · 2 lines
Regards, Niklas S�derlund
Re: [PATCH v8 2/2] v4l: cadence: Add Cadence MIPI-CSI2 RX driver
Hi Niklas,
Thanks for your review,
Quoted 4 lines · Niklas Söderlund
Quoted 4 lines
drivers/media/platform/cadence/Kconfig new file +0
-1--- /dev/null
Quoted 8 lines
drivers/media/platform/cadence/Kconfig line 2
Quoted 4 lines
+++ b/drivers/media/platform/cadence/Kconfig
drivers/media/platform/cadence/Kconfig new file +2
-0@@ -0,0 +1,17 @@ +config VIDEO_CADENCE + bool "Cadence Video Devices"I'm no expert on
Kconfigbest practices so if nothing else I might learn something. There is no need to add a description to this option as it only groups the Cadence drivers?
You don't strictly need it, but you're right and one should be better, I've added it.
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Quoted 5 lines · Maxime Ripard
Hi,
Here is another attempt at supporting the MIPI-CSI2 RX block from Cadence.
Quoted 8 lines
This IP block is able to receive CSI data over up to 4 lanes, and split it to over 4 streams. Those streams are basically the interfaces to the video grabbers that will perform the capture.
It is able to map streams to both CSI datatypes and virtual channels, dynamically. This is unclear at this point what the right way to support it would be, so the driver only uses a static mapping between the virtual channels and streams, and ignores the data types.
Ping?
Maxime
Signature · 3 lines
Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com