media: v4l: Add support for the Cadence MIPI-CSI2 TX controller
Subsystems (3)
v4 cover media: v4l: Add support for the Cadence MIPI-CSI2 TX controller
Hi,
Here is an attempt at supporting the MIPI-CSI2 TX block from Cadence.
This IP block is able to receive 4 video streams and stream them over a MIPI-CSI2 link using up to 4 lanes. Those streams are basically the interfaces to controllers generating some video signals, like a camera or a pattern generator.
It is able to map input streams to CSI2 virtual channels and datatypes dynamically. The streaming devices choose their virtual channels through an additional signal that is transparent to the CSI2-TX. The datatypes however are yet another additional input signal, and can be mapped to any CSI2 datatypes.
Since v4l2 doesn't really allow for that setup at the moment, this preliminary version is a rather dumb one in order to start the discussion on how to address this properly.
Let me know what you think!
Maxime
Changes from v3:
- Added a comment about entity links walk concurrency
- Changed the default resolution to 1280x720
- Changed usleep_range calls to udelay
- Reworked the reference counting mechanism to remove a race condition by adding a mutex instead of an atomic count
- Changed the entity function to MEDIA_ENT_F_VID_IF_BRIDGE
- Changed the name of the reg variable in _get_resources to dev_cfg
- Removed the redundant error message in the devm_ioremap_resource error path
- Moved the subdev s_stream call before enabling the TX bridge
- Changed some int types to unsigned
- Init'd the pad formats properly
- Fixed typo in the CSI2TX_LANES_MAX define name
- Added Sakari Acked-by
Changes from v2:
- Use SPDX license header
- Use the lane mapping from DT
Changes from v1:
- Add a subdev notifier and start our downstream subdevice in s_stream
- Based the decision to enable the stream or not on the link state instead of whether a format was being set on the pad
- Put the controller back in reset when stopping the pipeline
- Clarified the enpoints number in the DT binding
- Added a default format for the pads
- Added some missing const
- Added more explicit comments
- Rebased on 4.15
Maxime Ripard (2):
dt-bindings: media: Add Cadence MIPI-CSI2 TX Device Tree bindings
v4l: cadence: Add Cadence MIPI-CSI2 TX driver
.../devicetree/bindings/media/cdns,csi2tx.txt | 98 ++++ drivers/media/platform/cadence/Kconfig | 11 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2tx.c | 602 +++++++++++++++++++++ 4 files changed, 712 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2tx.txt create mode 100644 drivers/media/platform/cadence/cdns-csi2tx.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): 20180215133157.8043-1-maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org
PATCH v4 1/2 dt-bindings: media: Add Cadence MIPI-CSI2 TX Device Tree bindings
The Cadence MIPI-CSI2 TX controller is a CSI2 bridge that supports up to 4 video streams and can output on up to 4 CSI-2 lanes, 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,csi2tx.txt | 98 ++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2tx.txt
Documentation/devicetree/bindings/media/cdns,csi2tx.txt new file +98 -0
@@ -0,0 +1,98 @@ +Cadence MIPI-CSI2 TX controller +=============================== + +The Cadence MIPI-CSI2 TX controller is a CSI-2 bridge supporting up to +4 CSI lanes in output, and up to 4 different pixel streams in input. + +Required properties: + - compatible: must be set to "cdns,csi2tx" + - reg: base address and size of the memory mapped region + - clocks: phandles to the clocks driving the controller + - clock-names: must contain: + * esc_clk: escape mode 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 D-PHY. If it is set, phy-names need to be set + - phy-names: must contain "dphy" + +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 output + 1 Stream 0 input + 2 Stream 1 input + 3 Stream 2 input + 4 Stream 3 input + + The stream input 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: + +csi2tx: csi-bridge@0d0e1000 { + compatible = "cdns,csi2tx"; + reg = <0x0d0e1000 0x1000>; + clocks = <&byteclock>, <&byteclock>, + <&coreclock>, <&coreclock>, + <&coreclock>, <&coreclock>; + clock-names = "p_clk", "esc_clk", + "pixel_if0_clk", "pixel_if1_clk", + "pixel_if2_clk", "pixel_if3_clk"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csi2tx_out: endpoint { + remote-endpoint = <&remote_in>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + + csi2tx_in_stream0: endpoint { + remote-endpoint = <&stream0_out>; + }; + }; + + port@2 { + reg = <2>; + + csi2tx_in_stream1: endpoint { + remote-endpoint = <&stream1_out>; + }; + }; + + port@3 { + reg = <3>; + + csi2tx_in_stream2: endpoint { + remote-endpoint = <&stream2_out>; + }; + }; + + port@4 { + reg = <4>; + + csi2tx_in_stream3: endpoint { + remote-endpoint = <&stream3_out>; + }; + }; + }; +};
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
PATCH v4 2/2 v4l: cadence: Add Cadence MIPI-CSI2 TX driver
In reply to a message not in the archiveThe Cadence MIPI-CSI2 TX controller is an hardware block meant to be used as a bridge between pixel interfaces and a CSI-2 bus.
It supports operating with an internal or external D-PHY, with up to 4 lanes, or without any D-PHY. The current code only supports the latter case.
While the virtual channel input on the pixel interface can be directly mapped to CSI2, the datatype input is actually a selection signal (3-bits) mapping to a table of up to 8 preconfigured datatypes/formats (programmed at start-up)
The block supports up to 8 input datatypes.
--- drivers/media/platform/cadence/Kconfig | 11 + drivers/media/platform/cadence/Makefile | 1 + drivers/media/platform/cadence/cdns-csi2tx.c | 602 +++++++++++++++++++++++++++ 3 files changed, 614 insertions(+) create mode 100644 drivers/media/platform/cadence/cdns-csi2tx.c
drivers/media/platform/cadence/Kconfig +11 -0
@@ -14,4 +14,15 @@ config VIDEO_CADENCE_CSI2RX To compile this driver as a module, choose M here: the module will be called cdns-csi2rx. +config VIDEO_CADENCE_CSI2TX + tristate "Cadence MIPI-CSI2 TX Controller" + depends on MEDIA_CONTROLLER + depends on VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Cadence MIPI CSI2 Transceiver controller. + + To compile this driver as a module, choose M here: the module will be + called cdns-csi2tx. + endif
drivers/media/platform/cadence/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_VIDEO_CADENCE_CSI2RX) += cdns-csi2rx.o +obj-$(CONFIG_VIDEO_CADENCE_CSI2TX) += cdns-csi2tx.o
drivers/media/platform/cadence/cdns-csi2tx.c new file +602 -0
602 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