* [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver
@ 2018-11-21 11:15 Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
` (12 more replies)
0 siblings, 13 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Hi,
This series introduces the Media driver to work with the i.MX7 SoC. it uses the
already existing imx media core drivers but since the i.MX7, contrary to
i.MX5/6, do not have an IPU and because of that some changes in the imx media
core are made along this series to make it support that case.
This patches adds CSI and MIPI-CSI2 drivers for i.MX7, along with several
configurations changes for this to work as a capture subsystem. Some bugs are
also fixed along the line. And necessary documentation.
For a more detailed view of the capture paths, pads links in the i.MX7 please
take a look at the documentation in PATCH 14.
The system used to test and develop this was the Warp7 board with an OV2680
sensor, which output format is 10-bit bayer. So, only MIPI interface was
tested, a scenario with an parallel input would nice to have.
Bellow goes an example of the output of the pads and links and the output of
v4l2-compliance testing.
The v4l-utils version used is:
v4l2-compliance SHA : 044d5ab7b0d02683070d01a369c73d462d7a0cee from Nov 19th
The Media Driver fail some tests but this failures are coming from code out of
scope of this series (imx-capture), and some from the sensor OV2680
but that I think not related with the sensor driver but with the testing and
core.
The csi and mipi-csi entities pass all compliance tests.
Cheers,
Rui
v7->v8:
Myself:
- rebase to latest linux-next (s/V4L2_MBUS_CSI2/V4L2_MBUS_CSI2_DPHY/)
- Rebuild and test with latest v4l2-compliance
- add Sakari reviewed-by tag to dt-bindings
v6->v7:
Myself:
- Clock patches removed from this version since they were already merged
- Rebuild and test with the latest v4l2-compliance
- Add patch to video-mux regarding bayer formats
- remove reference to dependent patch serie (was already merged)
Sakari Ailus:
- add port and endpoint explanantions
- fix some wording should -> shall
v5->v6:
Rob Herring:
- rename power-domain node name from: pgc-power-domain to power-domain
- change mux-control-cells to 0
- remove bus-width from mipi bindings and dts
- remove err... regarding clock names line
- remove clk-settle from example
- split mipi-csi2 and csi bindings per file
- add OF graph description to CSI
Philipp Zabel:
- rework group IDs and rename them with an _IPU_ prefix, this allowed to remove
the ipu_present flag need.
v4->v5:
Sakari Ailus:
- fix remove of the capture entries in dts bindings in the right patch
Stephen Boyd:
- Send all series to clk list
v3->v4:
Philipp Zabel:
- refactor initialization code from media device probe to be possible to used
from other modules
- Remove index of csi from all accurrencs (dts, code, documentation)
- Remove need for capture node for imx7
- fix pinctrl for ov2680
- add reviewed tag to add multiplexer controls patch
Fabio Estevam:
- remove always on from new regulator
Randy Dunlap:
- several text editing fixes in documentation
Myself:
- rebase on top of v4 of Steve series
- change CSI probe to initialize imx media device
- remove csi mux parallel endpoint from mux to avoid warning message
v2->v3:
Philipp Zabel:
- use of_match_device in imx-media-dev instead of of_device_match
- fix number of data lanes from 4 to 2
- change the clock definitions and use of mipi
- move hs-settle from endpoint
Rob Herring:
- fix phy-supply description
- add vendor properties
- fix examples indentations
Stephen Boyd: patch 3/14
- fix double sign-off
- add fixes tag
Dong Aisheng: patch 3/14
- fix double sign-off
- add Acked-by tag
Shawn Guo:
patch 4/14
- remove line breakage in parent redifiniton
- added Acked-by tag
- dropped CMA area increase and add more verbose information in case of
dma allocation failure
patch 9/14
- remove extra line between cells and reg masks
Myself:
- rework on frame end in csi
- add rxcount in csi driver
- add power supplies to ov2680 node and fix gpio polarity
v1->v2:
Dan Carpenter:
- fix return paths and codes;
- fix clk_frequency validation and return code;
- handle the csi remove (release resources that was missing)
- revert the logic arround the ipu_present flag
Philipp Zabel:
- drop patch that changed the rgb formats and address the pixel/bus format in
mipi_csis code.
MySelf:
- add patch that add ov2680 node to the warp7 dts, so the all data path is
complete.
- add linux-clk mailing list to the clock patches cc:
v4l2-compliance SHA: 044d5ab7b0d02683070d01a369c73d462d7a0cee, 32 bits
Compliance test for device /dev/media0:
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Required ioctls:
test MEDIA_IOC_DEVICE_INFO: OK
Allow for multiple opens:
test second /dev/media0 open: OK
test MEDIA_IOC_DEVICE_INFO: OK
test for unlimited opens: OK
Media Controller ioctls:
test MEDIA_IOC_G_TOPOLOGY: OK
Entities: 5 Interfaces: 5 Pads: 9 Links: 9
test MEDIA_IOC_ENUM_ENTITIES/LINKS: OK
test MEDIA_IOC_SETUP_LINK: OK
--------------------------------------------------------------------------------
Compliance test for device /dev/video0:
Driver Info:
Driver name : imx-media-captu
Card type : imx-media-capture
Bus info : platform:csi
Driver version : 4.20.0
Capabilities : 0x84200001
Video Capture
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04200001
Video Capture
Streaming
Extended Pix Format
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Interface Info:
ID : 0x03000005
Type : V4L Video
Entity Info:
ID : 0x00000004 (4)
Name : csi capture
Function : V4L2 I/O
Pad 0x01000007 : 0: Sink
Link 0x02000008: from remote pad 0x1000003 of entity 'csi': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-input-output.cpp(420): G_INPUT not supported for a capture dev
ice
test VIDIOC_G/S/ENUMINPUT: FAIL
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-controls.cpp(816): subscribe event for control 'User Controls'
failed
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 10 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test VIDIOC_EXPBUF: OK
--------------------------------------------------------------------------------
Compliance test for device /dev/v4l-subdev0:
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Interface Info:
ID : 0x03000019
Type : V4L Sub-Device
Entity Info:
ID : 0x00000001 (1)
Name : csi
Function : Video Interface Bridge
Pad 0x01000002 : 0: Sink
Link 0x02000015: from remote pad 0x100000d of entity 'csi_mux': Data, Enabled
Pad 0x01000003 : 1: Source
Link 0x02000008: to remote pad 0x1000007 of entity 'csi capture': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev0 open: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported)
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 0 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported)
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported)
test VIDIOC_EXPBUF: OK (Not Supported)
--------------------------------------------------------------------------------
Compliance test for device /dev/v4l-subdev1:
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Interface Info:
ID : 0x0300001b
Type : V4L Sub-Device
Entity Info:
ID : 0x0000000a (10)
Name : csi_mux
Function : Video Muxer
Pad 0x0100000b : 0: Sink
Pad 0x0100000c : 1: Sink
Link 0x02000013: from remote pad 0x1000010 of entity 'imx7-mipi-csis.0': Data, Enabled
Pad 0x0100000d : 2: Source
Link 0x02000015: to remote pad 0x1000002 of entity 'csi': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev1 open: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Sink Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 2):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(370): s_fmt.format.width != fmt.format.width
test Try VIDIOC_SUBDEV_G/S_FMT: FAIL
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported)
test VIDIOC_QUERYCTRL: OK (Not Supported)
test VIDIOC_G/S_CTRL: OK (Not Supported)
test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported)
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported)
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 0 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported)
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported)
test VIDIOC_EXPBUF: OK (Not Supported)
--------------------------------------------------------------------------------
Compliance test for device /dev/v4l-subdev2:
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Interface Info:
ID : 0x0300001d
Type : V4L Sub-Device
Entity Info:
ID : 0x0000000e (14)
Name : imx7-mipi-csis.0
Function : Video Interface Bridge
Pad 0x0100000f : 0: Sink
Link 0x02000017: from remote pad 0x1000012 of entity 'ov2680 1-0036': Data, Enabled
Pad 0x01000010 : 1: Source
Link 0x02000013: to remote pad 0x100000c of entity 'csi_mux': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev2 open: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_LOG_STATUS: OK
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Sub-Device ioctls (Sink Pad 0):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Sub-Device ioctls (Source Pad 1):
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Try VIDIOC_SUBDEV_G/S_FMT: OK
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK (Not Supported)
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported)
test VIDIOC_QUERYCTRL: OK (Not Supported)
test VIDIOC_G/S_CTRL: OK (Not Supported)
test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported)
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported)
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 0 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported)
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported)
test VIDIOC_EXPBUF: OK (Not Supported)
--------------------------------------------------------------------------------
Compliance test for device /dev/v4l-subdev3:
Media Driver Info:
Driver name : imx7-csi
Model : imx-media
Serial :
Bus info :
Media version : 4.20.0
Hardware revision: 0x00000000 (0)
Driver version : 4.20.0
Interface Info:
ID : 0x0300001f
Type : V4L Sub-Device
Entity Info:
ID : 0x00000011 (17)
Name : ov2680 1-0036
Function : Camera Sensor
Pad 0x01000012 : 0: Source
Link 0x02000017: to remote pad 0x100000f of entity 'imx7-mipi-csis.0': Data, Enabled
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
Allow for multiple opens:
test second /dev/v4l-subdev3 open: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Sub-Device ioctls (Source Pad 0):
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(57): node->enum_frame_interval_pad >= 0
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(183): ret && ret != ENOTTY
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(248): ret && ret != ENOTTY
test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: FAIL
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(311): fmt.width == 0 || fmt.width > 65536
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-subdevs.cpp(356): checkMBusFrameFmt(node, fmt.format)
test Try VIDIOC_SUBDEV_G/S_FMT: FAIL
test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK
test Active VIDIOC_SUBDEV_G/S_FMT: OK
test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported)
test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
fail: ../../../../../../../../../../v4l-utils/utils/v4l2-compliance/v4l2-test-controls.cpp(816): subscribe event for control 'User Controls'
failed
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 10 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported)
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK (Not Supported)
test VIDIOC_TRY_FMT: OK (Not Supported)
test VIDIOC_S_FMT: OK (Not Supported)
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported)
test VIDIOC_EXPBUF: OK (Not Supported)
Total: 267, Succeeded: 261, Failed: 6, Warnings: 0
Rui Miguel Silva (12):
media: staging/imx: refactor imx media device probe
media: staging/imx: rearrange group id to take in account IPU
media: staging/imx7: add imx7 CSI subdev driver
media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7
media: dt-bindings: add bindings for i.MX7 media driver
ARM: dts: imx7s: add mipi phy power domain
ARM: dts: imx7s: add multiplexer controls
ARM: dts: imx7: Add video mux, csi and mipi_csi and connections
ARM: dts: imx7s-warp: add ov2680 sensor node
media: imx7.rst: add documentation for i.MX7 media driver
media: staging/imx: add i.MX7 entries to TODO file
media: video-mux: add bayer formats
.../devicetree/bindings/media/imx7-csi.txt | 45 +
.../bindings/media/imx7-mipi-csi2.txt | 90 ++
Documentation/media/v4l-drivers/imx7.rst | 157 ++
Documentation/media/v4l-drivers/index.rst | 1 +
arch/arm/boot/dts/imx7s-warp.dts | 95 ++
arch/arm/boot/dts/imx7s.dtsi | 43 +-
drivers/media/platform/video-mux.c | 20 +
drivers/staging/media/imx/Kconfig | 9 +-
drivers/staging/media/imx/Makefile | 4 +
drivers/staging/media/imx/TODO | 9 +
drivers/staging/media/imx/imx-ic-common.c | 6 +-
drivers/staging/media/imx/imx-ic-prp.c | 14 +-
drivers/staging/media/imx/imx-media-csi.c | 6 +-
drivers/staging/media/imx/imx-media-dev.c | 110 +-
.../staging/media/imx/imx-media-internal-sd.c | 20 +-
drivers/staging/media/imx/imx-media-of.c | 6 +-
drivers/staging/media/imx/imx-media-utils.c | 12 +-
drivers/staging/media/imx/imx-media.h | 38 +-
drivers/staging/media/imx/imx7-media-csi.c | 1352 +++++++++++++++++
drivers/staging/media/imx/imx7-mipi-csis.c | 1134 ++++++++++++++
20 files changed, 3048 insertions(+), 123 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt
create mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
create mode 100644 Documentation/media/v4l-drivers/imx7.rst
create mode 100644 drivers/staging/media/imx/imx7-media-csi.c
create mode 100644 drivers/staging/media/imx/imx7-mipi-csis.c
--
2.19.1
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH v8 01/12] media: staging/imx: refactor imx media device probe
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 22:40 ` kbuild test robot
2018-11-21 11:15 ` [PATCH v8 02/12] media: staging/imx: rearrange group id to take in account IPU Rui Miguel Silva
` (11 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Refactor and move media device initialization code to a new common module, so it
can be used by other devices, this will allow for example a near to introduce
imx7 CSI driver, to use this media device.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/staging/media/imx/Makefile | 1 +
drivers/staging/media/imx/imx-media-dev.c | 88 +++++------------------
drivers/staging/media/imx/imx-media-of.c | 6 +-
drivers/staging/media/imx/imx-media.h | 15 ++++
4 files changed, 39 insertions(+), 71 deletions(-)
diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 698a4210316e..a30b3033f9a3 100644
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o
+imx-media-objs += imx-media-dev-common.o
imx-media-common-objs := imx-media-utils.o imx-media-fim.o
imx-media-ic-objs := imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o
diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 4b344a4a3706..21f65af5c738 100644
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -116,9 +116,9 @@ static int imx_media_get_ipu(struct imx_media_dev *imxmd,
}
/* async subdev bound notifier */
-static int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *sd,
- struct v4l2_async_subdev *asd)
+int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd)
{
struct imx_media_dev *imxmd = notifier2dev(notifier);
int ret = 0;
@@ -302,7 +302,7 @@ static int imx_media_create_pad_vdev_lists(struct imx_media_dev *imxmd)
}
/* async subdev complete notifier */
-static int imx_media_probe_complete(struct v4l2_async_notifier *notifier)
+int imx_media_probe_complete(struct v4l2_async_notifier *notifier)
{
struct imx_media_dev *imxmd = notifier2dev(notifier);
int ret;
@@ -326,11 +326,6 @@ static int imx_media_probe_complete(struct v4l2_async_notifier *notifier)
return media_device_register(&imxmd->md);
}
-static const struct v4l2_async_notifier_operations imx_media_subdev_ops = {
- .bound = imx_media_subdev_bound,
- .complete = imx_media_probe_complete,
-};
-
/*
* adds controls to a video device from an entity subdevice.
* Continues upstream from the entity's sink pads.
@@ -374,8 +369,8 @@ static int imx_media_inherit_controls(struct imx_media_dev *imxmd,
return ret;
}
-static int imx_media_link_notify(struct media_link *link, u32 flags,
- unsigned int notification)
+int imx_media_link_notify(struct media_link *link, u32 flags,
+ unsigned int notification)
{
struct media_entity *source = link->source->entity;
struct imx_media_pad_vdev *pad_vdev;
@@ -438,10 +433,6 @@ static int imx_media_link_notify(struct media_link *link, u32 flags,
return ret;
}
-static const struct media_device_ops imx_media_md_ops = {
- .link_notify = imx_media_link_notify,
-};
-
static int imx_media_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -449,76 +440,36 @@ static int imx_media_probe(struct platform_device *pdev)
struct imx_media_dev *imxmd;
int ret;
- imxmd = devm_kzalloc(dev, sizeof(*imxmd), GFP_KERNEL);
- if (!imxmd)
- return -ENOMEM;
-
- dev_set_drvdata(dev, imxmd);
-
- strscpy(imxmd->md.model, "imx-media", sizeof(imxmd->md.model));
- imxmd->md.ops = &imx_media_md_ops;
- imxmd->md.dev = dev;
-
- mutex_init(&imxmd->mutex);
-
- imxmd->v4l2_dev.mdev = &imxmd->md;
- strscpy(imxmd->v4l2_dev.name, "imx-media",
- sizeof(imxmd->v4l2_dev.name));
-
- media_device_init(&imxmd->md);
-
- ret = v4l2_device_register(dev, &imxmd->v4l2_dev);
- if (ret < 0) {
- v4l2_err(&imxmd->v4l2_dev,
- "Failed to register v4l2_device: %d\n", ret);
- goto cleanup;
- }
-
- dev_set_drvdata(imxmd->v4l2_dev.dev, imxmd);
-
- INIT_LIST_HEAD(&imxmd->vdev_list);
-
- v4l2_async_notifier_init(&imxmd->notifier);
+ imxmd = imx_media_dev_init(dev);
+ if (IS_ERR(imxmd))
+ return PTR_ERR(imxmd);
ret = imx_media_add_of_subdevs(imxmd, node);
if (ret) {
v4l2_err(&imxmd->v4l2_dev,
"add_of_subdevs failed with %d\n", ret);
- goto notifier_cleanup;
+ goto dev_cleanup;
}
ret = imx_media_add_internal_subdevs(imxmd);
if (ret) {
v4l2_err(&imxmd->v4l2_dev,
"add_internal_subdevs failed with %d\n", ret);
- goto notifier_cleanup;
- }
-
- /* no subdevs? just bail */
- if (list_empty(&imxmd->notifier.asd_list)) {
- ret = -ENODEV;
- goto notifier_cleanup;
+ goto dev_cleanup;
}
- /* prepare the async subdev notifier and register it */
- imxmd->notifier.ops = &imx_media_subdev_ops;
- ret = v4l2_async_notifier_register(&imxmd->v4l2_dev,
- &imxmd->notifier);
- if (ret) {
- v4l2_err(&imxmd->v4l2_dev,
- "v4l2_async_notifier_register failed with %d\n", ret);
+ ret = imx_media_dev_notifier_register(imxmd);
+ if (ret)
goto del_int;
- }
return 0;
del_int:
imx_media_remove_internal_subdevs(imxmd);
-notifier_cleanup:
- v4l2_async_notifier_cleanup(&imxmd->notifier);
- v4l2_device_unregister(&imxmd->v4l2_dev);
-cleanup:
- media_device_cleanup(&imxmd->md);
+
+dev_cleanup:
+ imx_media_dev_cleanup(imxmd);
+
return ret;
}
@@ -531,10 +482,9 @@ static int imx_media_remove(struct platform_device *pdev)
v4l2_async_notifier_unregister(&imxmd->notifier);
imx_media_remove_internal_subdevs(imxmd);
- v4l2_async_notifier_cleanup(&imxmd->notifier);
- v4l2_device_unregister(&imxmd->v4l2_dev);
+ imx_media_dev_notifier_unregister(imxmd);
media_device_unregister(&imxmd->md);
- media_device_cleanup(&imxmd->md);
+ imx_media_dev_cleanup(imxmd);
return 0;
}
diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c
index b2e840f96c50..c77d97874d06 100644
--- a/drivers/staging/media/imx/imx-media-of.c
+++ b/drivers/staging/media/imx/imx-media-of.c
@@ -20,7 +20,8 @@
#include <video/imx-ipu-v3.h>
#include "imx-media.h"
-static int of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np)
+int imx_media_of_add_csi(struct imx_media_dev *imxmd,
+ struct device_node *csi_np)
{
int ret;
@@ -45,6 +46,7 @@ static int of_add_csi(struct imx_media_dev *imxmd, struct device_node *csi_np)
return 0;
}
+EXPORT_SYMBOL_GPL(imx_media_of_add_csi);
int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,
struct device_node *np)
@@ -57,7 +59,7 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,
if (!csi_np)
break;
- ret = of_add_csi(imxmd, csi_np);
+ ret = imx_media_of_add_csi(imxmd, csi_np);
of_node_put(csi_np);
if (ret)
return ret;
diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index bc7feb81937c..b7f11c36461b 100644
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -226,6 +226,19 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd,
struct fwnode_handle *fwnode,
struct platform_device *pdev);
+int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd);
+int imx_media_link_notify(struct media_link *link, u32 flags,
+ unsigned int notification);
+int imx_media_probe_complete(struct v4l2_async_notifier *notifier);
+
+struct imx_media_dev *imx_media_dev_init(struct device *dev);
+int imx_media_dev_notifier_register(struct imx_media_dev *imxmd);
+
+void imx_media_dev_cleanup(struct imx_media_dev *imxmd);
+void imx_media_dev_notifier_unregister(struct imx_media_dev *imxmd);
+
/* imx-media-fim.c */
struct imx_media_fim;
void imx_media_fim_eof_monitor(struct imx_media_fim *fim, ktime_t timestamp);
@@ -249,6 +262,8 @@ int imx_media_create_of_links(struct imx_media_dev *imxmd,
struct v4l2_subdev *sd);
int imx_media_create_csi_of_links(struct imx_media_dev *imxmd,
struct v4l2_subdev *csi);
+int imx_media_of_add_csi(struct imx_media_dev *imxmd,
+ struct device_node *csi_np);
/* imx-media-capture.c */
struct imx_media_video_dev *
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 02/12] media: staging/imx: rearrange group id to take in account IPU
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
` (10 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Some imx system do not have IPU, so prepare the imx media drivers to support
this kind of devices. Rename the group ids to include an _IPU_ prefix, add a new
group id to support systems with only a CSI without IPU, and also
rename the create internal links to make it clear that only systems with IPU
have internal subdevices.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/staging/media/imx/imx-ic-common.c | 6 ++---
drivers/staging/media/imx/imx-ic-prp.c | 14 +++++------
drivers/staging/media/imx/imx-media-csi.c | 6 ++---
drivers/staging/media/imx/imx-media-dev.c | 22 ++++++++++--------
.../staging/media/imx/imx-media-internal-sd.c | 20 ++++++++--------
drivers/staging/media/imx/imx-media-utils.c | 12 +++++-----
drivers/staging/media/imx/imx-media.h | 23 ++++++++++---------
7 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/drivers/staging/media/imx/imx-ic-common.c b/drivers/staging/media/imx/imx-ic-common.c
index cfdd4900a3be..765919487a73 100644
--- a/drivers/staging/media/imx/imx-ic-common.c
+++ b/drivers/staging/media/imx/imx-ic-common.c
@@ -41,13 +41,13 @@ static int imx_ic_probe(struct platform_device *pdev)
pdata = priv->dev->platform_data;
priv->ipu_id = pdata->ipu_id;
switch (pdata->grp_id) {
- case IMX_MEDIA_GRP_ID_IC_PRP:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRP:
priv->task_id = IC_TASK_PRP;
break;
- case IMX_MEDIA_GRP_ID_IC_PRPENC:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:
priv->task_id = IC_TASK_ENCODER;
break;
- case IMX_MEDIA_GRP_ID_IC_PRPVF:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:
priv->task_id = IC_TASK_VIEWFINDER;
break;
default:
diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index 98923fc844ce..795ca61f7cea 100644
--- a/drivers/staging/media/imx/imx-ic-prp.c
+++ b/drivers/staging/media/imx/imx-ic-prp.c
@@ -77,7 +77,7 @@ static int prp_start(struct prp_priv *priv)
priv->ipu = priv->md->ipu[ic_priv->ipu_id];
/* set IC to receive from CSI or VDI depending on source */
- src_is_vdic = !!(priv->src_sd->grp_id & IMX_MEDIA_GRP_ID_VDIC);
+ src_is_vdic = !!(priv->src_sd->grp_id & IMX_MEDIA_GRP_ID_IPU_VDIC);
ipu_set_ic_src_mux(priv->ipu, priv->csi_id, src_is_vdic);
@@ -238,7 +238,7 @@ static int prp_link_setup(struct media_entity *entity,
goto out;
}
if (priv->sink_sd_prpenc && (remote_sd->grp_id &
- IMX_MEDIA_GRP_ID_VDIC)) {
+ IMX_MEDIA_GRP_ID_IPU_VDIC)) {
ret = -EINVAL;
goto out;
}
@@ -259,7 +259,7 @@ static int prp_link_setup(struct media_entity *entity,
goto out;
}
if (priv->src_sd && (priv->src_sd->grp_id &
- IMX_MEDIA_GRP_ID_VDIC)) {
+ IMX_MEDIA_GRP_ID_IPU_VDIC)) {
ret = -EINVAL;
goto out;
}
@@ -309,13 +309,13 @@ static int prp_link_validate(struct v4l2_subdev *sd,
return ret;
csi = imx_media_find_upstream_subdev(priv->md, &ic_priv->sd.entity,
- IMX_MEDIA_GRP_ID_CSI);
+ IMX_MEDIA_GRP_ID_IPU_CSI);
if (IS_ERR(csi))
csi = NULL;
mutex_lock(&priv->lock);
- if (priv->src_sd->grp_id & IMX_MEDIA_GRP_ID_VDIC) {
+ if (priv->src_sd->grp_id & IMX_MEDIA_GRP_ID_IPU_VDIC) {
/*
* the ->PRPENC link cannot be enabled if the source
* is the VDIC
@@ -334,10 +334,10 @@ static int prp_link_validate(struct v4l2_subdev *sd,
if (csi) {
switch (csi->grp_id) {
- case IMX_MEDIA_GRP_ID_CSI0:
+ case IMX_MEDIA_GRP_ID_IPU_CSI0:
priv->csi_id = 0;
break;
- case IMX_MEDIA_GRP_ID_CSI1:
+ case IMX_MEDIA_GRP_ID_IPU_CSI1:
priv->csi_id = 1;
break;
default:
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 4223f8d418ae..a12fa1dd989e 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1029,10 +1029,10 @@ static int csi_link_setup(struct media_entity *entity,
remote_sd = media_entity_to_v4l2_subdev(remote->entity);
switch (remote_sd->grp_id) {
- case IMX_MEDIA_GRP_ID_VDIC:
+ case IMX_MEDIA_GRP_ID_IPU_VDIC:
priv->dest = IPU_CSI_DEST_VDIC;
break;
- case IMX_MEDIA_GRP_ID_IC_PRP:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRP:
priv->dest = IPU_CSI_DEST_IC;
break;
default:
@@ -1877,7 +1877,7 @@ static int imx_csi_probe(struct platform_device *pdev)
priv->sd.owner = THIS_MODULE;
priv->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
priv->sd.grp_id = priv->csi_id ?
- IMX_MEDIA_GRP_ID_CSI1 : IMX_MEDIA_GRP_ID_CSI0;
+ IMX_MEDIA_GRP_ID_IPU_CSI1 : IMX_MEDIA_GRP_ID_IPU_CSI0;
imx_media_grp_id_to_sd_name(priv->sd.name, sizeof(priv->sd.name),
priv->sd.grp_id, ipu_get_num(priv->ipu));
diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 21f65af5c738..c8fc514f890e 100644
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -125,7 +125,7 @@ int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,
mutex_lock(&imxmd->mutex);
- if (sd->grp_id & IMX_MEDIA_GRP_ID_CSI) {
+ if (sd->grp_id & IMX_MEDIA_GRP_ID_IPU_CSI) {
ret = imx_media_get_ipu(imxmd, sd);
if (ret)
goto out;
@@ -149,13 +149,13 @@ static int imx_media_create_links(struct v4l2_async_notifier *notifier)
list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
switch (sd->grp_id) {
- case IMX_MEDIA_GRP_ID_VDIC:
- case IMX_MEDIA_GRP_ID_IC_PRP:
- case IMX_MEDIA_GRP_ID_IC_PRPENC:
- case IMX_MEDIA_GRP_ID_IC_PRPVF:
- case IMX_MEDIA_GRP_ID_CSI0:
- case IMX_MEDIA_GRP_ID_CSI1:
- ret = imx_media_create_internal_links(imxmd, sd);
+ case IMX_MEDIA_GRP_ID_IPU_VDIC:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRP:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:
+ case IMX_MEDIA_GRP_ID_IPU_CSI0:
+ case IMX_MEDIA_GRP_ID_IPU_CSI1:
+ ret = imx_media_create_ipu_internal_links(imxmd, sd);
if (ret)
return ret;
/*
@@ -163,9 +163,13 @@ static int imx_media_create_links(struct v4l2_async_notifier *notifier)
* internal entities, so create the external links
* to the CSI sink pads.
*/
- if (sd->grp_id & IMX_MEDIA_GRP_ID_CSI)
+ if (sd->grp_id & IMX_MEDIA_GRP_ID_IPU_CSI)
imx_media_create_csi_of_links(imxmd, sd);
break;
+ case IMX_MEDIA_GRP_ID_CSI:
+ imx_media_create_csi_of_links(imxmd, sd);
+
+ break;
default:
/*
* if this subdev has fwnode links, create media
diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c
index 0fdc45dbfb76..5e10d95e5529 100644
--- a/drivers/staging/media/imx/imx-media-internal-sd.c
+++ b/drivers/staging/media/imx/imx-media-internal-sd.c
@@ -30,32 +30,32 @@ static const struct internal_subdev_id {
} isd_id[num_isd] = {
[isd_csi0] = {
.index = isd_csi0,
- .grp_id = IMX_MEDIA_GRP_ID_CSI0,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_CSI0,
.name = "imx-ipuv3-csi",
},
[isd_csi1] = {
.index = isd_csi1,
- .grp_id = IMX_MEDIA_GRP_ID_CSI1,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_CSI1,
.name = "imx-ipuv3-csi",
},
[isd_vdic] = {
.index = isd_vdic,
- .grp_id = IMX_MEDIA_GRP_ID_VDIC,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_VDIC,
.name = "imx-ipuv3-vdic",
},
[isd_ic_prp] = {
.index = isd_ic_prp,
- .grp_id = IMX_MEDIA_GRP_ID_IC_PRP,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_IC_PRP,
.name = "imx-ipuv3-ic",
},
[isd_ic_prpenc] = {
.index = isd_ic_prpenc,
- .grp_id = IMX_MEDIA_GRP_ID_IC_PRPENC,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_IC_PRPENC,
.name = "imx-ipuv3-ic",
},
[isd_ic_prpvf] = {
.index = isd_ic_prpvf,
- .grp_id = IMX_MEDIA_GRP_ID_IC_PRPVF,
+ .grp_id = IMX_MEDIA_GRP_ID_IPU_IC_PRPVF,
.name = "imx-ipuv3-ic",
},
};
@@ -229,8 +229,8 @@ static int create_ipu_internal_link(struct imx_media_dev *imxmd,
return ret;
}
-int imx_media_create_internal_links(struct imx_media_dev *imxmd,
- struct v4l2_subdev *sd)
+int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd,
+ struct v4l2_subdev *sd)
{
const struct internal_subdev *intsd;
const struct internal_pad *intpad;
@@ -312,8 +312,8 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id)
* of_parse_subdev().
*/
switch (isd->id->grp_id) {
- case IMX_MEDIA_GRP_ID_CSI0:
- case IMX_MEDIA_GRP_ID_CSI1:
+ case IMX_MEDIA_GRP_ID_IPU_CSI0:
+ case IMX_MEDIA_GRP_ID_IPU_CSI1:
ret = 0;
break;
default:
diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index 0eaa353d5cb3..3e35d01d18dd 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -696,20 +696,20 @@ void imx_media_grp_id_to_sd_name(char *sd_name, int sz, u32 grp_id, int ipu_id)
int id;
switch (grp_id) {
- case IMX_MEDIA_GRP_ID_CSI0...IMX_MEDIA_GRP_ID_CSI1:
- id = (grp_id >> IMX_MEDIA_GRP_ID_CSI_BIT) - 1;
+ case IMX_MEDIA_GRP_ID_IPU_CSI0...IMX_MEDIA_GRP_ID_IPU_CSI1:
+ id = (grp_id >> IMX_MEDIA_GRP_ID_IPU_CSI_BIT) - 1;
snprintf(sd_name, sz, "ipu%d_csi%d", ipu_id + 1, id);
break;
- case IMX_MEDIA_GRP_ID_VDIC:
+ case IMX_MEDIA_GRP_ID_IPU_VDIC:
snprintf(sd_name, sz, "ipu%d_vdic", ipu_id + 1);
break;
- case IMX_MEDIA_GRP_ID_IC_PRP:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRP:
snprintf(sd_name, sz, "ipu%d_ic_prp", ipu_id + 1);
break;
- case IMX_MEDIA_GRP_ID_IC_PRPENC:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:
snprintf(sd_name, sz, "ipu%d_ic_prpenc", ipu_id + 1);
break;
- case IMX_MEDIA_GRP_ID_IC_PRPVF:
+ case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:
snprintf(sd_name, sz, "ipu%d_ic_prpvf", ipu_id + 1);
break;
default:
diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index b7f11c36461b..a8fc084a33fc 100644
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -251,8 +251,8 @@ void imx_media_fim_free(struct imx_media_fim *fim);
/* imx-media-internal-sd.c */
int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd);
-int imx_media_create_internal_links(struct imx_media_dev *imxmd,
- struct v4l2_subdev *sd);
+int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd,
+ struct v4l2_subdev *sd);
void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd);
/* imx-media-of.c */
@@ -278,14 +278,15 @@ void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev,
void imx_media_capture_device_error(struct imx_media_video_dev *vdev);
/* subdev group ids */
-#define IMX_MEDIA_GRP_ID_CSI2 BIT(8)
-#define IMX_MEDIA_GRP_ID_CSI_BIT 9
-#define IMX_MEDIA_GRP_ID_CSI (0x3 << IMX_MEDIA_GRP_ID_CSI_BIT)
-#define IMX_MEDIA_GRP_ID_CSI0 BIT(IMX_MEDIA_GRP_ID_CSI_BIT)
-#define IMX_MEDIA_GRP_ID_CSI1 (2 << IMX_MEDIA_GRP_ID_CSI_BIT)
-#define IMX_MEDIA_GRP_ID_VDIC BIT(11)
-#define IMX_MEDIA_GRP_ID_IC_PRP BIT(12)
-#define IMX_MEDIA_GRP_ID_IC_PRPENC BIT(13)
-#define IMX_MEDIA_GRP_ID_IC_PRPVF BIT(14)
+#define IMX_MEDIA_GRP_ID_CSI2 BIT(8)
+#define IMX_MEDIA_GRP_ID_CSI BIT(9)
+#define IMX_MEDIA_GRP_ID_IPU_CSI_BIT 10
+#define IMX_MEDIA_GRP_ID_IPU_CSI (0x3 << IMX_MEDIA_GRP_ID_IPU_CSI_BIT)
+#define IMX_MEDIA_GRP_ID_IPU_CSI0 BIT(IMX_MEDIA_GRP_ID_IPU_CSI_BIT)
+#define IMX_MEDIA_GRP_ID_IPU_CSI1 (2 << IMX_MEDIA_GRP_ID_IPU_CSI_BIT)
+#define IMX_MEDIA_GRP_ID_IPU_VDIC BIT(12)
+#define IMX_MEDIA_GRP_ID_IPU_IC_PRP BIT(13)
+#define IMX_MEDIA_GRP_ID_IPU_IC_PRPENC BIT(14)
+#define IMX_MEDIA_GRP_ID_IPU_IC_PRPVF BIT(15)
#endif
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 02/12] media: staging/imx: rearrange group id to take in account IPU Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 22:29 ` Sakari Ailus
2018-11-21 11:15 ` [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
` (9 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
This add the media entity subdevice and control driver for the i.MX7
CMOS Sensor Interface.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/staging/media/imx/Kconfig | 9 +-
drivers/staging/media/imx/Makefile | 2 +
drivers/staging/media/imx/imx7-media-csi.c | 1352 ++++++++++++++++++++
3 files changed, 1362 insertions(+), 1 deletion(-)
create mode 100644 drivers/staging/media/imx/imx7-media-csi.c
diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
index bfc17de56b17..40a11f988fc6 100644
--- a/drivers/staging/media/imx/Kconfig
+++ b/drivers/staging/media/imx/Kconfig
@@ -11,7 +11,7 @@ config VIDEO_IMX_MEDIA
driver for the i.MX5/6 SOC.
if VIDEO_IMX_MEDIA
-menu "i.MX5/6 Media Sub devices"
+menu "i.MX5/6/7 Media Sub devices"
config VIDEO_IMX_CSI
tristate "i.MX5/6 Camera Sensor Interface driver"
@@ -20,5 +20,12 @@ config VIDEO_IMX_CSI
---help---
A video4linux camera sensor interface driver for i.MX5/6.
+config VIDEO_IMX7_CSI
+ tristate "i.MX7 Camera Sensor Interface driver"
+ depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
+ default y
+ ---help---
+ A video4linux camera sensor interface driver for i.MX7.
+
endmenu
endif
diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index a30b3033f9a3..074f016d3519 100644
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -12,3 +12,5 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-ic.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
+
+obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
new file mode 100644
index 000000000000..ec5a20880bb6
--- /dev/null
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -0,0 +1,1352 @@
+// SPDX-License-Identifier: GPL
+/*
+ * V4L2 Capture CSI Subdev for Freescale i.MX7 SOC
+ *
+ * Copyright (c) 2018 Linaro Ltd
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/gcd.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/types.h>
+
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-fwnode.h>
+#include <media/v4l2-mc.h>
+#include <media/v4l2-subdev.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include <media/imx.h>
+#include "imx-media.h"
+
+#define IMX7_CSI_PAD_SINK 0
+#define IMX7_CSI_PAD_SRC 1
+#define IMX7_CSI_PADS_NUM 2
+
+/* reset values */
+#define CSICR1_RESET_VAL 0x40000800
+#define CSICR2_RESET_VAL 0x0
+#define CSICR3_RESET_VAL 0x0
+
+/* csi control reg 1 */
+#define BIT_SWAP16_EN BIT(31)
+#define BIT_EXT_VSYNC BIT(30)
+#define BIT_EOF_INT_EN BIT(29)
+#define BIT_PRP_IF_EN BIT(28)
+#define BIT_CCIR_MODE BIT(27)
+#define BIT_COF_INT_EN BIT(26)
+#define BIT_SF_OR_INTEN BIT(25)
+#define BIT_RF_OR_INTEN BIT(24)
+#define BIT_SFF_DMA_DONE_INTEN BIT(22)
+#define BIT_STATFF_INTEN BIT(21)
+#define BIT_FB2_DMA_DONE_INTEN BIT(20)
+#define BIT_FB1_DMA_DONE_INTEN BIT(19)
+#define BIT_RXFF_INTEN BIT(18)
+#define BIT_SOF_POL BIT(17)
+#define BIT_SOF_INTEN BIT(16)
+#define BIT_MCLKDIV (0xF << 12)
+#define BIT_HSYNC_POL BIT(11)
+#define BIT_CCIR_EN BIT(10)
+#define BIT_MCLKEN BIT(9)
+#define BIT_FCC BIT(8)
+#define BIT_PACK_DIR BIT(7)
+#define BIT_CLR_STATFIFO BIT(6)
+#define BIT_CLR_RXFIFO BIT(5)
+#define BIT_GCLK_MODE BIT(4)
+#define BIT_INV_DATA BIT(3)
+#define BIT_INV_PCLK BIT(2)
+#define BIT_REDGE BIT(1)
+#define BIT_PIXEL_BIT BIT(0)
+
+#define SHIFT_MCLKDIV 12
+
+/* control reg 3 */
+#define BIT_FRMCNT (0xFFFF << 16)
+#define BIT_FRMCNT_RST BIT(15)
+#define BIT_DMA_REFLASH_RFF BIT(14)
+#define BIT_DMA_REFLASH_SFF BIT(13)
+#define BIT_DMA_REQ_EN_RFF BIT(12)
+#define BIT_DMA_REQ_EN_SFF BIT(11)
+#define BIT_STATFF_LEVEL (0x7 << 8)
+#define BIT_HRESP_ERR_EN BIT(7)
+#define BIT_RXFF_LEVEL (0x7 << 4)
+#define BIT_TWO_8BIT_SENSOR BIT(3)
+#define BIT_ZERO_PACK_EN BIT(2)
+#define BIT_ECC_INT_EN BIT(1)
+#define BIT_ECC_AUTO_EN BIT(0)
+
+#define SHIFT_FRMCNT 16
+#define SHIFT_RXFIFO_LEVEL 4
+
+/* csi status reg */
+#define BIT_ADDR_CH_ERR_INT BIT(28)
+#define BIT_FIELD0_INT BIT(27)
+#define BIT_FIELD1_INT BIT(26)
+#define BIT_SFF_OR_INT BIT(25)
+#define BIT_RFF_OR_INT BIT(24)
+#define BIT_DMA_TSF_DONE_SFF BIT(22)
+#define BIT_STATFF_INT BIT(21)
+#define BIT_DMA_TSF_DONE_FB2 BIT(20)
+#define BIT_DMA_TSF_DONE_FB1 BIT(19)
+#define BIT_RXFF_INT BIT(18)
+#define BIT_EOF_INT BIT(17)
+#define BIT_SOF_INT BIT(16)
+#define BIT_F2_INT BIT(15)
+#define BIT_F1_INT BIT(14)
+#define BIT_COF_INT BIT(13)
+#define BIT_HRESP_ERR_INT BIT(7)
+#define BIT_ECC_INT BIT(1)
+#define BIT_DRDY BIT(0)
+
+/* csi control reg 18 */
+#define BIT_CSI_HW_ENABLE BIT(31)
+#define BIT_MIPI_DATA_FORMAT_RAW8 (0x2a << 25)
+#define BIT_MIPI_DATA_FORMAT_RAW10 (0x2b << 25)
+#define BIT_MIPI_DATA_FORMAT_RAW12 (0x2c << 25)
+#define BIT_MIPI_DATA_FORMAT_RAW14 (0x2d << 25)
+#define BIT_MIPI_DATA_FORMAT_YUV422_8B (0x1e << 25)
+#define BIT_MIPI_DATA_FORMAT_MASK (0x3F << 25)
+#define BIT_MIPI_DATA_FORMAT_OFFSET 25
+#define BIT_DATA_FROM_MIPI BIT(22)
+#define BIT_MIPI_YU_SWAP BIT(21)
+#define BIT_MIPI_DOUBLE_CMPNT BIT(20)
+#define BIT_BASEADDR_CHG_ERR_EN BIT(9)
+#define BIT_BASEADDR_SWITCH_SEL BIT(5)
+#define BIT_BASEADDR_SWITCH_EN BIT(4)
+#define BIT_PARALLEL24_EN BIT(3)
+#define BIT_DEINTERLACE_EN BIT(2)
+#define BIT_TVDECODER_IN_EN BIT(1)
+#define BIT_NTSC_EN BIT(0)
+
+#define CSI_MCLK_VF 1
+#define CSI_MCLK_ENC 2
+#define CSI_MCLK_RAW 4
+#define CSI_MCLK_I2C 8
+
+#define CSI_CSICR1 0x0
+#define CSI_CSICR2 0x4
+#define CSI_CSICR3 0x8
+#define CSI_STATFIFO 0xC
+#define CSI_CSIRXFIFO 0x10
+#define CSI_CSIRXCNT 0x14
+#define CSI_CSISR 0x18
+
+#define CSI_CSIDBG 0x1C
+#define CSI_CSIDMASA_STATFIFO 0x20
+#define CSI_CSIDMATS_STATFIFO 0x24
+#define CSI_CSIDMASA_FB1 0x28
+#define CSI_CSIDMASA_FB2 0x2C
+#define CSI_CSIFBUF_PARA 0x30
+#define CSI_CSIIMAG_PARA 0x34
+
+#define CSI_CSICR18 0x48
+#define CSI_CSICR19 0x4c
+
+struct imx7_csi {
+ struct device *dev;
+ struct imx_media_dev *md;
+ struct v4l2_subdev sd;
+ struct imx_media_video_dev *vdev;
+ struct imx_media_dev *imxmd;
+ struct media_pad pad[IMX7_CSI_PADS_NUM];
+
+ struct mutex lock;
+ spinlock_t irqlock;
+
+ struct v4l2_subdev *src_sd;
+
+ struct media_entity *sink;
+
+ struct v4l2_fwnode_endpoint upstream_ep;
+
+ struct v4l2_mbus_framefmt format_mbus[IMX7_CSI_PADS_NUM];
+ const struct imx_media_pixfmt *cc[IMX7_CSI_PADS_NUM];
+ struct v4l2_fract frame_interval[IMX7_CSI_PADS_NUM];
+
+ struct v4l2_ctrl_handler ctrl_hdlr;
+
+ void __iomem *regbase;
+ int irq;
+
+ struct clk *clk_disp_axi;
+ struct clk *clk_disp_dcic;
+ struct clk *clk_csi_mclk;
+
+ /* active vb2 buffers to send to video dev sink */
+ struct imx_media_buffer *active_vb2_buf[2];
+ struct imx_media_dma_buf underrun_buf;
+
+ int buf_num;
+ u32 frame_sequence;
+
+ bool last_eof;
+ bool is_init;
+ bool is_streaming;
+ bool is_csi2;
+
+ struct completion last_eof_completion;
+};
+
+#define imx7_csi_reg_read(_csi, _offset) __raw_readl(_csi->regbase + _offset)
+#define imx7_csi_reg_write(_csi, _val, _offset) \
+ __raw_writel(_val, _csi->regbase + _offset)
+
+static void imx7_csi_clk_enable(struct imx7_csi *csi)
+{
+ clk_prepare_enable(csi->clk_disp_axi);
+ clk_prepare_enable(csi->clk_disp_dcic);
+ clk_prepare_enable(csi->clk_csi_mclk);
+}
+
+static void imx7_csi_clk_disable(struct imx7_csi *csi)
+{
+ clk_disable_unprepare(csi->clk_csi_mclk);
+ clk_disable_unprepare(csi->clk_disp_dcic);
+ clk_disable_unprepare(csi->clk_disp_axi);
+}
+
+static void imx7_csi_hw_reset(struct imx7_csi *csi)
+{
+ imx7_csi_reg_write(csi,
+ imx7_csi_reg_read(csi, CSI_CSICR3) | BIT_FRMCNT_RST,
+ CSI_CSICR3);
+
+ imx7_csi_reg_write(csi, CSICR1_RESET_VAL, CSI_CSICR1);
+ imx7_csi_reg_write(csi, CSICR2_RESET_VAL, CSI_CSICR2);
+ imx7_csi_reg_write(csi, CSICR3_RESET_VAL, CSI_CSICR3);
+}
+
+static unsigned long imx7_csi_irq_clear(struct imx7_csi *csi)
+{
+ unsigned long isr;
+
+ isr = imx7_csi_reg_read(csi, CSI_CSISR);
+ imx7_csi_reg_write(csi, isr, CSI_CSISR);
+
+ return isr;
+}
+
+static void imx7_csi_init_interface(struct imx7_csi *csi)
+{
+ unsigned int val = 0;
+ unsigned int imag_para;
+
+ val = BIT_SOF_POL | BIT_REDGE | BIT_GCLK_MODE | BIT_HSYNC_POL |
+ BIT_FCC | 1 << SHIFT_MCLKDIV | BIT_MCLKEN;
+ imx7_csi_reg_write(csi, val, CSI_CSICR1);
+
+ imag_para = (800 << 16) | 600;
+ imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
+
+ val = BIT_DMA_REFLASH_RFF;
+ imx7_csi_reg_write(csi, val, CSI_CSICR3);
+}
+
+static void imx7_csi_hw_enable_irq(struct imx7_csi *csi)
+{
+ unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+
+ cr1 |= BIT_SOF_INTEN;
+ cr1 |= BIT_RFF_OR_INT;
+
+ /* still capture needs DMA interrupt */
+ cr1 |= BIT_FB1_DMA_DONE_INTEN;
+ cr1 |= BIT_FB2_DMA_DONE_INTEN;
+
+ cr1 |= BIT_EOF_INT_EN;
+
+ imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
+}
+
+static void imx7_csi_hw_disable_irq(struct imx7_csi *csi)
+{
+ unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+
+ cr1 &= ~BIT_SOF_INTEN;
+ cr1 &= ~BIT_RFF_OR_INT;
+ cr1 &= ~BIT_FB1_DMA_DONE_INTEN;
+ cr1 &= ~BIT_FB2_DMA_DONE_INTEN;
+ cr1 &= ~BIT_EOF_INT_EN;
+
+ imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
+}
+
+static void imx7_csi_hw_enable(struct imx7_csi *csi)
+{
+ unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
+
+ cr |= BIT_CSI_HW_ENABLE;
+
+ imx7_csi_reg_write(csi, cr, CSI_CSICR18);
+}
+
+static void imx7_csi_hw_disable(struct imx7_csi *csi)
+{
+ unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
+
+ cr &= ~BIT_CSI_HW_ENABLE;
+
+ imx7_csi_reg_write(csi, cr, CSI_CSICR18);
+}
+
+static void imx7_csi_dma_reflash(struct imx7_csi *csi)
+{
+ unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR18);
+
+ cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
+ cr3 |= BIT_DMA_REFLASH_RFF;
+ imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
+}
+
+static void imx7_csi_rx_fifo_clear(struct imx7_csi *csi)
+{
+ unsigned long cr1;
+
+ cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+ imx7_csi_reg_write(csi, cr1 & ~BIT_FCC, CSI_CSICR1);
+ cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+ imx7_csi_reg_write(csi, cr1 | BIT_CLR_RXFIFO, CSI_CSICR1);
+
+ cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+ imx7_csi_reg_write(csi, cr1 | BIT_FCC, CSI_CSICR1);
+}
+
+static void imx7_csi_buf_stride_set(struct imx7_csi *csi, u32 stride)
+{
+ imx7_csi_reg_write(csi, stride, CSI_CSIFBUF_PARA);
+}
+
+static void imx7_csi_deinterlace_enable(struct imx7_csi *csi, bool enable)
+{
+ unsigned long cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
+
+ if (enable)
+ cr18 |= BIT_DEINTERLACE_EN;
+ else
+ cr18 &= ~BIT_DEINTERLACE_EN;
+
+ imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
+}
+
+static void imx7_csi_dmareq_rff_enable(struct imx7_csi *csi)
+{
+ unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
+ unsigned long cr2 = imx7_csi_reg_read(csi, CSI_CSICR2);
+
+ /* Burst Type of DMA Transfer from RxFIFO. INCR16 */
+ cr2 |= 0xC0000000;
+
+ cr3 |= BIT_DMA_REQ_EN_RFF;
+ cr3 |= BIT_HRESP_ERR_EN;
+ cr3 &= ~BIT_RXFF_LEVEL;
+ cr3 |= 0x2 << 4;
+
+ imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
+ imx7_csi_reg_write(csi, cr2, CSI_CSICR2);
+}
+
+static void imx7_csi_dmareq_rff_disable(struct imx7_csi *csi)
+{
+ unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
+
+ cr3 &= ~BIT_DMA_REQ_EN_RFF;
+ cr3 &= ~BIT_HRESP_ERR_EN;
+ imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
+}
+
+static void imx7_csi_set_imagpara(struct imx7_csi *csi, int width, int height)
+{
+ int imag_para;
+ int rx_count;
+
+ rx_count = (width * height) >> 2;
+ imx7_csi_reg_write(csi, rx_count, CSI_CSIRXCNT);
+
+ imag_para = (width << 16) | height;
+ imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
+
+ /* reflash the embedded DMA controller */
+ imx7_csi_dma_reflash(csi);
+}
+
+static void imx7_csi_sw_reset(struct imx7_csi *csi)
+{
+ imx7_csi_hw_disable(csi);
+
+ imx7_csi_rx_fifo_clear(csi);
+
+ imx7_csi_dma_reflash(csi);
+
+ usleep_range(2000, 3000);
+
+ imx7_csi_irq_clear(csi);
+
+ imx7_csi_hw_enable(csi);
+}
+
+static void imx7_csi_error_recovery(struct imx7_csi *csi)
+{
+ imx7_csi_hw_disable(csi);
+
+ imx7_csi_rx_fifo_clear(csi);
+
+ imx7_csi_dma_reflash(csi);
+
+ imx7_csi_hw_enable(csi);
+}
+
+static void imx7_csi_init(struct imx7_csi *csi)
+{
+ if (csi->is_init)
+ return;
+
+ imx7_csi_clk_enable(csi);
+ imx7_csi_hw_reset(csi);
+ imx7_csi_init_interface(csi);
+ imx7_csi_dmareq_rff_enable(csi);
+
+ csi->is_init = true;
+}
+
+static void imx7_csi_deinit(struct imx7_csi *csi)
+{
+ if (!csi->is_init)
+ return;
+
+ imx7_csi_hw_reset(csi);
+ imx7_csi_init_interface(csi);
+ imx7_csi_dmareq_rff_disable(csi);
+ imx7_csi_clk_disable(csi);
+
+ csi->is_init = false;
+}
+
+static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi,
+ struct v4l2_fwnode_endpoint *ep,
+ bool skip_mux)
+{
+ struct device_node *endpoint, *port;
+ struct media_entity *src;
+ struct v4l2_subdev *sd;
+ struct media_pad *pad;
+
+ if (!csi->src_sd)
+ return -EPIPE;
+
+ src = &csi->src_sd->entity;
+
+skip_video_mux:
+ /* get source pad of entity directly upstream from src */
+ pad = imx_media_find_upstream_pad(csi->md, src, 0);
+ if (IS_ERR(pad))
+ return PTR_ERR(pad);
+
+ sd = media_entity_to_v4l2_subdev(pad->entity);
+
+ /* To get bus type we may need to skip video mux */
+ if (skip_mux && src->function == MEDIA_ENT_F_VID_MUX) {
+ src = &sd->entity;
+ goto skip_video_mux;
+ }
+
+ /*
+ * NOTE: this assumes an OF-graph port id is the same as a
+ * media pad index.
+ */
+ port = of_graph_get_port_by_id(sd->dev->of_node, pad->index);
+ if (!port)
+ return -ENODEV;
+
+ endpoint = of_get_next_child(port, NULL);
+ of_node_put(port);
+ if (!endpoint)
+ return -ENODEV;
+
+ v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep);
+ of_node_put(endpoint);
+
+ return 0;
+}
+
+static int imx7_csi_link_setup(struct media_entity *entity,
+ const struct media_pad *local,
+ const struct media_pad *remote, u32 flags)
+{
+ struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ struct v4l2_subdev *remote_sd;
+ int ret = 0;
+
+ dev_dbg(csi->dev, "link setup %s -> %s\n", remote->entity->name,
+ local->entity->name);
+
+ mutex_lock(&csi->lock);
+
+ if (local->flags & MEDIA_PAD_FL_SINK) {
+ if (!is_media_entity_v4l2_subdev(remote->entity)) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ remote_sd = media_entity_to_v4l2_subdev(remote->entity);
+
+ if (flags & MEDIA_LNK_FL_ENABLED) {
+ if (csi->src_sd) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+ csi->src_sd = remote_sd;
+ } else {
+ csi->src_sd = NULL;
+ }
+
+ goto init;
+ }
+
+ /* source pad */
+ if (flags & MEDIA_LNK_FL_ENABLED) {
+ if (csi->sink) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+ csi->sink = remote->entity;
+ } else {
+ v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
+ v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
+ csi->sink = NULL;
+ }
+
+init:
+ if (csi->sink || csi->src_sd)
+ imx7_csi_init(csi);
+ else
+ imx7_csi_deinit(csi);
+
+unlock:
+ mutex_unlock(&csi->lock);
+
+ return ret;
+}
+
+static int imx7_csi_pad_link_validate(struct v4l2_subdev *sd,
+ struct media_link *link,
+ struct v4l2_subdev_format *source_fmt,
+ struct v4l2_subdev_format *sink_fmt)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ struct v4l2_fwnode_endpoint upstream_ep;
+ int ret;
+
+ ret = v4l2_subdev_link_validate_default(sd, link, source_fmt, sink_fmt);
+ if (ret)
+ return ret;
+
+ ret = imx7_csi_get_upstream_endpoint(csi, &upstream_ep, true);
+ if (ret) {
+ v4l2_err(&csi->sd, "failed to find upstream endpoint\n");
+ return ret;
+ }
+
+ mutex_lock(&csi->lock);
+
+ csi->upstream_ep = upstream_ep;
+ csi->is_csi2 = (upstream_ep.bus_type == V4L2_MBUS_CSI2_DPHY);
+
+ mutex_unlock(&csi->lock);
+
+ return 0;
+}
+
+static void imx7_csi_update_buf(struct imx7_csi *csi, dma_addr_t phys,
+ int buf_num)
+{
+ if (buf_num == 1)
+ imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB2);
+ else
+ imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB1);
+}
+
+static void imx7_csi_setup_vb2_buf(struct imx7_csi *csi)
+{
+ struct imx_media_video_dev *vdev = csi->vdev;
+ struct imx_media_buffer *buf;
+ struct vb2_buffer *vb2_buf;
+ dma_addr_t phys[2];
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ buf = imx_media_capture_device_next_buf(vdev);
+ if (buf) {
+ csi->active_vb2_buf[i] = buf;
+ vb2_buf = &buf->vbuf.vb2_buf;
+ phys[i] = vb2_dma_contig_plane_dma_addr(vb2_buf, 0);
+ } else {
+ csi->active_vb2_buf[i] = NULL;
+ phys[i] = csi->underrun_buf.phys;
+ }
+
+ imx7_csi_update_buf(csi, phys[i], i);
+ }
+}
+
+static void imx7_csi_dma_unsetup_vb2_buf(struct imx7_csi *csi,
+ enum vb2_buffer_state return_status)
+{
+ struct imx_media_buffer *buf;
+ int i;
+
+ /* return any remaining active frames with return_status */
+ for (i = 0; i < 2; i++) {
+ buf = csi->active_vb2_buf[i];
+ if (buf) {
+ struct vb2_buffer *vb = &buf->vbuf.vb2_buf;
+
+ vb->timestamp = ktime_get_ns();
+ vb2_buffer_done(vb, return_status);
+ }
+ }
+}
+
+static void imx7_csi_vb2_buf_done(struct imx7_csi *csi)
+{
+ struct imx_media_video_dev *vdev = csi->vdev;
+ struct imx_media_buffer *done, *next;
+ struct vb2_buffer *vb;
+ dma_addr_t phys;
+
+ done = csi->active_vb2_buf[csi->buf_num];
+ if (done) {
+ done->vbuf.field = vdev->fmt.fmt.pix.field;
+ done->vbuf.sequence = csi->frame_sequence;
+ vb = &done->vbuf.vb2_buf;
+ vb->timestamp = ktime_get_ns();
+ vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+ }
+ csi->frame_sequence++;
+
+ /* get next queued buffer */
+ next = imx_media_capture_device_next_buf(vdev);
+ if (next) {
+ phys = vb2_dma_contig_plane_dma_addr(&next->vbuf.vb2_buf, 0);
+ csi->active_vb2_buf[csi->buf_num] = next;
+ } else {
+ phys = csi->underrun_buf.phys;
+ csi->active_vb2_buf[csi->buf_num] = NULL;
+ }
+
+ imx7_csi_update_buf(csi, phys, csi->buf_num);
+}
+
+static irqreturn_t imx7_csi_irq_handler(int irq, void *data)
+{
+ struct imx7_csi *csi = data;
+ unsigned long status;
+
+ spin_lock(&csi->irqlock);
+
+ status = imx7_csi_irq_clear(csi);
+
+ if (status & BIT_RFF_OR_INT) {
+ dev_warn(csi->dev, "Rx fifo overflow\n");
+ imx7_csi_error_recovery(csi);
+ }
+
+ if (status & BIT_HRESP_ERR_INT) {
+ dev_warn(csi->dev, "Hresponse error detected\n");
+ imx7_csi_error_recovery(csi);
+ }
+
+ if (status & BIT_ADDR_CH_ERR_INT) {
+ imx7_csi_hw_disable(csi);
+
+ imx7_csi_dma_reflash(csi);
+
+ imx7_csi_hw_enable(csi);
+ }
+
+ if ((status & BIT_DMA_TSF_DONE_FB1) &&
+ (status & BIT_DMA_TSF_DONE_FB2)) {
+ /*
+ * For both FB1 and FB2 interrupter bits set case,
+ * CSI DMA is work in one of FB1 and FB2 buffer,
+ * but software can not know the state.
+ * Skip it to avoid base address updated
+ * when csi work in field0 and field1 will write to
+ * new base address.
+ */
+ } else if (status & BIT_DMA_TSF_DONE_FB1) {
+ csi->buf_num = 0;
+ } else if (status & BIT_DMA_TSF_DONE_FB2) {
+ csi->buf_num = 1;
+ }
+
+ if ((status & BIT_DMA_TSF_DONE_FB1) ||
+ (status & BIT_DMA_TSF_DONE_FB2)) {
+ imx7_csi_vb2_buf_done(csi);
+
+ if (csi->last_eof) {
+ complete(&csi->last_eof_completion);
+ csi->last_eof = false;
+ }
+ }
+
+
+ spin_unlock(&csi->irqlock);
+
+ return IRQ_HANDLED;
+}
+
+static int imx7_csi_dma_start(struct imx7_csi *csi)
+{
+ struct imx_media_video_dev *vdev = csi->vdev;
+ struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
+ int ret;
+
+ ret = imx_media_alloc_dma_buf(csi->md, &csi->underrun_buf,
+ out_pix->sizeimage);
+ if (ret < 0) {
+ v4l2_warn(&csi->sd, "consider increasing the CMA area\n");
+ return ret;
+ }
+
+ csi->frame_sequence = 0;
+ csi->last_eof = false;
+ init_completion(&csi->last_eof_completion);
+
+ imx7_csi_setup_vb2_buf(csi);
+
+ return 0;
+}
+
+static void imx7_csi_dma_stop(struct imx7_csi *csi)
+{
+ unsigned long flags;
+ int ret;
+
+ /* mark next EOF interrupt as the last before stream off */
+ spin_lock_irqsave(&csi->irqlock, flags);
+ csi->last_eof = true;
+ spin_unlock_irqrestore(&csi->irqlock, flags);
+
+ /*
+ * and then wait for interrupt handler to mark completion.
+ */
+ ret = wait_for_completion_timeout(&csi->last_eof_completion,
+ msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
+ if (ret == 0)
+ v4l2_warn(&csi->sd, "wait last EOF timeout\n");
+
+ imx7_csi_hw_disable_irq(csi);
+
+ imx7_csi_dma_unsetup_vb2_buf(csi, VB2_BUF_STATE_ERROR);
+
+ imx_media_free_dma_buf(csi->md, &csi->underrun_buf);
+}
+
+static int imx7_csi_configure(struct imx7_csi *csi)
+{
+ struct imx_media_video_dev *vdev = csi->vdev;
+ struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
+ __u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;
+ u32 cr1, cr18;
+
+ if (out_pix->field == V4L2_FIELD_INTERLACED) {
+ imx7_csi_deinterlace_enable(csi, true);
+ imx7_csi_buf_stride_set(csi, out_pix->width);
+ } else {
+ imx7_csi_deinterlace_enable(csi, false);
+ imx7_csi_buf_stride_set(csi, 0);
+ }
+
+ imx7_csi_set_imagpara(csi, out_pix->width, out_pix->height);
+
+ if (!csi->is_csi2)
+ return 0;
+
+ cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
+ cr1 &= ~BIT_GCLK_MODE;
+
+ cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
+ cr18 &= BIT_MIPI_DATA_FORMAT_MASK;
+ cr18 |= BIT_DATA_FROM_MIPI;
+
+ switch (out_pix->pixelformat) {
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YUYV:
+ cr18 |= BIT_MIPI_DATA_FORMAT_YUV422_8B;
+ break;
+ case V4L2_PIX_FMT_SBGGR8:
+ cr18 |= BIT_MIPI_DATA_FORMAT_RAW8;
+ break;
+ case V4L2_PIX_FMT_SBGGR16:
+ if (in_code == MEDIA_BUS_FMT_SBGGR10_1X10)
+ cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;
+ else if (in_code == MEDIA_BUS_FMT_SBGGR12_1X12)
+ cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;
+ else if (in_code == MEDIA_BUS_FMT_SBGGR14_1X14)
+ cr18 |= BIT_MIPI_DATA_FORMAT_RAW14;
+ cr1 |= BIT_PIXEL_BIT;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
+ imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
+
+ return 0;
+}
+
+static int imx7_csi_enable(struct imx7_csi *csi)
+{
+ imx7_csi_sw_reset(csi);
+
+ if (csi->is_csi2) {
+ imx7_csi_dmareq_rff_enable(csi);
+ imx7_csi_hw_enable_irq(csi);
+ imx7_csi_hw_enable(csi);
+ return 0;
+ }
+
+ return 0;
+}
+
+static void imx7_csi_disable(struct imx7_csi *csi)
+{
+ imx7_csi_dmareq_rff_disable(csi);
+
+ imx7_csi_hw_disable_irq(csi);
+
+ imx7_csi_buf_stride_set(csi, 0);
+
+ imx7_csi_hw_disable(csi);
+}
+
+static int imx7_csi_streaming_start(struct imx7_csi *csi)
+{
+ int ret;
+
+ ret = imx7_csi_dma_start(csi);
+ if (ret < 0)
+ return ret;
+
+ ret = imx7_csi_configure(csi);
+ if (ret < 0)
+ goto dma_stop;
+
+ imx7_csi_enable(csi);
+
+ return 0;
+
+dma_stop:
+ imx7_csi_dma_stop(csi);
+
+ return ret;
+}
+
+static int imx7_csi_streaming_stop(struct imx7_csi *csi)
+{
+ imx7_csi_dma_stop(csi);
+
+ imx7_csi_disable(csi);
+
+ return 0;
+}
+
+static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ int ret = 0;
+
+ mutex_lock(&csi->lock);
+
+ if (!csi->src_sd || !csi->sink) {
+ ret = -EPIPE;
+ goto out_unlock;
+ }
+
+ if (csi->is_streaming == !!enable)
+ goto out_unlock;
+
+ if (enable) {
+ ret = v4l2_subdev_call(csi->src_sd, video, s_stream, 1);
+ if (ret < 0)
+ goto out_unlock;
+
+ ret = imx7_csi_streaming_start(csi);
+ if (ret < 0) {
+ v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
+ goto out_unlock;
+ }
+ } else {
+ imx7_csi_streaming_stop(csi);
+
+ v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
+ }
+
+ csi->is_streaming = !!enable;
+
+out_unlock:
+ mutex_unlock(&csi->lock);
+
+ return ret;
+}
+
+static struct v4l2_mbus_framefmt *imx7_csi_get_format(struct imx7_csi *csi,
+ struct v4l2_subdev_pad_config *cfg,
+ unsigned int pad,
+ enum v4l2_subdev_format_whence which)
+{
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
+ return v4l2_subdev_get_try_format(&csi->sd, cfg, pad);
+
+ return &csi->format_mbus[pad];
+}
+
+static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_mbus_code_enum *code)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ const struct imx_media_pixfmt *in_cc;
+ struct v4l2_mbus_framefmt *in_fmt;
+ int ret = 0;
+
+ mutex_lock(&csi->lock);
+
+ in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK, code->which);
+
+ in_cc = imx_media_find_mbus_format(in_fmt->code, CS_SEL_ANY, true);
+
+ switch (code->pad) {
+ case IMX7_CSI_PAD_SINK:
+ ret = imx_media_enum_mbus_format(&code->code, code->index,
+ CS_SEL_ANY, true);
+ break;
+ case IMX7_CSI_PAD_SRC:
+ if (code->index != 0) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ code->code = in_fmt->code;
+ break;
+ default:
+ ret = -EINVAL;
+ }
+
+out_unlock:
+ mutex_unlock(&csi->lock);
+
+ return ret;
+}
+
+static int imx7_csi_get_fmt(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *sdformat)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ struct v4l2_mbus_framefmt *fmt;
+ int ret = 0;
+
+ if (sdformat->pad >= IMX7_CSI_PADS_NUM)
+ return -EINVAL;
+
+ mutex_lock(&csi->lock);
+
+ fmt = imx7_csi_get_format(csi, cfg, sdformat->pad, sdformat->which);
+ if (!fmt) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ sdformat->format = *fmt;
+
+out_unlock:
+ mutex_unlock(&csi->lock);
+
+ return ret;
+}
+
+static void imx7_csi_try_fmt(struct imx7_csi *csi,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *sdformat,
+ const struct imx_media_pixfmt **cc)
+{
+ const struct imx_media_pixfmt *in_cc;
+ struct v4l2_mbus_framefmt *in_fmt;
+ u32 code;
+
+ in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK,
+ sdformat->which);
+ if (!in_fmt)
+ return;
+
+ switch (sdformat->pad) {
+ case IMX7_CSI_PAD_SRC:
+ in_cc = imx_media_find_mbus_format(in_fmt->code, CS_SEL_ANY,
+ true);
+
+ sdformat->format.width = in_fmt->width;
+ sdformat->format.height = in_fmt->height;
+ sdformat->format.code = in_fmt->code;
+ *cc = in_cc;
+
+ sdformat->format.colorspace = in_fmt->colorspace;
+ sdformat->format.xfer_func = in_fmt->xfer_func;
+ sdformat->format.quantization = in_fmt->quantization;
+ sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
+ break;
+ case IMX7_CSI_PAD_SINK:
+ *cc = imx_media_find_mbus_format(sdformat->format.code,
+ CS_SEL_ANY, true);
+ if (!*cc) {
+ imx_media_enum_mbus_format(&code, 0, CS_SEL_ANY, false);
+ *cc = imx_media_find_mbus_format(code, CS_SEL_ANY,
+ false);
+ sdformat->format.code = (*cc)->codes[0];
+ }
+
+ imx_media_fill_default_mbus_fields(&sdformat->format, in_fmt,
+ false);
+ break;
+ default:
+ break;
+ }
+}
+
+static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *sdformat)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ struct imx_media_video_dev *vdev = csi->vdev;
+ const struct imx_media_pixfmt *outcc;
+ struct v4l2_mbus_framefmt *outfmt;
+ struct v4l2_pix_format vdev_fmt;
+ const struct imx_media_pixfmt *cc;
+ struct v4l2_mbus_framefmt *fmt;
+ struct v4l2_subdev_format format;
+ int ret = 0;
+
+ if (sdformat->pad >= IMX7_CSI_PADS_NUM)
+ return -EINVAL;
+
+ mutex_lock(&csi->lock);
+
+ if (csi->is_streaming) {
+ ret = -EBUSY;
+ goto out_unlock;
+ }
+
+ imx7_csi_try_fmt(csi, cfg, sdformat, &cc);
+
+ fmt = imx7_csi_get_format(csi, cfg, sdformat->pad, sdformat->which);
+ if (!fmt) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ *fmt = sdformat->format;
+
+ if (sdformat->pad == IMX7_CSI_PAD_SINK) {
+ /* propagate format to source pads */
+ format.pad = IMX7_CSI_PAD_SRC;
+ format.which = sdformat->which;
+ format.format = sdformat->format;
+ imx7_csi_try_fmt(csi, cfg, &format, &outcc);
+
+ outfmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SRC,
+ sdformat->which);
+ *outfmt = format.format;
+
+ if (sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
+ csi->cc[IMX7_CSI_PAD_SRC] = outcc;
+ }
+
+ if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY)
+ goto out_unlock;
+
+ csi->cc[sdformat->pad] = cc;
+
+ /* propagate output pad format to capture device */
+ imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
+ &csi->format_mbus[IMX7_CSI_PAD_SRC],
+ csi->cc[IMX7_CSI_PAD_SRC]);
+ mutex_unlock(&csi->lock);
+ imx_media_capture_device_set_format(vdev, &vdev_fmt);
+
+ return 0;
+
+out_unlock:
+ mutex_unlock(&csi->lock);
+
+ return ret;
+}
+
+static int imx7_csi_registered(struct v4l2_subdev *sd)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ int ret;
+ int i;
+
+ csi->md = dev_get_drvdata(sd->v4l2_dev->dev);
+
+ for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
+ csi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?
+ MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
+
+ /* set a default mbus format */
+ ret = imx_media_init_mbus_fmt(&csi->format_mbus[i],
+ 800, 600, 0, V4L2_FIELD_NONE,
+ &csi->cc[i]);
+ if (ret < 0)
+ return ret;
+
+ /* init default frame interval */
+ csi->frame_interval[i].numerator = 1;
+ csi->frame_interval[i].denominator = 30;
+ }
+
+ ret = media_entity_pads_init(&sd->entity, IMX7_CSI_PADS_NUM, csi->pad);
+ if (ret < 0)
+ return ret;
+
+ ret = imx_media_capture_device_register(csi->vdev);
+ if (ret < 0)
+ return ret;
+
+ ret = imx_media_add_video_device(csi->md, csi->vdev);
+ if (ret < 0) {
+ imx_media_capture_device_unregister(csi->vdev);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void imx7_csi_unregistered(struct v4l2_subdev *sd)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+
+ imx_media_capture_device_unregister(csi->vdev);
+}
+
+static int imx7_csi_init_cfg(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg)
+{
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+ struct v4l2_mbus_framefmt *mf;
+ int ret;
+ int i;
+
+ for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
+ mf = v4l2_subdev_get_try_format(sd, cfg, i);
+
+ ret = imx_media_init_mbus_fmt(mf, 800, 600, 0, V4L2_FIELD_NONE,
+ &csi->cc[i]);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+static const struct media_entity_operations imx7_csi_entity_ops = {
+ .link_setup = imx7_csi_link_setup,
+ .link_validate = v4l2_subdev_link_validate,
+};
+
+static const struct v4l2_subdev_video_ops imx7_csi_video_ops = {
+ .s_stream = imx7_csi_s_stream,
+};
+
+static const struct v4l2_subdev_pad_ops imx7_csi_pad_ops = {
+ .init_cfg = imx7_csi_init_cfg,
+ .enum_mbus_code = imx7_csi_enum_mbus_code,
+ .get_fmt = imx7_csi_get_fmt,
+ .set_fmt = imx7_csi_set_fmt,
+ .link_validate = imx7_csi_pad_link_validate,
+};
+
+static const struct v4l2_subdev_ops imx7_csi_subdev_ops = {
+ .video = &imx7_csi_video_ops,
+ .pad = &imx7_csi_pad_ops,
+};
+
+static const struct v4l2_subdev_internal_ops imx7_csi_internal_ops = {
+ .registered = imx7_csi_registered,
+ .unregistered = imx7_csi_unregistered,
+};
+
+static int imx7_csi_parse_endpoint(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd)
+{
+ return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL;
+}
+
+static int imx7_csi_parse_dt(struct imx7_csi *csi)
+{
+ struct device *dev = csi->dev;
+
+ csi->clk_disp_axi = devm_clk_get(dev, "axi");
+ if (IS_ERR(csi->clk_disp_axi)) {
+ dev_err(dev, "Could not get csi axi clock\n");
+ return -ENODEV;
+ }
+
+ csi->clk_disp_dcic = devm_clk_get(dev, "dcic");
+ if (IS_ERR(csi->clk_disp_dcic)) {
+ dev_err(dev, "Could not get disp dcic clock\n");
+ return -ENODEV;
+ }
+
+ csi->clk_csi_mclk = devm_clk_get(dev, "mclk");
+ if (IS_ERR(csi->clk_csi_mclk)) {
+ dev_err(dev, "Could not get csi mclk clock\n");
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static int imx7_csi_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *node = dev->of_node;
+ struct imx7_csi *csi;
+ struct resource *res;
+ int ret;
+
+ csi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL);
+ if (!csi)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, &csi->sd);
+ csi->dev = dev;
+
+ ret = imx7_csi_parse_dt(csi);
+ if (ret < 0)
+ return -ENODEV;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ csi->irq = platform_get_irq(pdev, 0);
+ if (!res || csi->irq < 0) {
+ dev_err(dev, "Missing platform resources data\n");
+ return -ENODEV;
+ }
+
+ csi->regbase = devm_ioremap_resource(dev, res);
+ if (IS_ERR(csi->regbase)) {
+ dev_err(dev, "Failed platform resources map\n");
+ return -ENODEV;
+ }
+
+ spin_lock_init(&csi->irqlock);
+ mutex_init(&csi->lock);
+
+ /* install interrupt handler */
+ ret = devm_request_irq(dev, csi->irq, imx7_csi_irq_handler, 0, "csi",
+ (void *)csi);
+ if (ret < 0) {
+ dev_err(dev, "Request CSI IRQ failed.\n");
+ return -ENODEV;
+ }
+
+ /* add media device */
+ csi->imxmd = imx_media_dev_init(dev);
+ if (IS_ERR(csi->imxmd))
+ return PTR_ERR(csi->imxmd);
+
+ ret = imx_media_of_add_csi(csi->imxmd, node);
+ if (ret < 0)
+ goto media_cleanup;
+
+ ret = imx_media_dev_notifier_register(csi->imxmd);
+ if (ret < 0)
+ goto media_cleanup;
+
+ v4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);
+ v4l2_set_subdevdata(&csi->sd, csi);
+ csi->sd.internal_ops = &imx7_csi_internal_ops;
+ csi->sd.entity.ops = &imx7_csi_entity_ops;
+ csi->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
+ csi->sd.dev = &pdev->dev;
+ csi->sd.owner = THIS_MODULE;
+ csi->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+ csi->sd.grp_id = IMX_MEDIA_GRP_ID_CSI;
+ snprintf(csi->sd.name, sizeof(csi->sd.name), "csi");
+
+ csi->vdev = imx_media_capture_device_init(&csi->sd, IMX7_CSI_PAD_SRC);
+ if (IS_ERR(csi->vdev))
+ return PTR_ERR(csi->vdev);
+
+ v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
+ csi->sd.ctrl_handler = &csi->ctrl_hdlr;
+
+ ret = v4l2_async_register_fwnode_subdev(&csi->sd,
+ sizeof(struct v4l2_async_subdev),
+ NULL, 0, imx7_csi_parse_endpoint);
+ if (ret)
+ goto free;
+
+ return 0;
+
+free:
+ v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
+ mutex_destroy(&csi->lock);
+ imx_media_capture_device_remove(csi->vdev);
+
+media_cleanup:
+ imx_media_dev_cleanup(csi->imxmd);
+
+ return ret;
+}
+
+static int imx7_csi_remove(struct platform_device *pdev)
+{
+ struct v4l2_subdev *sd = platform_get_drvdata(pdev);
+ struct imx7_csi *csi = v4l2_get_subdevdata(sd);
+
+ v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
+ mutex_destroy(&csi->lock);
+ imx_media_capture_device_remove(csi->vdev);
+ imx_media_dev_notifier_unregister(csi->imxmd);
+ imx_media_dev_cleanup(csi->imxmd);
+ media_entity_cleanup(&sd->entity);
+ v4l2_async_unregister_subdev(sd);
+
+ return 0;
+}
+
+static const struct of_device_id imx7_csi_of_match[] = {
+ { .compatible = "fsl,imx7-csi" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, imx7_csi_of_match);
+
+static struct platform_driver imx7_csi_driver = {
+ .probe = imx7_csi_probe,
+ .remove = imx7_csi_remove,
+ .driver = {
+ .of_match_table = imx7_csi_of_match,
+ .name = "imx7-csi",
+ },
+};
+module_platform_driver(imx7_csi_driver);
+
+MODULE_DESCRIPTION("i.MX7 CSI subdev driver");
+MODULE_AUTHOR("Rui Miguel Silva <rui.silva@linaro.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx7-csi");
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (2 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 22:54 ` kbuild test robot
2018-11-21 22:54 ` [PATCH] media: staging/imx7: fix platform_no_drv_owner.cocci warnings kbuild test robot
2018-11-21 11:15 ` [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
` (8 subsequent siblings)
12 siblings, 2 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Adds MIPI CSI-2 subdev for i.MX7 to connect with sensors with a MIPI CSI-2
interface.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/staging/media/imx/Makefile | 1 +
drivers/staging/media/imx/imx7-mipi-csis.c | 1134 ++++++++++++++++++++
2 files changed, 1135 insertions(+)
create mode 100644 drivers/staging/media/imx/imx7-mipi-csis.c
diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 074f016d3519..d2d909a36239 100644
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
+obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-mipi-csis.o
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
new file mode 100644
index 000000000000..39bf0657557e
--- /dev/null
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -0,0 +1,1134 @@
+// SPDX-License-Identifier: GPL
+/*
+ * Freescale i.MX7 SoC series MIPI-CSI V3.3 receiver driver
+ *
+ * Copyright (C) 2018 Linaro Ltd
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/reset.h>
+#include <linux/regulator/consumer.h>
+#include <linux/spinlock.h>
+
+#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
+#include <media/v4l2-subdev.h>
+
+#include "imx-media.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Debug level (0-2)");
+
+#define CSIS_DRIVER_NAME "imx7-mipi-csis"
+#define CSIS_SUBDEV_NAME CSIS_DRIVER_NAME
+
+#define CSIS_PAD_SINK 0
+#define CSIS_PAD_SOURCE 1
+#define CSIS_PADS_NUM 2
+
+#define MIPI_CSIS_DEF_PIX_WIDTH 640
+#define MIPI_CSIS_DEF_PIX_HEIGHT 480
+
+/* Register map definition */
+
+/* CSIS common control */
+#define MIPI_CSIS_CMN_CTRL 0x04
+#define MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW BIT(16)
+#define MIPI_CSIS_CMN_CTRL_INTER_MODE BIT(10)
+#define MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW_CTRL BIT(2)
+#define MIPI_CSIS_CMN_CTRL_RESET BIT(1)
+#define MIPI_CSIS_CMN_CTRL_ENABLE BIT(0)
+
+#define MIPI_CSIS_CMN_CTRL_LANE_NR_OFFSET 8
+#define MIPI_CSIS_CMN_CTRL_LANE_NR_MASK (3 << 8)
+
+/* CSIS clock control */
+#define MIPI_CSIS_CLK_CTRL 0x08
+#define MIPI_CSIS_CLK_CTRL_CLKGATE_TRAIL_CH3(x) (x << 28)
+#define MIPI_CSIS_CLK_CTRL_CLKGATE_TRAIL_CH2(x) (x << 24)
+#define MIPI_CSIS_CLK_CTRL_CLKGATE_TRAIL_CH1(x) (x << 20)
+#define MIPI_CSIS_CLK_CTRL_CLKGATE_TRAIL_CH0(x) (x << 16)
+#define MIPI_CSIS_CLK_CTRL_CLKGATE_EN_MSK (0xf << 4)
+#define MIPI_CSIS_CLK_CTRL_WCLK_SRC BIT(0)
+
+/* CSIS Interrupt mask */
+#define MIPI_CSIS_INTMSK 0x10
+#define MIPI_CSIS_INTMSK_EVEN_BEFORE BIT(31)
+#define MIPI_CSIS_INTMSK_EVEN_AFTER BIT(30)
+#define MIPI_CSIS_INTMSK_ODD_BEFORE BIT(29)
+#define MIPI_CSIS_INTMSK_ODD_AFTER BIT(28)
+#define MIPI_CSIS_INTMSK_FRAME_START BIT(24)
+#define MIPI_CSIS_INTMSK_FRAME_END BIT(20)
+#define MIPI_CSIS_INTMSK_ERR_SOT_HS BIT(16)
+#define MIPI_CSIS_INTMSK_ERR_LOST_FS BIT(12)
+#define MIPI_CSIS_INTMSK_ERR_LOST_FE BIT(8)
+#define MIPI_CSIS_INTMSK_ERR_OVER BIT(4)
+#define MIPI_CSIS_INTMSK_ERR_WRONG_CFG BIT(3)
+#define MIPI_CSIS_INTMSK_ERR_ECC BIT(2)
+#define MIPI_CSIS_INTMSK_ERR_CRC BIT(1)
+#define MIPI_CSIS_INTMSK_ERR_UNKNOWN BIT(0)
+
+/* CSIS Interrupt source */
+#define MIPI_CSIS_INTSRC 0x14
+#define MIPI_CSIS_INTSRC_EVEN_BEFORE BIT(31)
+#define MIPI_CSIS_INTSRC_EVEN_AFTER BIT(30)
+#define MIPI_CSIS_INTSRC_EVEN BIT(30)
+#define MIPI_CSIS_INTSRC_ODD_BEFORE BIT(29)
+#define MIPI_CSIS_INTSRC_ODD_AFTER BIT(28)
+#define MIPI_CSIS_INTSRC_ODD (0x3 << 28)
+#define MIPI_CSIS_INTSRC_NON_IMAGE_DATA (0xf << 28)
+#define MIPI_CSIS_INTSRC_FRAME_START BIT(24)
+#define MIPI_CSIS_INTSRC_FRAME_END BIT(20)
+#define MIPI_CSIS_INTSRC_ERR_SOT_HS BIT(16)
+#define MIPI_CSIS_INTSRC_ERR_LOST_FS BIT(12)
+#define MIPI_CSIS_INTSRC_ERR_LOST_FE BIT(8)
+#define MIPI_CSIS_INTSRC_ERR_OVER BIT(4)
+#define MIPI_CSIS_INTSRC_ERR_WRONG_CFG BIT(3)
+#define MIPI_CSIS_INTSRC_ERR_ECC BIT(2)
+#define MIPI_CSIS_INTSRC_ERR_CRC BIT(1)
+#define MIPI_CSIS_INTSRC_ERR_UNKNOWN BIT(0)
+#define MIPI_CSIS_INTSRC_ERRORS 0xfffff
+
+/* D-PHY status control */
+#define MIPI_CSIS_DPHYSTATUS 0x20
+#define MIPI_CSIS_DPHYSTATUS_ULPS_DAT BIT(8)
+#define MIPI_CSIS_DPHYSTATUS_STOPSTATE_DAT BIT(4)
+#define MIPI_CSIS_DPHYSTATUS_ULPS_CLK BIT(1)
+#define MIPI_CSIS_DPHYSTATUS_STOPSTATE_CLK BIT(0)
+
+/* D-PHY common control */
+#define MIPI_CSIS_DPHYCTRL 0x24
+#define MIPI_CSIS_DPHYCTRL_HSS_MASK (0xff << 24)
+#define MIPI_CSIS_DPHYCTRL_HSS_OFFSET 24
+#define MIPI_CSIS_DPHYCTRL_SCLKS_MASK (0x3 << 22)
+#define MIPI_CSIS_DPHYCTRL_SCLKS_OFFSET 22
+#define MIPI_CSIS_DPHYCTRL_DPDN_SWAP_CLK BIT(6)
+#define MIPI_CSIS_DPHYCTRL_DPDN_SWAP_DAT BIT(5)
+#define MIPI_CSIS_DPHYCTRL_ENABLE_DAT BIT(1)
+#define MIPI_CSIS_DPHYCTRL_ENABLE_CLK BIT(0)
+#define MIPI_CSIS_DPHYCTRL_ENABLE (0x1f << 0)
+
+/* D-PHY Master and Slave Control register Low */
+#define MIPI_CSIS_DPHYBCTRL_L 0x30
+/* D-PHY Master and Slave Control register High */
+#define MIPI_CSIS_DPHYBCTRL_H 0x34
+/* D-PHY Slave Control register Low */
+#define MIPI_CSIS_DPHYSCTRL_L 0x38
+/* D-PHY Slave Control register High */
+#define MIPI_CSIS_DPHYSCTRL_H 0x3c
+
+/* ISP Configuration register */
+#define MIPI_CSIS_ISPCONFIG_CH0 0x40
+#define MIPI_CSIS_ISPCONFIG_CH1 0x50
+#define MIPI_CSIS_ISPCONFIG_CH2 0x60
+#define MIPI_CSIS_ISPCONFIG_CH3 0x70
+
+#define MIPI_CSIS_ISPCFG_MEM_FULL_GAP_MSK (0xff << 24)
+#define MIPI_CSIS_ISPCFG_MEM_FULL_GAP(x) (x << 24)
+#define MIPI_CSIS_ISPCFG_DOUBLE_CMPNT BIT(12)
+#define MIPI_CSIS_ISPCFG_ALIGN_32BIT BIT(11)
+#define MIPI_CSIS_ISPCFG_FMT_YCBCR422_8BIT (0x1e << 2)
+#define MIPI_CSIS_ISPCFG_FMT_RAW8 (0x2a << 2)
+#define MIPI_CSIS_ISPCFG_FMT_RAW10 (0x2b << 2)
+#define MIPI_CSIS_ISPCFG_FMT_RAW12 (0x2c << 2)
+
+/* User defined formats, x = 1...4 */
+#define MIPI_CSIS_ISPCFG_FMT_USER(x) ((0x30 + x - 1) << 2)
+#define MIPI_CSIS_ISPCFG_FMT_MASK (0x3f << 2)
+
+/* ISP Image Resolution register */
+#define MIPI_CSIS_ISPRESOL_CH0 0x44
+#define MIPI_CSIS_ISPRESOL_CH1 0x54
+#define MIPI_CSIS_ISPRESOL_CH2 0x64
+#define MIPI_CSIS_ISPRESOL_CH3 0x74
+#define CSIS_MAX_PIX_WIDTH 0xffff
+#define CSIS_MAX_PIX_HEIGHT 0xffff
+
+/* ISP SYNC register */
+#define MIPI_CSIS_ISPSYNC_CH0 0x48
+#define MIPI_CSIS_ISPSYNC_CH1 0x58
+#define MIPI_CSIS_ISPSYNC_CH2 0x68
+#define MIPI_CSIS_ISPSYNC_CH3 0x78
+
+#define MIPI_CSIS_ISPSYNC_HSYNC_LINTV_OFFSET 18
+#define MIPI_CSIS_ISPSYNC_VSYNC_SINTV_OFFSET 12
+#define MIPI_CSIS_ISPSYNC_VSYNC_EINTV_OFFSET 0
+
+/* Non-image packet data buffers */
+#define MIPI_CSIS_PKTDATA_ODD 0x2000
+#define MIPI_CSIS_PKTDATA_EVEN 0x3000
+#define MIPI_CSIS_PKTDATA_SIZE SZ_4K
+
+#define DEFAULT_SCLK_CSIS_FREQ 166000000UL
+
+enum {
+ ST_POWERED = 1,
+ ST_STREAMING = 2,
+ ST_SUSPENDED = 4,
+};
+
+struct mipi_csis_event {
+ u32 mask;
+ const char * const name;
+ unsigned int counter;
+};
+
+static const struct mipi_csis_event mipi_csis_events[] = {
+ /* Errors */
+ { MIPI_CSIS_INTSRC_ERR_SOT_HS, "SOT Error" },
+ { MIPI_CSIS_INTSRC_ERR_LOST_FS, "Lost Frame Start Error" },
+ { MIPI_CSIS_INTSRC_ERR_LOST_FE, "Lost Frame End Error" },
+ { MIPI_CSIS_INTSRC_ERR_OVER, "FIFO Overflow Error" },
+ { MIPI_CSIS_INTSRC_ERR_WRONG_CFG, "Wrong Configuration Error" },
+ { MIPI_CSIS_INTSRC_ERR_ECC, "ECC Error" },
+ { MIPI_CSIS_INTSRC_ERR_CRC, "CRC Error" },
+ { MIPI_CSIS_INTSRC_ERR_UNKNOWN, "Unknown Error" },
+ /* Non-image data receive events */
+ { MIPI_CSIS_INTSRC_EVEN_BEFORE, "Non-image data before even frame" },
+ { MIPI_CSIS_INTSRC_EVEN_AFTER, "Non-image data after even frame" },
+ { MIPI_CSIS_INTSRC_ODD_BEFORE, "Non-image data before odd frame" },
+ { MIPI_CSIS_INTSRC_ODD_AFTER, "Non-image data after odd frame" },
+ /* Frame start/end */
+ { MIPI_CSIS_INTSRC_FRAME_START, "Frame Start" },
+ { MIPI_CSIS_INTSRC_FRAME_END, "Frame End" },
+};
+
+#define MIPI_CSIS_NUM_EVENTS ARRAY_SIZE(mipi_csis_events)
+
+struct csis_hw_reset {
+ struct regmap *src;
+ u8 req_src;
+ u8 rst_bit;
+};
+
+struct csi_state {
+ struct mutex lock;
+ spinlock_t slock;
+ struct device *dev;
+ struct media_pad pads[CSIS_PADS_NUM];
+ struct v4l2_subdev mipi_sd;
+ struct v4l2_subdev *src_sd;
+
+ u8 index;
+ struct platform_device *pdev;
+ struct phy *phy;
+ void __iomem *regs;
+ struct clk *pclk_clk;
+ struct clk *wrap_clk;
+ struct clk *phy_clk;
+ int irq;
+ u32 flags;
+
+ u32 clk_frequency;
+ u32 hs_settle;
+
+ struct reset_control *mrst;
+
+ const struct csis_pix_format *csis_fmt;
+ struct v4l2_mbus_framefmt format_mbus;
+
+ struct v4l2_fwnode_bus_mipi_csi2 bus;
+
+ struct mipi_csis_event events[MIPI_CSIS_NUM_EVENTS];
+
+ struct v4l2_async_notifier subdev_notifier;
+
+ struct csis_hw_reset hw_reset;
+ struct regulator *mipi_phy_regulator;
+ bool sink_linked;
+};
+
+struct csis_pix_format {
+ unsigned int pix_width_alignment;
+ u32 code;
+ u32 fmt_reg;
+ u8 data_alignment;
+};
+
+static const struct csis_pix_format mipi_csis_formats[] = {
+ {
+ .code = MEDIA_BUS_FMT_SBGGR10_1X10,
+ .fmt_reg = MIPI_CSIS_ISPCFG_FMT_RAW10,
+ .data_alignment = 16,
+ }, {
+ .code = MEDIA_BUS_FMT_VYUY8_2X8,
+ .fmt_reg = MIPI_CSIS_ISPCFG_FMT_YCBCR422_8BIT,
+ .data_alignment = 16,
+ }, {
+ .code = MEDIA_BUS_FMT_SBGGR8_1X8,
+ .fmt_reg = MIPI_CSIS_ISPCFG_FMT_RAW8,
+ .data_alignment = 8,
+ }, {
+ .code = MEDIA_BUS_FMT_YUYV8_2X8,
+ .fmt_reg = MIPI_CSIS_ISPCFG_FMT_YCBCR422_8BIT,
+ .data_alignment = 16,
+ }
+};
+
+#define mipi_csis_write(__csis, __r, __v) writel(__v, __csis->regs + __r)
+#define mipi_csis_read(__csis, __r) readl(__csis->regs + __r)
+
+static void dump_regs(struct csi_state *state, const char *label)
+{
+ u32 cfg;
+ u32 i;
+ struct {
+ u32 offset;
+ const char * const name;
+ } registers[] = {
+ { 0x04, "CTRL" },
+ { 0x24, "DPHYCTRL" },
+ { 0x08, "CLKCTRL" },
+ { 0x20, "DPHYSTS" },
+ { 0x10, "INTMSK" },
+ { 0x40, "CONFIG_CH0" },
+ { 0xC0, "DBG_CONFIG" },
+ { 0x38, "DPHYSLAVE_L" },
+ { 0x3C, "DPHYSLAVE_H" },
+ };
+
+ v4l2_info(&state->mipi_sd, "--- %s ---\n", label);
+
+ for (i = 0; i < ARRAY_SIZE(registers); i++) {
+ cfg = mipi_csis_read(state, registers[i].offset);
+ v4l2_info(&state->mipi_sd, "%12s: 0x%08x 0x%p\n",
+ registers[i].name, cfg, state->regs);
+ }
+}
+
+static struct csi_state *mipi_sd_to_csis_state(struct v4l2_subdev *sdev)
+{
+ return container_of(sdev, struct csi_state, mipi_sd);
+}
+
+static const struct csis_pix_format *find_csis_format(u32 code)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(mipi_csis_formats); i++)
+ if (code == mipi_csis_formats[i].code)
+ return &mipi_csis_formats[i];
+ return NULL;
+}
+
+static void mipi_csis_enable_interrupts(struct csi_state *state, bool on)
+{
+ u32 val = mipi_csis_read(state, MIPI_CSIS_INTMSK);
+
+ if (on)
+ val |= 0xffffffff;
+ else
+ val &= ~0xffffffff;
+ mipi_csis_write(state, MIPI_CSIS_INTMSK, val);
+}
+
+static void mipi_csis_sw_reset(struct csi_state *state)
+{
+ u32 val = mipi_csis_read(state, MIPI_CSIS_CMN_CTRL);
+
+ mipi_csis_write(state, MIPI_CSIS_CMN_CTRL,
+ val | MIPI_CSIS_CMN_CTRL_RESET);
+ usleep_range(10, 20);
+}
+
+static int mipi_csis_phy_init(struct csi_state *state)
+{
+ state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
+
+ return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
+ 1000000);
+}
+
+static void mipi_csis_phy_reset(struct csi_state *state)
+{
+ reset_control_assert(state->mrst);
+
+ msleep(20);
+
+ reset_control_deassert(state->mrst);
+}
+
+static void mipi_csis_system_enable(struct csi_state *state, int on)
+{
+ u32 val, mask;
+
+ val = mipi_csis_read(state, MIPI_CSIS_CMN_CTRL);
+ if (on)
+ val |= MIPI_CSIS_CMN_CTRL_ENABLE;
+ else
+ val &= ~MIPI_CSIS_CMN_CTRL_ENABLE;
+ mipi_csis_write(state, MIPI_CSIS_CMN_CTRL, val);
+
+ val = mipi_csis_read(state, MIPI_CSIS_DPHYCTRL);
+ val &= ~MIPI_CSIS_DPHYCTRL_ENABLE;
+ if (on) {
+ mask = (1 << (state->bus.num_data_lanes + 1)) - 1;
+ val |= (mask & MIPI_CSIS_DPHYCTRL_ENABLE);
+ }
+ mipi_csis_write(state, MIPI_CSIS_DPHYCTRL, val);
+}
+
+/* Called with the state.lock mutex held */
+static void __mipi_csis_set_format(struct csi_state *state)
+{
+ struct v4l2_mbus_framefmt *mf = &state->format_mbus;
+ u32 val;
+
+ /* Color format */
+ val = mipi_csis_read(state, MIPI_CSIS_ISPCONFIG_CH0);
+ val = (val & ~MIPI_CSIS_ISPCFG_FMT_MASK) | state->csis_fmt->fmt_reg;
+ mipi_csis_write(state, MIPI_CSIS_ISPCONFIG_CH0, val);
+
+ /* Pixel resolution */
+ val = mf->width | (mf->height << 16);
+ mipi_csis_write(state, MIPI_CSIS_ISPRESOL_CH0, val);
+}
+
+static void mipi_csis_set_hsync_settle(struct csi_state *state, int hs_settle)
+{
+ u32 val = mipi_csis_read(state, MIPI_CSIS_DPHYCTRL);
+
+ val = ((val & ~MIPI_CSIS_DPHYCTRL_HSS_MASK) | (hs_settle << 24));
+
+ mipi_csis_write(state, MIPI_CSIS_DPHYCTRL, val);
+}
+
+static void mipi_csis_set_params(struct csi_state *state)
+{
+ int lanes = state->bus.num_data_lanes;
+ u32 val;
+
+ val = mipi_csis_read(state, MIPI_CSIS_CMN_CTRL);
+ val &= ~MIPI_CSIS_CMN_CTRL_LANE_NR_MASK;
+ val |= (lanes - 1) << MIPI_CSIS_CMN_CTRL_LANE_NR_OFFSET;
+ mipi_csis_write(state, MIPI_CSIS_CMN_CTRL, val);
+
+ __mipi_csis_set_format(state);
+
+ mipi_csis_set_hsync_settle(state, state->hs_settle);
+
+ val = mipi_csis_read(state, MIPI_CSIS_ISPCONFIG_CH0);
+ if (state->csis_fmt->data_alignment == 32)
+ val |= MIPI_CSIS_ISPCFG_ALIGN_32BIT;
+ else
+ val &= ~MIPI_CSIS_ISPCFG_ALIGN_32BIT;
+ mipi_csis_write(state, MIPI_CSIS_ISPCONFIG_CH0, val);
+
+ val = (0 << MIPI_CSIS_ISPSYNC_HSYNC_LINTV_OFFSET) |
+ (0 << MIPI_CSIS_ISPSYNC_VSYNC_SINTV_OFFSET) |
+ (0 << MIPI_CSIS_ISPSYNC_VSYNC_EINTV_OFFSET);
+ mipi_csis_write(state, MIPI_CSIS_ISPSYNC_CH0, val);
+
+ val = mipi_csis_read(state, MIPI_CSIS_CLK_CTRL);
+ val &= ~MIPI_CSIS_CLK_CTRL_WCLK_SRC;
+ if (state->wrap_clk)
+ val |= MIPI_CSIS_CLK_CTRL_WCLK_SRC;
+ else
+ val &= ~MIPI_CSIS_CLK_CTRL_WCLK_SRC;
+
+ val |= MIPI_CSIS_CLK_CTRL_CLKGATE_TRAIL_CH0(15);
+ val &= ~MIPI_CSIS_CLK_CTRL_CLKGATE_EN_MSK;
+ mipi_csis_write(state, MIPI_CSIS_CLK_CTRL, val);
+
+ mipi_csis_write(state, MIPI_CSIS_DPHYBCTRL_L, 0x1f4);
+ mipi_csis_write(state, MIPI_CSIS_DPHYBCTRL_H, 0);
+
+ /* Update the shadow register. */
+ val = mipi_csis_read(state, MIPI_CSIS_CMN_CTRL);
+ mipi_csis_write(state, MIPI_CSIS_CMN_CTRL,
+ val | MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW |
+ MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW_CTRL);
+}
+
+static void mipi_csis_clk_enable(struct csi_state *state)
+{
+ clk_prepare_enable(state->pclk_clk);
+ clk_prepare_enable(state->wrap_clk);
+ clk_prepare_enable(state->phy_clk);
+}
+
+static void mipi_csis_clk_disable(struct csi_state *state)
+{
+ clk_disable_unprepare(state->pclk_clk);
+ clk_disable_unprepare(state->wrap_clk);
+ clk_disable_unprepare(state->phy_clk);
+}
+
+static int mipi_csis_clk_get(struct csi_state *state)
+{
+ struct device *dev = &state->pdev->dev;
+ int ret;
+
+ state->pclk_clk = devm_clk_get(dev, "pclk");
+ if (IS_ERR(state->pclk_clk)) {
+ dev_err(dev, "Could not get pclk clock\n");
+ return -ENODEV;
+ }
+
+ state->wrap_clk = devm_clk_get(dev, "wrap");
+ if (IS_ERR(state->wrap_clk)) {
+ dev_info(dev, "Could not get wrap clock, using pclk\n");
+ state->wrap_clk = NULL;
+ }
+
+ state->phy_clk = devm_clk_get(dev, "phy");
+ if (IS_ERR(state->phy_clk)) {
+ dev_err(dev, "Could not get mipi phy clock\n");
+ return -ENODEV;
+ }
+
+ /* Set clock rate */
+ ret = clk_set_rate(state->wrap_clk, state->clk_frequency);
+ if (ret < 0)
+ dev_err(dev, "set rate=%d failed: %d\n", state->clk_frequency,
+ ret);
+
+ return ret;
+}
+
+static void mipi_csis_start_stream(struct csi_state *state)
+{
+ mipi_csis_sw_reset(state);
+ mipi_csis_set_params(state);
+ mipi_csis_system_enable(state, true);
+ mipi_csis_enable_interrupts(state, true);
+}
+
+static void mipi_csis_stop_stream(struct csi_state *state)
+{
+ mipi_csis_enable_interrupts(state, false);
+ mipi_csis_system_enable(state, false);
+}
+
+static void mipi_csis_clear_counters(struct csi_state *state)
+{
+ unsigned long flags;
+ int i;
+
+ spin_lock_irqsave(&state->slock, flags);
+ for (i = 0; i < MIPI_CSIS_NUM_EVENTS; i++)
+ state->events[i].counter = 0;
+ spin_unlock_irqrestore(&state->slock, flags);
+}
+
+static void mipi_csis_log_counters(struct csi_state *state, bool non_errors)
+{
+ int i = non_errors ? MIPI_CSIS_NUM_EVENTS : MIPI_CSIS_NUM_EVENTS - 4;
+ unsigned long flags;
+
+ spin_lock_irqsave(&state->slock, flags);
+
+ for (i--; i >= 0; i--) {
+ if (state->events[i].counter > 0 || debug)
+ v4l2_info(&state->mipi_sd, "%s events: %d\n",
+ state->events[i].name,
+ state->events[i].counter);
+ }
+ spin_unlock_irqrestore(&state->slock, flags);
+}
+
+/*
+ * V4L2 subdev operations
+ */
+static int mipi_csis_s_power(struct v4l2_subdev *mipi_sd, int on)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ struct device *dev = &state->pdev->dev;
+
+ v4l2_subdev_call(state->src_sd, core, s_power, on);
+
+ if (on)
+ return pm_runtime_get_sync(dev);
+
+ return pm_runtime_put_sync(dev);
+}
+
+static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ int ret = 0;
+
+ if (enable) {
+ mipi_csis_clear_counters(state);
+ ret = pm_runtime_get_sync(&state->pdev->dev);
+ if (ret && ret != 1)
+ return ret;
+ }
+
+ mutex_lock(&state->lock);
+ if (enable) {
+ if (state->flags & ST_SUSPENDED) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ mipi_csis_start_stream(state);
+ ret = v4l2_subdev_call(state->src_sd, video, s_stream, 1);
+ if (ret < 0)
+ goto unlock;
+
+ mipi_csis_log_counters(state, true);
+
+ state->flags |= ST_STREAMING;
+ } else {
+ v4l2_subdev_call(state->src_sd, video, s_stream, 0);
+ mipi_csis_stop_stream(state);
+ state->flags &= ~ST_STREAMING;
+ if (debug > 0)
+ mipi_csis_log_counters(state, true);
+ }
+
+unlock:
+ mutex_unlock(&state->lock);
+ if (!enable)
+ pm_runtime_put(&state->pdev->dev);
+
+ return ret;
+}
+
+static int mipi_csis_link_setup(struct media_entity *entity,
+ const struct media_pad *local_pad,
+ const struct media_pad *remote_pad, u32 flags)
+{
+ struct v4l2_subdev *mipi_sd = media_entity_to_v4l2_subdev(entity);
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ struct v4l2_subdev *remote_sd;
+ int ret = 0;
+
+ dev_dbg(state->dev, "link setup %s -> %s", remote_pad->entity->name,
+ local_pad->entity->name);
+
+ remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
+
+ mutex_lock(&state->lock);
+
+ if (local_pad->flags & MEDIA_PAD_FL_SOURCE) {
+ if (flags & MEDIA_LNK_FL_ENABLED) {
+ if (state->sink_linked) {
+ ret = -EBUSY;
+ goto out;
+ }
+ state->sink_linked = true;
+ } else {
+ state->sink_linked = false;
+ }
+ } else {
+ if (flags & MEDIA_LNK_FL_ENABLED) {
+ if (state->src_sd) {
+ ret = -EBUSY;
+ goto out;
+ }
+ state->src_sd = remote_sd;
+ } else {
+ state->src_sd = NULL;
+ }
+ }
+
+out:
+ mutex_unlock(&state->lock);
+ return ret;
+}
+
+static int mipi_csis_init_cfg(struct v4l2_subdev *mipi_sd,
+ struct v4l2_subdev_pad_config *cfg)
+{
+ struct v4l2_mbus_framefmt *mf;
+ int ret;
+ int i;
+
+ for (i = 0; i < CSIS_PADS_NUM; i++) {
+ mf = v4l2_subdev_get_try_format(mipi_sd, cfg, i);
+
+ ret = imx_media_init_mbus_fmt(mf, MIPI_CSIS_DEF_PIX_HEIGHT,
+ MIPI_CSIS_DEF_PIX_WIDTH, 0,
+ V4L2_FIELD_NONE, NULL);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+static struct csis_pix_format const *mipi_csis_try_format(
+ struct v4l2_subdev *mipi_sd,
+ struct v4l2_mbus_framefmt *mf)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ struct csis_pix_format const *csis_fmt;
+
+ csis_fmt = find_csis_format(mf->code);
+ if (!csis_fmt)
+ csis_fmt = &mipi_csis_formats[0];
+
+ v4l_bound_align_image(&mf->width, 1, CSIS_MAX_PIX_WIDTH,
+ csis_fmt->pix_width_alignment,
+ &mf->height, 1, CSIS_MAX_PIX_HEIGHT, 1,
+ 0);
+
+ state->format_mbus.code = csis_fmt->code;
+ state->format_mbus.width = mf->width;
+ state->format_mbus.height = mf->height;
+
+ return csis_fmt;
+}
+
+static struct v4l2_mbus_framefmt *mipi_csis_get_format(struct csi_state *state,
+ struct v4l2_subdev_pad_config *cfg,
+ enum v4l2_subdev_format_whence which,
+ unsigned int pad)
+{
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
+ return v4l2_subdev_get_try_format(&state->mipi_sd, cfg, pad);
+
+ return &state->format_mbus;
+}
+
+static int mipi_csis_set_fmt(struct v4l2_subdev *mipi_sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *sdformat)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ struct csis_pix_format const *csis_fmt;
+ struct v4l2_mbus_framefmt *fmt;
+
+ if (sdformat->pad >= CSIS_PADS_NUM)
+ return -EINVAL;
+
+ fmt = mipi_csis_get_format(state, cfg, sdformat->which, sdformat->pad);
+
+ mutex_lock(&state->lock);
+ if (fmt && sdformat->pad == CSIS_PAD_SOURCE) {
+ sdformat->format = *fmt;
+ goto unlock;
+ }
+
+ csis_fmt = mipi_csis_try_format(mipi_sd, &sdformat->format);
+
+ sdformat->format = *fmt;
+
+ if (csis_fmt && sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
+ state->csis_fmt = csis_fmt;
+ else
+ cfg->try_fmt = sdformat->format;
+
+unlock:
+ mutex_unlock(&state->lock);
+
+ return 0;
+}
+
+static int mipi_csis_get_fmt(struct v4l2_subdev *mipi_sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *sdformat)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ struct v4l2_mbus_framefmt *fmt;
+
+ mutex_lock(&state->lock);
+
+ fmt = mipi_csis_get_format(state, cfg, sdformat->which, sdformat->pad);
+
+ sdformat->format = *fmt;
+
+ mutex_unlock(&state->lock);
+
+ return 0;
+}
+
+static int mipi_csis_log_status(struct v4l2_subdev *mipi_sd)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+
+ mutex_lock(&state->lock);
+ mipi_csis_log_counters(state, true);
+ if (debug && (state->flags & ST_POWERED))
+ dump_regs(state, __func__);
+ mutex_unlock(&state->lock);
+
+ return 0;
+}
+
+static irqreturn_t mipi_csis_irq_handler(int irq, void *dev_id)
+{
+ struct csi_state *state = dev_id;
+ unsigned long flags;
+ u32 status;
+ int i;
+
+ status = mipi_csis_read(state, MIPI_CSIS_INTSRC);
+
+ spin_lock_irqsave(&state->slock, flags);
+
+ /* Update the event/error counters */
+ if ((status & MIPI_CSIS_INTSRC_ERRORS) || debug) {
+ for (i = 0; i < MIPI_CSIS_NUM_EVENTS; i++) {
+ if (!(status & state->events[i].mask))
+ continue;
+ state->events[i].counter++;
+ }
+ }
+ spin_unlock_irqrestore(&state->slock, flags);
+
+ mipi_csis_write(state, MIPI_CSIS_INTSRC, status);
+
+ return IRQ_HANDLED;
+}
+
+static int mipi_csi_registered(struct v4l2_subdev *mipi_sd)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ int i, ret;
+
+ for (i = 0; i < CSIS_PADS_NUM; i++) {
+ state->pads[i].flags = (i == CSIS_PAD_SINK) ?
+ MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
+ }
+
+ /* set a default mbus format */
+ ret = imx_media_init_mbus_fmt(&state->format_mbus,
+ MIPI_CSIS_DEF_PIX_HEIGHT,
+ MIPI_CSIS_DEF_PIX_WIDTH, 0,
+ V4L2_FIELD_NONE, NULL);
+ if (ret)
+ return ret;
+
+ return media_entity_pads_init(&mipi_sd->entity, CSIS_PADS_NUM,
+ state->pads);
+}
+
+static struct v4l2_subdev_core_ops mipi_csis_core_ops = {
+ .s_power = mipi_csis_s_power,
+ .log_status = mipi_csis_log_status,
+};
+
+static const struct media_entity_operations mipi_csis_entity_ops = {
+ .link_setup = mipi_csis_link_setup,
+ .link_validate = v4l2_subdev_link_validate,
+};
+
+static struct v4l2_subdev_video_ops mipi_csis_video_ops = {
+ .s_stream = mipi_csis_s_stream,
+};
+
+static const struct v4l2_subdev_pad_ops mipi_csis_pad_ops = {
+ .init_cfg = mipi_csis_init_cfg,
+ .get_fmt = mipi_csis_get_fmt,
+ .set_fmt = mipi_csis_set_fmt,
+};
+
+static struct v4l2_subdev_ops mipi_csis_subdev_ops = {
+ .core = &mipi_csis_core_ops,
+ .video = &mipi_csis_video_ops,
+ .pad = &mipi_csis_pad_ops,
+};
+
+static const struct v4l2_subdev_internal_ops mipi_csis_internal_ops = {
+ .registered = mipi_csi_registered,
+};
+
+static int mipi_csis_parse_dt(struct platform_device *pdev,
+ struct csi_state *state)
+{
+ struct device_node *node = pdev->dev.of_node;
+
+ if (of_property_read_u32(node, "clock-frequency",
+ &state->clk_frequency))
+ state->clk_frequency = DEFAULT_SCLK_CSIS_FREQ;
+
+ /* Get MIPI PHY resets */
+ state->mrst = devm_reset_control_get_exclusive(&pdev->dev, "mrst");
+ if (IS_ERR(state->mrst))
+ return PTR_ERR(state->mrst);
+
+ /* Get MIPI CSI-2 bus configration from the endpoint node. */
+ of_property_read_u32(node, "fsl,csis-hs-settle", &state->hs_settle);
+
+ return 0;
+}
+
+static int mipi_csis_pm_resume(struct device *dev, bool runtime);
+
+static int mipi_csis_parse_endpoint(struct device *dev,
+ struct v4l2_fwnode_endpoint *ep,
+ struct v4l2_async_subdev *asd)
+{
+ struct v4l2_subdev *mipi_sd = dev_get_drvdata(dev);
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+
+ if (!fwnode_device_is_available(asd->match.fwnode)) {
+ v4l2_err(mipi_sd, "remote is not available\n");
+ return -EINVAL;
+ }
+
+ if (ep->bus_type != V4L2_MBUS_CSI2_DPHY)
+ v4l2_err(mipi_sd, "invalid bus type, must be MIPI CSI2\n");
+
+ state->bus = ep->bus.mipi_csi2;
+
+ dev_dbg(state->dev, "data lanes: %d\n", state->bus.num_data_lanes);
+ dev_dbg(state->dev, "flags: 0x%08x\n", state->bus.flags);
+
+ return 0;
+}
+
+static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd,
+ struct platform_device *pdev,
+ const struct v4l2_subdev_ops *ops)
+{
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ unsigned int sink_port = 0;
+ int ret;
+
+ v4l2_subdev_init(mipi_sd, ops);
+ mipi_sd->owner = THIS_MODULE;
+ snprintf(mipi_sd->name, sizeof(mipi_sd->name), "%s.%d",
+ CSIS_SUBDEV_NAME, state->index);
+
+ mipi_sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+ mipi_sd->ctrl_handler = NULL;
+
+ mipi_sd->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
+ mipi_sd->entity.ops = &mipi_csis_entity_ops;
+
+ mipi_sd->dev = &pdev->dev;
+
+ state->csis_fmt = &mipi_csis_formats[0];
+ state->format_mbus.code = mipi_csis_formats[0].code;
+ state->format_mbus.width = MIPI_CSIS_DEF_PIX_WIDTH;
+ state->format_mbus.height = MIPI_CSIS_DEF_PIX_HEIGHT;
+ state->format_mbus.field = V4L2_FIELD_NONE;
+
+ v4l2_set_subdevdata(mipi_sd, &pdev->dev);
+
+ ret = v4l2_async_register_fwnode_subdev(mipi_sd,
+ sizeof(struct v4l2_async_subdev), &sink_port, 1,
+ mipi_csis_parse_endpoint);
+ if (ret < 0)
+ dev_err(&pdev->dev, "async fwnode register failed: %d\n", ret);
+
+ return ret;
+}
+
+static int mipi_csis_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct resource *mem_res;
+ struct csi_state *state;
+ int ret = -ENOMEM;
+
+ state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return -ENOMEM;
+
+ mutex_init(&state->lock);
+ spin_lock_init(&state->slock);
+
+ state->pdev = pdev;
+ state->dev = dev;
+
+ ret = mipi_csis_parse_dt(pdev, state);
+ if (ret < 0) {
+ dev_err(dev, "Failed to parse device tree: %d\n", ret);
+ return ret;
+ }
+
+ mipi_csis_phy_init(state);
+ mipi_csis_phy_reset(state);
+
+ mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ state->regs = devm_ioremap_resource(dev, mem_res);
+ if (IS_ERR(state->regs))
+ return PTR_ERR(state->regs);
+
+ state->irq = platform_get_irq(pdev, 0);
+ if (state->irq < 0) {
+ dev_err(dev, "Failed to get irq\n");
+ return state->irq;
+ }
+
+ ret = mipi_csis_clk_get(state);
+ if (ret < 0)
+ return ret;
+
+ mipi_csis_clk_enable(state);
+
+ ret = devm_request_irq(dev, state->irq, mipi_csis_irq_handler,
+ 0, dev_name(dev), state);
+ if (ret) {
+ dev_err(dev, "Interrupt request failed\n");
+ goto disable_clock;
+ }
+
+ platform_set_drvdata(pdev, &state->mipi_sd);
+
+ ret = mipi_csis_subdev_init(&state->mipi_sd, pdev,
+ &mipi_csis_subdev_ops);
+ if (ret < 0)
+ goto disable_clock;
+
+ state->pads[CSIS_PAD_SINK].flags = MEDIA_PAD_FL_SINK;
+ state->pads[CSIS_PAD_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
+ ret = media_entity_pads_init(&state->mipi_sd.entity, CSIS_PADS_NUM,
+ state->pads);
+ if (ret < 0)
+ goto unregister_subdev;
+
+ memcpy(state->events, mipi_csis_events, sizeof(state->events));
+
+ pm_runtime_enable(dev);
+ if (!pm_runtime_enabled(dev)) {
+ ret = mipi_csis_pm_resume(dev, true);
+ if (ret < 0)
+ goto unregister_all;
+ }
+
+ dev_info(&pdev->dev, "lanes: %d, hs_settle: %d, wclk: %d, freq: %u\n",
+ state->bus.num_data_lanes, state->hs_settle,
+ state->wrap_clk ? 1 : 0, state->clk_frequency);
+ return 0;
+
+unregister_all:
+ media_entity_cleanup(&state->mipi_sd.entity);
+unregister_subdev:
+ v4l2_async_unregister_subdev(&state->mipi_sd);
+disable_clock:
+ mipi_csis_clk_disable(state);
+
+ return ret;
+}
+
+static int mipi_csis_pm_suspend(struct device *dev, bool runtime)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct v4l2_subdev *mipi_sd = platform_get_drvdata(pdev);
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ int ret = 0;
+
+ mutex_lock(&state->lock);
+ if (state->flags & ST_POWERED) {
+ mipi_csis_stop_stream(state);
+ ret = regulator_disable(state->mipi_phy_regulator);
+ if (ret)
+ goto unlock;
+ mipi_csis_clk_disable(state);
+ state->flags &= ~ST_POWERED;
+ if (!runtime)
+ state->flags |= ST_SUSPENDED;
+ }
+
+ unlock:
+ mutex_unlock(&state->lock);
+
+ return ret ? -EAGAIN : 0;
+}
+
+static int mipi_csis_pm_resume(struct device *dev, bool runtime)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct v4l2_subdev *mipi_sd = platform_get_drvdata(pdev);
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+ int ret = 0;
+
+ mutex_lock(&state->lock);
+ if (!runtime && !(state->flags & ST_SUSPENDED))
+ goto unlock;
+
+ if (!(state->flags & ST_POWERED)) {
+ ret = regulator_enable(state->mipi_phy_regulator);
+ if (ret)
+ goto unlock;
+
+ state->flags |= ST_POWERED;
+ mipi_csis_clk_enable(state);
+ }
+ if (state->flags & ST_STREAMING)
+ mipi_csis_start_stream(state);
+
+ state->flags &= ~ST_SUSPENDED;
+
+ unlock:
+ mutex_unlock(&state->lock);
+
+ return ret ? -EAGAIN : 0;
+}
+
+static int mipi_csis_suspend(struct device *dev)
+{
+ return mipi_csis_pm_suspend(dev, false);
+}
+
+static int mipi_csis_resume(struct device *dev)
+{
+ return mipi_csis_pm_resume(dev, false);
+}
+
+static int mipi_csis_runtime_suspend(struct device *dev)
+{
+ return mipi_csis_pm_suspend(dev, true);
+}
+
+static int mipi_csis_runtime_resume(struct device *dev)
+{
+ return mipi_csis_pm_resume(dev, true);
+}
+
+static int mipi_csis_remove(struct platform_device *pdev)
+{
+ struct v4l2_subdev *mipi_sd = platform_get_drvdata(pdev);
+ struct csi_state *state = mipi_sd_to_csis_state(mipi_sd);
+
+ v4l2_async_unregister_subdev(&state->mipi_sd);
+ v4l2_async_notifier_unregister(&state->subdev_notifier);
+
+ pm_runtime_disable(&pdev->dev);
+ mipi_csis_pm_suspend(&pdev->dev, true);
+ mipi_csis_clk_disable(state);
+ media_entity_cleanup(&state->mipi_sd.entity);
+ pm_runtime_set_suspended(&pdev->dev);
+
+ return 0;
+}
+
+static const struct dev_pm_ops mipi_csis_pm_ops = {
+ SET_RUNTIME_PM_OPS(mipi_csis_runtime_suspend, mipi_csis_runtime_resume,
+ NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(mipi_csis_suspend, mipi_csis_resume)
+};
+
+static const struct of_device_id mipi_csis_of_match[] = {
+ { .compatible = "fsl,imx7-mipi-csi2", },
+ { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, mipi_csis_of_match);
+
+static struct platform_driver mipi_csis_driver = {
+ .probe = mipi_csis_probe,
+ .remove = mipi_csis_remove,
+ .driver = {
+ .of_match_table = mipi_csis_of_match,
+ .name = CSIS_DRIVER_NAME,
+ .owner = THIS_MODULE,
+ .pm = &mipi_csis_pm_ops,
+ },
+};
+
+module_platform_driver(mipi_csis_driver);
+
+MODULE_DESCRIPTION("i.MX7 MIPI CSI-2 Receiver driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx7-mipi-csi2");
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (3 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 22:16 ` Sakari Ailus
2018-11-21 11:15 ` [PATCH v8 06/12] ARM: dts: imx7s: add mipi phy power domain Rui Miguel Silva
` (7 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Add bindings documentation for i.MX7 media drivers.
The imx7 MIPI CSI2 and imx7 CMOS Sensor Interface.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
.../devicetree/bindings/media/imx7-csi.txt | 45 ++++++++++
.../bindings/media/imx7-mipi-csi2.txt | 90 +++++++++++++++++++
2 files changed, 135 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt
create mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt
new file mode 100644
index 000000000000..171b089ee91f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
@@ -0,0 +1,45 @@
+Freescale i.MX7 CMOS Sensor Interface
+=====================================
+
+csi node
+--------
+
+This is device node for the CMOS Sensor Interface (CSI) which enables the chip
+to connect directly to external CMOS image sensors.
+
+Required properties:
+
+- compatible : "fsl,imx7-csi";
+- reg : base address and length of the register set for the device;
+- interrupts : should contain CSI interrupt;
+- clocks : list of clock specifiers, see
+ Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
+- clock-names : must contain "axi", "mclk" and "dcic" entries, matching
+ entries in the clock property;
+
+The device node shall contain one 'port' child node with one child 'endpoint'
+node, according to the bindings defined in:
+ Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+In the following example a remote endpoint is a video multiplexer.
+
+example:
+
+ csi: csi@30710000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ compatible = "fsl,imx7-csi";
+ reg = <0x30710000 0x10000>;
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_CLK_DUMMY>,
+ <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
+ <&clks IMX7D_CLK_DUMMY>;
+ clock-names = "axi", "mclk", "dcic";
+
+ port {
+ csi_from_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_to_csi>;
+ };
+ };
+ };
diff --git a/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
new file mode 100644
index 000000000000..71fd74ed3ec8
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
@@ -0,0 +1,90 @@
+Freescale i.MX7 Mipi CSI2
+=========================
+
+mipi_csi2 node
+--------------
+
+This is the device node for the MIPI CSI-2 receiver core in i.MX7 SoC. It is
+compatible with previous version of Samsung D-phy.
+
+Required properties:
+
+- compatible : "fsl,imx7-mipi-csi2";
+- reg : base address and length of the register set for the device;
+- interrupts : should contain MIPI CSIS interrupt;
+- clocks : list of clock specifiers, see
+ Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
+- clock-names : must contain "pclk", "wrap" and "phy" entries, matching
+ entries in the clock property;
+- power-domains : a phandle to the power domain, see
+ Documentation/devicetree/bindings/power/power_domain.txt for details.
+- reset-names : should include following entry "mrst";
+- resets : a list of phandle, should contain reset entry of
+ reset-names;
+- phy-supply : from the generic phy bindings, a phandle to a regulator that
+ provides power to MIPI CSIS core;
+
+Optional properties:
+
+- clock-frequency : The IP's main (system bus) clock frequency in Hz, default
+ value when this property is not specified is 166 MHz;
+- fsl,csis-hs-settle : differential receiver (HS-RX) settle time;
+
+The device node should contain two 'port' child nodes with one child 'endpoint'
+node, according to the bindings defined in:
+ Documentation/devicetree/bindings/ media/video-interfaces.txt.
+ The following are properties specific to those nodes.
+
+port node
+---------
+
+- reg : (required) can take the values 0 or 1, where 0 shall be
+ related to the sink port and port 1 shall be the source
+ one;
+
+endpoint node
+-------------
+
+- data-lanes : (required) an array specifying active physical MIPI-CSI2
+ data input lanes and their mapping to logical lanes; this
+ shall only be applied to port 0 (sink port), the array's
+ content is unused only its length is meaningful,
+ in this case the maximum length supported is 2;
+
+example:
+
+ mipi_csi: mipi-csi@30750000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ compatible = "fsl,imx7-mipi-csi2";
+ reg = <0x30750000 0x10000>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_IPG_ROOT_CLK>,
+ <&clks IMX7D_MIPI_CSI_ROOT_CLK>,
+ <&clks IMX7D_MIPI_DPHY_ROOT_CLK>;
+ clock-names = "pclk", "wrap", "phy";
+ clock-frequency = <166000000>;
+ power-domains = <&pgc_mipi_phy>;
+ phy-supply = <®_1p0d>;
+ resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
+ reset-names = "mrst";
+ fsl,csis-hs-settle = <3>;
+
+ port@0 {
+ reg = <0>;
+
+ mipi_from_sensor: endpoint {
+ remote-endpoint = <&ov2680_to_mipi>;
+ data-lanes = <1>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ mipi_vc0_to_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_from_mipi_vc0>;
+ };
+ };
+ };
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 06/12] ARM: dts: imx7s: add mipi phy power domain
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (4 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 07/12] ARM: dts: imx7s: add multiplexer controls Rui Miguel Silva
` (6 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Add power domain index 0 related with mipi-phy to imx7s.
While at it rename pcie power-domain node to remove pgc prefix.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
arch/arm/boot/dts/imx7s.dtsi | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index aa8df7d93b2e..6e2e4f99cdb0 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -608,7 +608,13 @@
#address-cells = <1>;
#size-cells = <0>;
- pgc_pcie_phy: pgc-power-domain@1 {
+ pgc_mipi_phy: power-domain@0 {
+ #power-domain-cells = <0>;
+ reg = <0>;
+ power-supply = <®_1p0d>;
+ };
+
+ pgc_pcie_phy: power-domain@1 {
#power-domain-cells = <0>;
reg = <1>;
power-supply = <®_1p0d>;
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 07/12] ARM: dts: imx7s: add multiplexer controls
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (5 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 06/12] ARM: dts: imx7s: add mipi phy power domain Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 08/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Rui Miguel Silva
` (5 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
The IOMUXC General Purpose Register has bitfield to control video bus
multiplexer to control the CSI input between the MIPI-CSI2 and parallel
interface. Add that register and mask.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
arch/arm/boot/dts/imx7s.dtsi | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 6e2e4f99cdb0..964f19c997d4 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -499,8 +499,14 @@
gpr: iomuxc-gpr@30340000 {
compatible = "fsl,imx7d-iomuxc-gpr",
- "fsl,imx6q-iomuxc-gpr", "syscon";
+ "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd";
reg = <0x30340000 0x10000>;
+
+ mux: mux-controller {
+ compatible = "mmio-mux";
+ #mux-control-cells = <0>;
+ mux-reg-masks = <0x14 0x00000010>;
+ };
};
ocotp: ocotp-ctrl@30350000 {
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 08/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (6 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 07/12] ARM: dts: imx7s: add multiplexer controls Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 09/12] ARM: dts: imx7s-warp: add ov2680 sensor node Rui Miguel Silva
` (4 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
This patch adds the device tree nodes for csi, video multiplexer and mipi-csi
besides the graph connecting the necessary endpoints to make the media capture
entities to work in imx7 Warp board.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
arch/arm/boot/dts/imx7s-warp.dts | 51 ++++++++++++++++++++++++++++++++
arch/arm/boot/dts/imx7s.dtsi | 27 +++++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index f7ba2c0a24ad..757856a3964b 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -276,6 +276,57 @@
status = "okay";
};
+&gpr {
+ csi_mux {
+ compatible = "video-mux";
+ mux-controls = <&mux 0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@1 {
+ reg = <1>;
+
+ csi_mux_from_mipi_vc0: endpoint {
+ remote-endpoint = <&mipi_vc0_to_csi_mux>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+
+ csi_mux_to_csi: endpoint {
+ remote-endpoint = <&csi_from_csi_mux>;
+ };
+ };
+ };
+};
+
+&csi {
+ status = "okay";
+
+ port {
+ csi_from_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_to_csi>;
+ };
+ };
+};
+
+&mipi_csi {
+ clock-frequency = <166000000>;
+ status = "okay";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ fsl,csis-hs-settle = <3>;
+
+ port@1 {
+ reg = <1>;
+
+ mipi_vc0_to_csi_mux: endpoint {
+ remote-endpoint = <&csi_mux_from_mipi_vc0>;
+ };
+ };
+};
+
&wdog1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_wdog>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 964f19c997d4..fbd2886241b0 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/imx7-reset.h>
#include "imx7d-pinfunc.h"
/ {
@@ -710,6 +711,17 @@
status = "disabled";
};
+ csi: csi@30710000 {
+ compatible = "fsl,imx7-csi";
+ reg = <0x30710000 0x10000>;
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_CLK_DUMMY>,
+ <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
+ <&clks IMX7D_CLK_DUMMY>;
+ clock-names = "axi", "mclk", "dcic";
+ status = "disabled";
+ };
+
lcdif: lcdif@30730000 {
compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif";
reg = <0x30730000 0x10000>;
@@ -719,6 +731,21 @@
clock-names = "pix", "axi";
status = "disabled";
};
+
+ mipi_csi: mipi-csi@30750000 {
+ compatible = "fsl,imx7-mipi-csi2";
+ reg = <0x30750000 0x10000>;
+ interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clks IMX7D_IPG_ROOT_CLK>,
+ <&clks IMX7D_MIPI_CSI_ROOT_CLK>,
+ <&clks IMX7D_MIPI_DPHY_ROOT_CLK>;
+ clock-names = "pclk", "wrap", "phy";
+ power-domains = <&pgc_mipi_phy>;
+ phy-supply = <®_1p0d>;
+ resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
+ reset-names = "mrst";
+ status = "disabled";
+ };
};
aips3: aips-bus@30800000 {
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 09/12] ARM: dts: imx7s-warp: add ov2680 sensor node
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (7 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 08/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 10/12] media: imx7.rst: add documentation for i.MX7 media driver Rui Miguel Silva
` (3 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Warp7 comes with a Omnivision OV2680 sensor, add the node here to make complete
the camera data path for this system. Add the needed regulator to the analog
voltage supply, the port and endpoints in mipi_csi node and the pinctrl for the
reset gpio.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
arch/arm/boot/dts/imx7s-warp.dts | 44 ++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 757856a3964b..4ada85850411 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -54,6 +54,14 @@
regulator-always-on;
};
+ reg_peri_3p15v: regulator-peri-3p15v {
+ compatible = "regulator-fixed";
+ regulator-name = "peri_3p15v_reg";
+ regulator-min-microvolt = <3150000>;
+ regulator-max-microvolt = <3150000>;
+ regulator-always-on;
+ };
+
sound {
compatible = "simple-audio-card";
simple-audio-card,name = "imx7-sgtl5000";
@@ -177,6 +185,27 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
status = "okay";
+
+ ov2680: camera@36 {
+ compatible = "ovti,ov2680";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ov2680>;
+ reg = <0x36>;
+ clocks = <&osc>;
+ clock-names = "xvclk";
+ reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
+ DOVDD-supply = <&sw2_reg>;
+ DVDD-supply = <&sw2_reg>;
+ AVDD-supply = <®_peri_3p15v>;
+
+ port {
+ ov2680_to_mipi: endpoint {
+ remote-endpoint = <&mipi_from_sensor>;
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ };
+ };
+ };
};
&i2c3 {
@@ -318,6 +347,15 @@
#size-cells = <0>;
fsl,csis-hs-settle = <3>;
+ port@0 {
+ reg = <0>;
+
+ mipi_from_sensor: endpoint {
+ remote-endpoint = <&ov2680_to_mipi>;
+ data-lanes = <1>;
+ };
+ };
+
port@1 {
reg = <1>;
@@ -381,6 +419,12 @@
>;
};
+ pinctrl_ov2680: ov2660grp {
+ fsl,pins = <
+ MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x14
+ >;
+ };
+
pinctrl_sai1: sai1grp {
fsl,pins = <
MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 10/12] media: imx7.rst: add documentation for i.MX7 media driver
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (8 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 09/12] ARM: dts: imx7s-warp: add ov2680 sensor node Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 11/12] media: staging/imx: add i.MX7 entries to TODO file Rui Miguel Silva
` (2 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Add rst document to describe the i.MX7 media driver and also a working
example from the Warp7 board usage with a OV2680 sensor.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
Documentation/media/v4l-drivers/imx7.rst | 157 ++++++++++++++++++++++
Documentation/media/v4l-drivers/index.rst | 1 +
2 files changed, 158 insertions(+)
create mode 100644 Documentation/media/v4l-drivers/imx7.rst
diff --git a/Documentation/media/v4l-drivers/imx7.rst b/Documentation/media/v4l-drivers/imx7.rst
new file mode 100644
index 000000000000..cd1195d391c5
--- /dev/null
+++ b/Documentation/media/v4l-drivers/imx7.rst
@@ -0,0 +1,157 @@
+i.MX7 Video Capture Driver
+==========================
+
+Introduction
+------------
+
+The i.MX7 contrary to the i.MX5/6 family does not contain an Image Processing
+Unit (IPU); because of that the capabilities to perform operations or
+manipulation of the capture frames are less feature rich.
+
+For image capture the i.MX7 has three units:
+- CMOS Sensor Interface (CSI)
+- Video Multiplexer
+- MIPI CSI-2 Receiver
+
+::
+ |\
+ MIPI Camera Input ---> MIPI CSI-2 --- > | \
+ | \
+ | M |
+ | U | ------> CSI ---> Capture
+ | X |
+ | /
+ Parallel Camera Input ----------------> | /
+ |/
+
+For additional information, please refer to the latest versions of the i.MX7
+reference manual [#f1]_.
+
+Entities
+--------
+
+imx7-mipi-csi2
+--------------
+
+This is the MIPI CSI-2 receiver entity. It has one sink pad to receive the pixel
+data from MIPI CSI-2 camera sensor. It has one source pad, corresponding to the
+virtual channel 0. This module is compliant to previous version of Samsung
+D-phy, and supports two D-PHY Rx Data lanes.
+
+csi_mux
+-------
+
+This is the video multiplexer. It has two sink pads to select from either camera
+sensor with a parallel interface or from MIPI CSI-2 virtual channel 0. It has
+a single source pad that routes to the CSI.
+
+csi
+---
+
+The CSI enables the chip to connect directly to external CMOS image sensor. CSI
+can interface directly with Parallel and MIPI CSI-2 buses. It has 256 x 64 FIFO
+to store received image pixel data and embedded DMA controllers to transfer data
+from the FIFO through AHB bus.
+
+This entity has one sink pad that receives from the csi_mux entity and a single
+source pad that routes video frames directly to memory buffers. This pad is
+routed to a capture device node.
+
+Usage Notes
+-----------
+
+To aid in configuration and for backward compatibility with V4L2 applications
+that access controls only from video device nodes, the capture device interfaces
+inherit controls from the active entities in the current pipeline, so controls
+can be accessed either directly from the subdev or from the active capture
+device interface. For example, the sensor controls are available either from the
+sensor subdevs or from the active capture device.
+
+Warp7 with OV2680
+-----------------
+
+On this platform an OV2680 MIPI CSI-2 module is connected to the internal MIPI
+CSI-2 receiver. The following example configures a video capture pipeline with
+an output of 800x600, and BGGR 10 bit bayer format:
+
+.. code-block:: none
+ # Setup links
+ media-ctl -l "'ov2680 1-0036':0 -> 'imx7-mipi-csis.0':0[1]"
+ media-ctl -l "'imx7-mipi-csis.0':1 -> 'csi_mux':1[1]"
+ media-ctl -l "'csi_mux':2 -> 'csi':0[1]"
+ media-ctl -l "'csi':1 -> 'csi capture':0[1]"
+
+ # Configure pads for pipeline
+ media-ctl -V "'ov2680 1-0036':0 [fmt:SBGGR10_1X10/800x600 field:none]"
+ media-ctl -V "'csi_mux':1 [fmt:SBGGR10_1X10/800x600 field:none]"
+ media-ctl -V "'csi_mux':2 [fmt:SBGGR10_1X10/800x600 field:none]"
+ media-ctl -V "'imx7-mipi-csis.0':0 [fmt:SBGGR10_1X10/800x600 field:none]"
+ media-ctl -V "'csi':0 [fmt:SBGGR10_1X10/800x600 field:none]"
+
+After this streaming can start. The v4l2-ctl tool can be used to select any of
+the resolutions supported by the sensor.
+
+.. code-block:: none
+ root@imx7s-warp:~# media-ctl -p
+ Media controller API version 4.17.0
+
+ Media device information
+ ------------------------
+ driver imx-media
+ model imx-media
+ serial
+ bus info
+ hw revision 0x0
+ driver version 4.17.0
+
+ Device topology
+ - entity 1: csi (2 pads, 2 links)
+ type V4L2 subdev subtype Unknown flags 0
+ device node name /dev/v4l-subdev0
+ pad0: Sink
+ [fmt:SBGGR10_1X10/800x600 field:none]
+ <- "csi_mux":2 [ENABLED]
+ pad1: Source
+ [fmt:SBGGR10_1X10/800x600 field:none]
+ -> "csi capture":0 [ENABLED]
+
+ - entity 4: csi capture (1 pad, 1 link)
+ type Node subtype V4L flags 0
+ device node name /dev/video0
+ pad0: Sink
+ <- "csi":1 [ENABLED]
+
+ - entity 10: csi_mux (3 pads, 2 links)
+ type V4L2 subdev subtype Unknown flags 0
+ device node name /dev/v4l-subdev1
+ pad0: Sink
+ [fmt:unknown/0x0]
+ pad1: Sink
+ [fmt:unknown/800x600 field:none]
+ <- "imx7-mipi-csis.0":1 [ENABLED]
+ pad2: Source
+ [fmt:unknown/800x600 field:none]
+ -> "csi":0 [ENABLED]
+
+ - entity 14: imx7-mipi-csis.0 (2 pads, 2 links)
+ type V4L2 subdev subtype Unknown flags 0
+ device node name /dev/v4l-subdev2
+ pad0: Sink
+ [fmt:SBGGR10_1X10/800x600 field:none]
+ <- "ov2680 1-0036":0 [ENABLED]
+ pad1: Source
+ [fmt:SBGGR10_1X10/800x600 field:none]
+ -> "csi_mux":1 [ENABLED]
+
+ - entity 17: ov2680 1-0036 (1 pad, 1 link)
+ type V4L2 subdev subtype Sensor flags 0
+ device node name /dev/v4l-subdev3
+ pad0: Source
+ [fmt:SBGGR10_1X10/800x600 field:none]
+ -> "imx7-mipi-csis.0":0 [ENABLED]
+
+
+References
+----------
+
+.. [#f1] https://www.nxp.com/docs/en/reference-manual/IMX7SRM.pdf
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index 679238e786a7..693295bbc53f 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -44,6 +44,7 @@ For more details see the file COPYING in the source distribution of Linux.
davinci-vpbe
fimc
imx
+ imx7
ivtv
max2175
meye
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 11/12] media: staging/imx: add i.MX7 entries to TODO file
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (9 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 10/12] media: imx7.rst: add documentation for i.MX7 media driver Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 12/12] media: video-mux: add bayer formats Rui Miguel Silva
2018-11-21 11:53 ` [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Hans Verkuil
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Add some i.MX7 related entries to TODO file.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/staging/media/imx/TODO | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/staging/media/imx/TODO b/drivers/staging/media/imx/TODO
index aeeb15494a49..6f29b5ca5324 100644
--- a/drivers/staging/media/imx/TODO
+++ b/drivers/staging/media/imx/TODO
@@ -45,3 +45,12 @@
Which means a port must not contain mixed-use endpoints, they
must all refer to media links between V4L2 subdevices.
+
+- i.MX7: all of the above, since it uses the imx media core
+
+- i.MX7: use Frame Interval Monitor
+
+- i.MX7: runtime testing with parallel sensor, links setup and streaming
+
+- i.MX7: runtime testing with different formats, for the time only 10-bit bayer
+ is tested
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH v8 12/12] media: video-mux: add bayer formats
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (10 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 11/12] media: staging/imx: add i.MX7 entries to TODO file Rui Miguel Silva
@ 2018-11-21 11:15 ` Rui Miguel Silva
2018-11-21 11:53 ` [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Hans Verkuil
12 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-21 11:15 UTC (permalink / raw)
To: sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Add non vendor bayer formats to the allowed format array.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
---
drivers/media/platform/video-mux.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
index c33900e3c23e..0ba30756e1e4 100644
--- a/drivers/media/platform/video-mux.c
+++ b/drivers/media/platform/video-mux.c
@@ -263,6 +263,26 @@ static int video_mux_set_format(struct v4l2_subdev *sd,
case MEDIA_BUS_FMT_UYYVYY16_0_5X48:
case MEDIA_BUS_FMT_JPEG_1X8:
case MEDIA_BUS_FMT_AHSV8888_1X32:
+ case MEDIA_BUS_FMT_SBGGR8_1X8:
+ case MEDIA_BUS_FMT_SGBRG8_1X8:
+ case MEDIA_BUS_FMT_SGRBG8_1X8:
+ case MEDIA_BUS_FMT_SRGGB8_1X8:
+ case MEDIA_BUS_FMT_SBGGR10_1X10:
+ case MEDIA_BUS_FMT_SGBRG10_1X10:
+ case MEDIA_BUS_FMT_SGRBG10_1X10:
+ case MEDIA_BUS_FMT_SRGGB10_1X10:
+ case MEDIA_BUS_FMT_SBGGR12_1X12:
+ case MEDIA_BUS_FMT_SGBRG12_1X12:
+ case MEDIA_BUS_FMT_SGRBG12_1X12:
+ case MEDIA_BUS_FMT_SRGGB12_1X12:
+ case MEDIA_BUS_FMT_SBGGR14_1X14:
+ case MEDIA_BUS_FMT_SGBRG14_1X14:
+ case MEDIA_BUS_FMT_SGRBG14_1X14:
+ case MEDIA_BUS_FMT_SRGGB14_1X14:
+ case MEDIA_BUS_FMT_SBGGR16_1X16:
+ case MEDIA_BUS_FMT_SGBRG16_1X16:
+ case MEDIA_BUS_FMT_SGRBG16_1X16:
+ case MEDIA_BUS_FMT_SRGGB16_1X16:
break;
default:
sdformat->format.code = MEDIA_BUS_FMT_Y8_1X8;
--
2.19.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
` (11 preceding siblings ...)
2018-11-21 11:15 ` [PATCH v8 12/12] media: video-mux: add bayer formats Rui Miguel Silva
@ 2018-11-21 11:53 ` Hans Verkuil
2018-11-22 9:38 ` Rui Miguel Silva
12 siblings, 1 reply; 22+ messages in thread
From: Hans Verkuil @ 2018-11-21 11:53 UTC (permalink / raw)
To: Rui Miguel Silva, sakari.ailus, Philipp Zabel
Cc: linux-media, devel, devicetree, Greg Kroah-Hartman
On 11/21/2018 12:15 PM, Rui Miguel Silva wrote:
> Hi,
> This series introduces the Media driver to work with the i.MX7 SoC. it uses the
> already existing imx media core drivers but since the i.MX7, contrary to
> i.MX5/6, do not have an IPU and because of that some changes in the imx media
> core are made along this series to make it support that case.
Can you run scripts/checkpatch.pl --strict over these patches? I get too
many messages from it. Most should be easy to fix.
Regards,
Hans
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver
2018-11-21 11:15 ` [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
@ 2018-11-21 22:16 ` Sakari Ailus
2018-11-22 9:42 ` Rui Miguel Silva
0 siblings, 1 reply; 22+ messages in thread
From: Sakari Ailus @ 2018-11-21 22:16 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Philipp Zabel, linux-media, devel, devicetree, Greg Kroah-Hartman
Hi Rui,
On Wed, Nov 21, 2018 at 11:15:51AM +0000, Rui Miguel Silva wrote:
> Add bindings documentation for i.MX7 media drivers.
> The imx7 MIPI CSI2 and imx7 CMOS Sensor Interface.
>
> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> .../devicetree/bindings/media/imx7-csi.txt | 45 ++++++++++
> .../bindings/media/imx7-mipi-csi2.txt | 90 +++++++++++++++++++
> 2 files changed, 135 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt
> create mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
>
> diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt
> new file mode 100644
> index 000000000000..171b089ee91f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
> @@ -0,0 +1,45 @@
> +Freescale i.MX7 CMOS Sensor Interface
> +=====================================
> +
> +csi node
> +--------
> +
> +This is device node for the CMOS Sensor Interface (CSI) which enables the chip
> +to connect directly to external CMOS image sensors.
> +
> +Required properties:
> +
> +- compatible : "fsl,imx7-csi";
> +- reg : base address and length of the register set for the device;
> +- interrupts : should contain CSI interrupt;
> +- clocks : list of clock specifiers, see
> + Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
> +- clock-names : must contain "axi", "mclk" and "dcic" entries, matching
> + entries in the clock property;
> +
> +The device node shall contain one 'port' child node with one child 'endpoint'
> +node, according to the bindings defined in:
> + Documentation/devicetree/bindings/media/video-interfaces.txt.
> +
> +In the following example a remote endpoint is a video multiplexer.
> +
> +example:
> +
> + csi: csi@30710000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + compatible = "fsl,imx7-csi";
> + reg = <0x30710000 0x10000>;
> + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&clks IMX7D_CLK_DUMMY>,
> + <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
> + <&clks IMX7D_CLK_DUMMY>;
> + clock-names = "axi", "mclk", "dcic";
> +
> + port {
> + csi_from_csi_mux: endpoint {
> + remote-endpoint = <&csi_mux_to_csi>;
> + };
> + };
> + };
> diff --git a/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
> new file mode 100644
> index 000000000000..71fd74ed3ec8
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
> @@ -0,0 +1,90 @@
> +Freescale i.MX7 Mipi CSI2
> +=========================
> +
> +mipi_csi2 node
> +--------------
> +
> +This is the device node for the MIPI CSI-2 receiver core in i.MX7 SoC. It is
> +compatible with previous version of Samsung D-phy.
> +
> +Required properties:
> +
> +- compatible : "fsl,imx7-mipi-csi2";
> +- reg : base address and length of the register set for the device;
> +- interrupts : should contain MIPI CSIS interrupt;
> +- clocks : list of clock specifiers, see
> + Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
> +- clock-names : must contain "pclk", "wrap" and "phy" entries, matching
> + entries in the clock property;
> +- power-domains : a phandle to the power domain, see
> + Documentation/devicetree/bindings/power/power_domain.txt for details.
> +- reset-names : should include following entry "mrst";
> +- resets : a list of phandle, should contain reset entry of
> + reset-names;
> +- phy-supply : from the generic phy bindings, a phandle to a regulator that
> + provides power to MIPI CSIS core;
> +
> +Optional properties:
> +
> +- clock-frequency : The IP's main (system bus) clock frequency in Hz, default
> + value when this property is not specified is 166 MHz;
> +- fsl,csis-hs-settle : differential receiver (HS-RX) settle time;
> +
> +The device node should contain two 'port' child nodes with one child 'endpoint'
> +node, according to the bindings defined in:
> + Documentation/devicetree/bindings/ media/video-interfaces.txt.
Extra space. The two lines are also prefixed by a space; is that intended?
> + The following are properties specific to those nodes.
> +
> +port node
> +---------
> +
> +- reg : (required) can take the values 0 or 1, where 0 shall be
> + related to the sink port and port 1 shall be the source
> + one;
> +
> +endpoint node
> +-------------
> +
> +- data-lanes : (required) an array specifying active physical MIPI-CSI2
> + data input lanes and their mapping to logical lanes; this
> + shall only be applied to port 0 (sink port), the array's
> + content is unused only its length is meaningful,
> + in this case the maximum length supported is 2;
How about the port 1? Is there anything to configure there (I'm not saying
there is, just wondering)?
> +
> +example:
> +
> + mipi_csi: mipi-csi@30750000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + compatible = "fsl,imx7-mipi-csi2";
> + reg = <0x30750000 0x10000>;
> + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&clks IMX7D_IPG_ROOT_CLK>,
> + <&clks IMX7D_MIPI_CSI_ROOT_CLK>,
> + <&clks IMX7D_MIPI_DPHY_ROOT_CLK>;
> + clock-names = "pclk", "wrap", "phy";
> + clock-frequency = <166000000>;
> + power-domains = <&pgc_mipi_phy>;
> + phy-supply = <®_1p0d>;
> + resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
> + reset-names = "mrst";
> + fsl,csis-hs-settle = <3>;
> +
> + port@0 {
> + reg = <0>;
> +
> + mipi_from_sensor: endpoint {
> + remote-endpoint = <&ov2680_to_mipi>;
> + data-lanes = <1>;
> + };
> + };
> +
> + port@1 {
> + reg = <1>;
> +
> + mipi_vc0_to_csi_mux: endpoint {
> + remote-endpoint = <&csi_mux_from_mipi_vc0>;
> + };
> + };
> + };
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver
2018-11-21 11:15 ` [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
@ 2018-11-21 22:29 ` Sakari Ailus
2018-11-22 9:46 ` Rui Miguel Silva
0 siblings, 1 reply; 22+ messages in thread
From: Sakari Ailus @ 2018-11-21 22:29 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Philipp Zabel, linux-media, devel, devicetree, Greg Kroah-Hartman
Hi Rui,
On Wed, Nov 21, 2018 at 11:15:49AM +0000, Rui Miguel Silva wrote:
> This add the media entity subdevice and control driver for the i.MX7
> CMOS Sensor Interface.
>
> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
> ---
> drivers/staging/media/imx/Kconfig | 9 +-
> drivers/staging/media/imx/Makefile | 2 +
> drivers/staging/media/imx/imx7-media-csi.c | 1352 ++++++++++++++++++++
> 3 files changed, 1362 insertions(+), 1 deletion(-)
> create mode 100644 drivers/staging/media/imx/imx7-media-csi.c
>
> diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
> index bfc17de56b17..40a11f988fc6 100644
> --- a/drivers/staging/media/imx/Kconfig
> +++ b/drivers/staging/media/imx/Kconfig
> @@ -11,7 +11,7 @@ config VIDEO_IMX_MEDIA
> driver for the i.MX5/6 SOC.
>
> if VIDEO_IMX_MEDIA
> -menu "i.MX5/6 Media Sub devices"
> +menu "i.MX5/6/7 Media Sub devices"
>
> config VIDEO_IMX_CSI
> tristate "i.MX5/6 Camera Sensor Interface driver"
> @@ -20,5 +20,12 @@ config VIDEO_IMX_CSI
> ---help---
> A video4linux camera sensor interface driver for i.MX5/6.
>
> +config VIDEO_IMX7_CSI
> + tristate "i.MX7 Camera Sensor Interface driver"
> + depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
If you need V4L2 fwnode, you should select V4L2_FWNODE. (I ignore if it's
already selected by VIDEO_IMX_MEDIA.)
> + default y
> + ---help---
> + A video4linux camera sensor interface driver for i.MX7.
> +
> endmenu
> endif
> diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
> index a30b3033f9a3..074f016d3519 100644
> --- a/drivers/staging/media/imx/Makefile
> +++ b/drivers/staging/media/imx/Makefile
> @@ -12,3 +12,5 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-ic.o
>
> obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o
> obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
> +
> +obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
> diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
> new file mode 100644
> index 000000000000..ec5a20880bb6
> --- /dev/null
> +++ b/drivers/staging/media/imx/imx7-media-csi.c
> @@ -0,0 +1,1352 @@
> +// SPDX-License-Identifier: GPL
> +/*
> + * V4L2 Capture CSI Subdev for Freescale i.MX7 SOC
> + *
> + * Copyright (c) 2018 Linaro Ltd
> + *
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/gcd.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_graph.h>
> +#include <linux/pinctrl/consumer.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/types.h>
> +
> +#include <media/v4l2-ctrls.h>
> +#include <media/v4l2-device.h>
> +#include <media/v4l2-event.h>
> +#include <media/v4l2-fwnode.h>
> +#include <media/v4l2-mc.h>
> +#include <media/v4l2-subdev.h>
> +#include <media/videobuf2-dma-contig.h>
> +
> +#include <media/imx.h>
> +#include "imx-media.h"
> +
> +#define IMX7_CSI_PAD_SINK 0
> +#define IMX7_CSI_PAD_SRC 1
> +#define IMX7_CSI_PADS_NUM 2
> +
> +/* reset values */
> +#define CSICR1_RESET_VAL 0x40000800
> +#define CSICR2_RESET_VAL 0x0
> +#define CSICR3_RESET_VAL 0x0
> +
> +/* csi control reg 1 */
> +#define BIT_SWAP16_EN BIT(31)
> +#define BIT_EXT_VSYNC BIT(30)
> +#define BIT_EOF_INT_EN BIT(29)
> +#define BIT_PRP_IF_EN BIT(28)
> +#define BIT_CCIR_MODE BIT(27)
> +#define BIT_COF_INT_EN BIT(26)
> +#define BIT_SF_OR_INTEN BIT(25)
> +#define BIT_RF_OR_INTEN BIT(24)
> +#define BIT_SFF_DMA_DONE_INTEN BIT(22)
> +#define BIT_STATFF_INTEN BIT(21)
> +#define BIT_FB2_DMA_DONE_INTEN BIT(20)
> +#define BIT_FB1_DMA_DONE_INTEN BIT(19)
> +#define BIT_RXFF_INTEN BIT(18)
> +#define BIT_SOF_POL BIT(17)
> +#define BIT_SOF_INTEN BIT(16)
> +#define BIT_MCLKDIV (0xF << 12)
> +#define BIT_HSYNC_POL BIT(11)
> +#define BIT_CCIR_EN BIT(10)
> +#define BIT_MCLKEN BIT(9)
> +#define BIT_FCC BIT(8)
> +#define BIT_PACK_DIR BIT(7)
> +#define BIT_CLR_STATFIFO BIT(6)
> +#define BIT_CLR_RXFIFO BIT(5)
> +#define BIT_GCLK_MODE BIT(4)
> +#define BIT_INV_DATA BIT(3)
> +#define BIT_INV_PCLK BIT(2)
> +#define BIT_REDGE BIT(1)
> +#define BIT_PIXEL_BIT BIT(0)
> +
> +#define SHIFT_MCLKDIV 12
> +
> +/* control reg 3 */
> +#define BIT_FRMCNT (0xFFFF << 16)
> +#define BIT_FRMCNT_RST BIT(15)
> +#define BIT_DMA_REFLASH_RFF BIT(14)
> +#define BIT_DMA_REFLASH_SFF BIT(13)
> +#define BIT_DMA_REQ_EN_RFF BIT(12)
> +#define BIT_DMA_REQ_EN_SFF BIT(11)
> +#define BIT_STATFF_LEVEL (0x7 << 8)
> +#define BIT_HRESP_ERR_EN BIT(7)
> +#define BIT_RXFF_LEVEL (0x7 << 4)
> +#define BIT_TWO_8BIT_SENSOR BIT(3)
> +#define BIT_ZERO_PACK_EN BIT(2)
> +#define BIT_ECC_INT_EN BIT(1)
> +#define BIT_ECC_AUTO_EN BIT(0)
> +
> +#define SHIFT_FRMCNT 16
> +#define SHIFT_RXFIFO_LEVEL 4
> +
> +/* csi status reg */
> +#define BIT_ADDR_CH_ERR_INT BIT(28)
> +#define BIT_FIELD0_INT BIT(27)
> +#define BIT_FIELD1_INT BIT(26)
> +#define BIT_SFF_OR_INT BIT(25)
> +#define BIT_RFF_OR_INT BIT(24)
> +#define BIT_DMA_TSF_DONE_SFF BIT(22)
> +#define BIT_STATFF_INT BIT(21)
> +#define BIT_DMA_TSF_DONE_FB2 BIT(20)
> +#define BIT_DMA_TSF_DONE_FB1 BIT(19)
> +#define BIT_RXFF_INT BIT(18)
> +#define BIT_EOF_INT BIT(17)
> +#define BIT_SOF_INT BIT(16)
> +#define BIT_F2_INT BIT(15)
> +#define BIT_F1_INT BIT(14)
> +#define BIT_COF_INT BIT(13)
> +#define BIT_HRESP_ERR_INT BIT(7)
> +#define BIT_ECC_INT BIT(1)
> +#define BIT_DRDY BIT(0)
> +
> +/* csi control reg 18 */
> +#define BIT_CSI_HW_ENABLE BIT(31)
> +#define BIT_MIPI_DATA_FORMAT_RAW8 (0x2a << 25)
> +#define BIT_MIPI_DATA_FORMAT_RAW10 (0x2b << 25)
> +#define BIT_MIPI_DATA_FORMAT_RAW12 (0x2c << 25)
> +#define BIT_MIPI_DATA_FORMAT_RAW14 (0x2d << 25)
> +#define BIT_MIPI_DATA_FORMAT_YUV422_8B (0x1e << 25)
> +#define BIT_MIPI_DATA_FORMAT_MASK (0x3F << 25)
> +#define BIT_MIPI_DATA_FORMAT_OFFSET 25
> +#define BIT_DATA_FROM_MIPI BIT(22)
> +#define BIT_MIPI_YU_SWAP BIT(21)
> +#define BIT_MIPI_DOUBLE_CMPNT BIT(20)
> +#define BIT_BASEADDR_CHG_ERR_EN BIT(9)
> +#define BIT_BASEADDR_SWITCH_SEL BIT(5)
> +#define BIT_BASEADDR_SWITCH_EN BIT(4)
> +#define BIT_PARALLEL24_EN BIT(3)
> +#define BIT_DEINTERLACE_EN BIT(2)
> +#define BIT_TVDECODER_IN_EN BIT(1)
> +#define BIT_NTSC_EN BIT(0)
> +
> +#define CSI_MCLK_VF 1
> +#define CSI_MCLK_ENC 2
> +#define CSI_MCLK_RAW 4
> +#define CSI_MCLK_I2C 8
> +
> +#define CSI_CSICR1 0x0
> +#define CSI_CSICR2 0x4
> +#define CSI_CSICR3 0x8
> +#define CSI_STATFIFO 0xC
> +#define CSI_CSIRXFIFO 0x10
> +#define CSI_CSIRXCNT 0x14
> +#define CSI_CSISR 0x18
> +
> +#define CSI_CSIDBG 0x1C
> +#define CSI_CSIDMASA_STATFIFO 0x20
> +#define CSI_CSIDMATS_STATFIFO 0x24
> +#define CSI_CSIDMASA_FB1 0x28
> +#define CSI_CSIDMASA_FB2 0x2C
> +#define CSI_CSIFBUF_PARA 0x30
> +#define CSI_CSIIMAG_PARA 0x34
> +
> +#define CSI_CSICR18 0x48
> +#define CSI_CSICR19 0x4c
> +
> +struct imx7_csi {
> + struct device *dev;
> + struct imx_media_dev *md;
> + struct v4l2_subdev sd;
> + struct imx_media_video_dev *vdev;
> + struct imx_media_dev *imxmd;
> + struct media_pad pad[IMX7_CSI_PADS_NUM];
> +
> + struct mutex lock;
> + spinlock_t irqlock;
> +
> + struct v4l2_subdev *src_sd;
> +
> + struct media_entity *sink;
> +
> + struct v4l2_fwnode_endpoint upstream_ep;
> +
> + struct v4l2_mbus_framefmt format_mbus[IMX7_CSI_PADS_NUM];
> + const struct imx_media_pixfmt *cc[IMX7_CSI_PADS_NUM];
> + struct v4l2_fract frame_interval[IMX7_CSI_PADS_NUM];
> +
> + struct v4l2_ctrl_handler ctrl_hdlr;
> +
> + void __iomem *regbase;
> + int irq;
> +
> + struct clk *clk_disp_axi;
> + struct clk *clk_disp_dcic;
> + struct clk *clk_csi_mclk;
> +
> + /* active vb2 buffers to send to video dev sink */
> + struct imx_media_buffer *active_vb2_buf[2];
> + struct imx_media_dma_buf underrun_buf;
> +
> + int buf_num;
> + u32 frame_sequence;
> +
> + bool last_eof;
> + bool is_init;
> + bool is_streaming;
> + bool is_csi2;
> +
> + struct completion last_eof_completion;
> +};
> +
> +#define imx7_csi_reg_read(_csi, _offset) __raw_readl(_csi->regbase + _offset)
> +#define imx7_csi_reg_write(_csi, _val, _offset) \
> + __raw_writel(_val, _csi->regbase + _offset)
> +
> +static void imx7_csi_clk_enable(struct imx7_csi *csi)
> +{
> + clk_prepare_enable(csi->clk_disp_axi);
> + clk_prepare_enable(csi->clk_disp_dcic);
> + clk_prepare_enable(csi->clk_csi_mclk);
Could you use clk_bulk?prepare_enable()? Same below in ...clk_disable().
> +}
> +
> +static void imx7_csi_clk_disable(struct imx7_csi *csi)
> +{
> + clk_disable_unprepare(csi->clk_csi_mclk);
> + clk_disable_unprepare(csi->clk_disp_dcic);
> + clk_disable_unprepare(csi->clk_disp_axi);
> +}
> +
> +static void imx7_csi_hw_reset(struct imx7_csi *csi)
> +{
> + imx7_csi_reg_write(csi,
> + imx7_csi_reg_read(csi, CSI_CSICR3) | BIT_FRMCNT_RST,
> + CSI_CSICR3);
> +
> + imx7_csi_reg_write(csi, CSICR1_RESET_VAL, CSI_CSICR1);
> + imx7_csi_reg_write(csi, CSICR2_RESET_VAL, CSI_CSICR2);
> + imx7_csi_reg_write(csi, CSICR3_RESET_VAL, CSI_CSICR3);
> +}
> +
> +static unsigned long imx7_csi_irq_clear(struct imx7_csi *csi)
> +{
> + unsigned long isr;
> +
> + isr = imx7_csi_reg_read(csi, CSI_CSISR);
> + imx7_csi_reg_write(csi, isr, CSI_CSISR);
> +
> + return isr;
> +}
> +
> +static void imx7_csi_init_interface(struct imx7_csi *csi)
> +{
> + unsigned int val = 0;
> + unsigned int imag_para;
> +
> + val = BIT_SOF_POL | BIT_REDGE | BIT_GCLK_MODE | BIT_HSYNC_POL |
> + BIT_FCC | 1 << SHIFT_MCLKDIV | BIT_MCLKEN;
> + imx7_csi_reg_write(csi, val, CSI_CSICR1);
> +
> + imag_para = (800 << 16) | 600;
> + imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
> +
> + val = BIT_DMA_REFLASH_RFF;
> + imx7_csi_reg_write(csi, val, CSI_CSICR3);
> +}
> +
> +static void imx7_csi_hw_enable_irq(struct imx7_csi *csi)
> +{
> + unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> +
> + cr1 |= BIT_SOF_INTEN;
> + cr1 |= BIT_RFF_OR_INT;
> +
> + /* still capture needs DMA interrupt */
> + cr1 |= BIT_FB1_DMA_DONE_INTEN;
> + cr1 |= BIT_FB2_DMA_DONE_INTEN;
> +
> + cr1 |= BIT_EOF_INT_EN;
> +
> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
> +}
> +
> +static void imx7_csi_hw_disable_irq(struct imx7_csi *csi)
> +{
> + unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> +
> + cr1 &= ~BIT_SOF_INTEN;
> + cr1 &= ~BIT_RFF_OR_INT;
> + cr1 &= ~BIT_FB1_DMA_DONE_INTEN;
> + cr1 &= ~BIT_FB2_DMA_DONE_INTEN;
> + cr1 &= ~BIT_EOF_INT_EN;
> +
> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
> +}
> +
> +static void imx7_csi_hw_enable(struct imx7_csi *csi)
> +{
> + unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
> +
> + cr |= BIT_CSI_HW_ENABLE;
> +
> + imx7_csi_reg_write(csi, cr, CSI_CSICR18);
> +}
> +
> +static void imx7_csi_hw_disable(struct imx7_csi *csi)
> +{
> + unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
> +
> + cr &= ~BIT_CSI_HW_ENABLE;
> +
> + imx7_csi_reg_write(csi, cr, CSI_CSICR18);
> +}
> +
> +static void imx7_csi_dma_reflash(struct imx7_csi *csi)
> +{
> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR18);
> +
> + cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
> + cr3 |= BIT_DMA_REFLASH_RFF;
> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
> +}
> +
> +static void imx7_csi_rx_fifo_clear(struct imx7_csi *csi)
> +{
> + unsigned long cr1;
> +
> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> + imx7_csi_reg_write(csi, cr1 & ~BIT_FCC, CSI_CSICR1);
> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> + imx7_csi_reg_write(csi, cr1 | BIT_CLR_RXFIFO, CSI_CSICR1);
> +
> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> + imx7_csi_reg_write(csi, cr1 | BIT_FCC, CSI_CSICR1);
> +}
> +
> +static void imx7_csi_buf_stride_set(struct imx7_csi *csi, u32 stride)
> +{
> + imx7_csi_reg_write(csi, stride, CSI_CSIFBUF_PARA);
> +}
> +
> +static void imx7_csi_deinterlace_enable(struct imx7_csi *csi, bool enable)
> +{
> + unsigned long cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
> +
> + if (enable)
> + cr18 |= BIT_DEINTERLACE_EN;
> + else
> + cr18 &= ~BIT_DEINTERLACE_EN;
> +
> + imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
> +}
> +
> +static void imx7_csi_dmareq_rff_enable(struct imx7_csi *csi)
> +{
> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
> + unsigned long cr2 = imx7_csi_reg_read(csi, CSI_CSICR2);
> +
> + /* Burst Type of DMA Transfer from RxFIFO. INCR16 */
> + cr2 |= 0xC0000000;
> +
> + cr3 |= BIT_DMA_REQ_EN_RFF;
> + cr3 |= BIT_HRESP_ERR_EN;
> + cr3 &= ~BIT_RXFF_LEVEL;
> + cr3 |= 0x2 << 4;
> +
> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
> + imx7_csi_reg_write(csi, cr2, CSI_CSICR2);
> +}
> +
> +static void imx7_csi_dmareq_rff_disable(struct imx7_csi *csi)
> +{
> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
> +
> + cr3 &= ~BIT_DMA_REQ_EN_RFF;
> + cr3 &= ~BIT_HRESP_ERR_EN;
> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
> +}
> +
> +static void imx7_csi_set_imagpara(struct imx7_csi *csi, int width, int height)
> +{
> + int imag_para;
> + int rx_count;
> +
> + rx_count = (width * height) >> 2;
> + imx7_csi_reg_write(csi, rx_count, CSI_CSIRXCNT);
> +
> + imag_para = (width << 16) | height;
> + imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
> +
> + /* reflash the embedded DMA controller */
> + imx7_csi_dma_reflash(csi);
> +}
> +
> +static void imx7_csi_sw_reset(struct imx7_csi *csi)
> +{
> + imx7_csi_hw_disable(csi);
> +
> + imx7_csi_rx_fifo_clear(csi);
> +
> + imx7_csi_dma_reflash(csi);
> +
> + usleep_range(2000, 3000);
> +
> + imx7_csi_irq_clear(csi);
> +
> + imx7_csi_hw_enable(csi);
> +}
> +
> +static void imx7_csi_error_recovery(struct imx7_csi *csi)
> +{
> + imx7_csi_hw_disable(csi);
> +
> + imx7_csi_rx_fifo_clear(csi);
> +
> + imx7_csi_dma_reflash(csi);
> +
> + imx7_csi_hw_enable(csi);
> +}
> +
> +static void imx7_csi_init(struct imx7_csi *csi)
> +{
> + if (csi->is_init)
> + return;
> +
> + imx7_csi_clk_enable(csi);
> + imx7_csi_hw_reset(csi);
> + imx7_csi_init_interface(csi);
> + imx7_csi_dmareq_rff_enable(csi);
> +
> + csi->is_init = true;
> +}
> +
> +static void imx7_csi_deinit(struct imx7_csi *csi)
> +{
> + if (!csi->is_init)
> + return;
> +
> + imx7_csi_hw_reset(csi);
> + imx7_csi_init_interface(csi);
> + imx7_csi_dmareq_rff_disable(csi);
> + imx7_csi_clk_disable(csi);
> +
> + csi->is_init = false;
> +}
> +
> +static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi,
> + struct v4l2_fwnode_endpoint *ep,
> + bool skip_mux)
> +{
> + struct device_node *endpoint, *port;
> + struct media_entity *src;
> + struct v4l2_subdev *sd;
> + struct media_pad *pad;
> +
> + if (!csi->src_sd)
> + return -EPIPE;
> +
> + src = &csi->src_sd->entity;
> +
> +skip_video_mux:
> + /* get source pad of entity directly upstream from src */
> + pad = imx_media_find_upstream_pad(csi->md, src, 0);
> + if (IS_ERR(pad))
> + return PTR_ERR(pad);
> +
> + sd = media_entity_to_v4l2_subdev(pad->entity);
> +
> + /* To get bus type we may need to skip video mux */
> + if (skip_mux && src->function == MEDIA_ENT_F_VID_MUX) {
> + src = &sd->entity;
> + goto skip_video_mux;
> + }
> +
> + /*
> + * NOTE: this assumes an OF-graph port id is the same as a
> + * media pad index.
> + */
> + port = of_graph_get_port_by_id(sd->dev->of_node, pad->index);
> + if (!port)
> + return -ENODEV;
> +
> + endpoint = of_get_next_child(port, NULL);
> + of_node_put(port);
> + if (!endpoint)
> + return -ENODEV;
> +
> + v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep);
I'd suggest to set the bus type before calling this. And do zero the rest of
the struct as well (or put defaults in); otherwise you'll get unexpected
results back.
Just wondering... this seems complicated. What's the exact problem this
function is intended to address?
> + of_node_put(endpoint);
> +
> + return 0;
> +}
> +
> +static int imx7_csi_link_setup(struct media_entity *entity,
> + const struct media_pad *local,
> + const struct media_pad *remote, u32 flags)
> +{
> + struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + struct v4l2_subdev *remote_sd;
> + int ret = 0;
> +
> + dev_dbg(csi->dev, "link setup %s -> %s\n", remote->entity->name,
> + local->entity->name);
> +
> + mutex_lock(&csi->lock);
> +
> + if (local->flags & MEDIA_PAD_FL_SINK) {
> + if (!is_media_entity_v4l2_subdev(remote->entity)) {
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + remote_sd = media_entity_to_v4l2_subdev(remote->entity);
> +
> + if (flags & MEDIA_LNK_FL_ENABLED) {
> + if (csi->src_sd) {
> + ret = -EBUSY;
> + goto unlock;
> + }
> + csi->src_sd = remote_sd;
> + } else {
> + csi->src_sd = NULL;
> + }
> +
> + goto init;
> + }
> +
> + /* source pad */
> + if (flags & MEDIA_LNK_FL_ENABLED) {
> + if (csi->sink) {
> + ret = -EBUSY;
> + goto unlock;
> + }
> + csi->sink = remote->entity;
> + } else {
> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
> + v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
> + csi->sink = NULL;
> + }
> +
> +init:
> + if (csi->sink || csi->src_sd)
> + imx7_csi_init(csi);
> + else
> + imx7_csi_deinit(csi);
> +
> +unlock:
> + mutex_unlock(&csi->lock);
> +
> + return ret;
> +}
> +
> +static int imx7_csi_pad_link_validate(struct v4l2_subdev *sd,
> + struct media_link *link,
> + struct v4l2_subdev_format *source_fmt,
> + struct v4l2_subdev_format *sink_fmt)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + struct v4l2_fwnode_endpoint upstream_ep;
> + int ret;
> +
> + ret = v4l2_subdev_link_validate_default(sd, link, source_fmt, sink_fmt);
> + if (ret)
> + return ret;
> +
> + ret = imx7_csi_get_upstream_endpoint(csi, &upstream_ep, true);
> + if (ret) {
> + v4l2_err(&csi->sd, "failed to find upstream endpoint\n");
> + return ret;
> + }
> +
> + mutex_lock(&csi->lock);
> +
> + csi->upstream_ep = upstream_ep;
> + csi->is_csi2 = (upstream_ep.bus_type == V4L2_MBUS_CSI2_DPHY);
> +
> + mutex_unlock(&csi->lock);
> +
> + return 0;
> +}
> +
> +static void imx7_csi_update_buf(struct imx7_csi *csi, dma_addr_t phys,
> + int buf_num)
> +{
> + if (buf_num == 1)
> + imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB2);
> + else
> + imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB1);
> +}
> +
> +static void imx7_csi_setup_vb2_buf(struct imx7_csi *csi)
> +{
> + struct imx_media_video_dev *vdev = csi->vdev;
> + struct imx_media_buffer *buf;
> + struct vb2_buffer *vb2_buf;
> + dma_addr_t phys[2];
> + int i;
> +
> + for (i = 0; i < 2; i++) {
> + buf = imx_media_capture_device_next_buf(vdev);
> + if (buf) {
> + csi->active_vb2_buf[i] = buf;
> + vb2_buf = &buf->vbuf.vb2_buf;
> + phys[i] = vb2_dma_contig_plane_dma_addr(vb2_buf, 0);
> + } else {
> + csi->active_vb2_buf[i] = NULL;
> + phys[i] = csi->underrun_buf.phys;
> + }
> +
> + imx7_csi_update_buf(csi, phys[i], i);
> + }
> +}
> +
> +static void imx7_csi_dma_unsetup_vb2_buf(struct imx7_csi *csi,
> + enum vb2_buffer_state return_status)
> +{
> + struct imx_media_buffer *buf;
> + int i;
> +
> + /* return any remaining active frames with return_status */
> + for (i = 0; i < 2; i++) {
> + buf = csi->active_vb2_buf[i];
> + if (buf) {
> + struct vb2_buffer *vb = &buf->vbuf.vb2_buf;
> +
> + vb->timestamp = ktime_get_ns();
> + vb2_buffer_done(vb, return_status);
> + }
> + }
> +}
> +
> +static void imx7_csi_vb2_buf_done(struct imx7_csi *csi)
> +{
> + struct imx_media_video_dev *vdev = csi->vdev;
> + struct imx_media_buffer *done, *next;
> + struct vb2_buffer *vb;
> + dma_addr_t phys;
> +
> + done = csi->active_vb2_buf[csi->buf_num];
> + if (done) {
> + done->vbuf.field = vdev->fmt.fmt.pix.field;
> + done->vbuf.sequence = csi->frame_sequence;
> + vb = &done->vbuf.vb2_buf;
> + vb->timestamp = ktime_get_ns();
> + vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
> + }
> + csi->frame_sequence++;
> +
> + /* get next queued buffer */
> + next = imx_media_capture_device_next_buf(vdev);
> + if (next) {
> + phys = vb2_dma_contig_plane_dma_addr(&next->vbuf.vb2_buf, 0);
> + csi->active_vb2_buf[csi->buf_num] = next;
> + } else {
> + phys = csi->underrun_buf.phys;
> + csi->active_vb2_buf[csi->buf_num] = NULL;
> + }
> +
> + imx7_csi_update_buf(csi, phys, csi->buf_num);
> +}
> +
> +static irqreturn_t imx7_csi_irq_handler(int irq, void *data)
> +{
> + struct imx7_csi *csi = data;
> + unsigned long status;
> +
> + spin_lock(&csi->irqlock);
> +
> + status = imx7_csi_irq_clear(csi);
> +
> + if (status & BIT_RFF_OR_INT) {
> + dev_warn(csi->dev, "Rx fifo overflow\n");
> + imx7_csi_error_recovery(csi);
> + }
> +
> + if (status & BIT_HRESP_ERR_INT) {
> + dev_warn(csi->dev, "Hresponse error detected\n");
> + imx7_csi_error_recovery(csi);
> + }
> +
> + if (status & BIT_ADDR_CH_ERR_INT) {
> + imx7_csi_hw_disable(csi);
> +
> + imx7_csi_dma_reflash(csi);
> +
> + imx7_csi_hw_enable(csi);
> + }
> +
> + if ((status & BIT_DMA_TSF_DONE_FB1) &&
> + (status & BIT_DMA_TSF_DONE_FB2)) {
> + /*
> + * For both FB1 and FB2 interrupter bits set case,
> + * CSI DMA is work in one of FB1 and FB2 buffer,
> + * but software can not know the state.
> + * Skip it to avoid base address updated
> + * when csi work in field0 and field1 will write to
> + * new base address.
> + */
> + } else if (status & BIT_DMA_TSF_DONE_FB1) {
> + csi->buf_num = 0;
> + } else if (status & BIT_DMA_TSF_DONE_FB2) {
> + csi->buf_num = 1;
> + }
> +
> + if ((status & BIT_DMA_TSF_DONE_FB1) ||
> + (status & BIT_DMA_TSF_DONE_FB2)) {
> + imx7_csi_vb2_buf_done(csi);
> +
> + if (csi->last_eof) {
> + complete(&csi->last_eof_completion);
> + csi->last_eof = false;
> + }
> + }
> +
> +
> + spin_unlock(&csi->irqlock);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int imx7_csi_dma_start(struct imx7_csi *csi)
> +{
> + struct imx_media_video_dev *vdev = csi->vdev;
> + struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
> + int ret;
> +
> + ret = imx_media_alloc_dma_buf(csi->md, &csi->underrun_buf,
> + out_pix->sizeimage);
> + if (ret < 0) {
> + v4l2_warn(&csi->sd, "consider increasing the CMA area\n");
> + return ret;
> + }
> +
> + csi->frame_sequence = 0;
> + csi->last_eof = false;
> + init_completion(&csi->last_eof_completion);
> +
> + imx7_csi_setup_vb2_buf(csi);
> +
> + return 0;
> +}
> +
> +static void imx7_csi_dma_stop(struct imx7_csi *csi)
> +{
> + unsigned long flags;
> + int ret;
> +
> + /* mark next EOF interrupt as the last before stream off */
> + spin_lock_irqsave(&csi->irqlock, flags);
> + csi->last_eof = true;
> + spin_unlock_irqrestore(&csi->irqlock, flags);
> +
> + /*
> + * and then wait for interrupt handler to mark completion.
> + */
> + ret = wait_for_completion_timeout(&csi->last_eof_completion,
> + msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
> + if (ret == 0)
> + v4l2_warn(&csi->sd, "wait last EOF timeout\n");
> +
> + imx7_csi_hw_disable_irq(csi);
> +
> + imx7_csi_dma_unsetup_vb2_buf(csi, VB2_BUF_STATE_ERROR);
> +
> + imx_media_free_dma_buf(csi->md, &csi->underrun_buf);
> +}
> +
> +static int imx7_csi_configure(struct imx7_csi *csi)
> +{
> + struct imx_media_video_dev *vdev = csi->vdev;
> + struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
> + __u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;
> + u32 cr1, cr18;
> +
> + if (out_pix->field == V4L2_FIELD_INTERLACED) {
> + imx7_csi_deinterlace_enable(csi, true);
> + imx7_csi_buf_stride_set(csi, out_pix->width);
> + } else {
> + imx7_csi_deinterlace_enable(csi, false);
> + imx7_csi_buf_stride_set(csi, 0);
> + }
> +
> + imx7_csi_set_imagpara(csi, out_pix->width, out_pix->height);
> +
> + if (!csi->is_csi2)
> + return 0;
> +
> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
> + cr1 &= ~BIT_GCLK_MODE;
> +
> + cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
> + cr18 &= BIT_MIPI_DATA_FORMAT_MASK;
> + cr18 |= BIT_DATA_FROM_MIPI;
> +
> + switch (out_pix->pixelformat) {
> + case V4L2_PIX_FMT_UYVY:
> + case V4L2_PIX_FMT_YUYV:
> + cr18 |= BIT_MIPI_DATA_FORMAT_YUV422_8B;
> + break;
> + case V4L2_PIX_FMT_SBGGR8:
> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW8;
> + break;
> + case V4L2_PIX_FMT_SBGGR16:
> + if (in_code == MEDIA_BUS_FMT_SBGGR10_1X10)
> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;
> + else if (in_code == MEDIA_BUS_FMT_SBGGR12_1X12)
> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;
> + else if (in_code == MEDIA_BUS_FMT_SBGGR14_1X14)
> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW14;
> + cr1 |= BIT_PIXEL_BIT;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
> + imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
> +
> + return 0;
> +}
> +
> +static int imx7_csi_enable(struct imx7_csi *csi)
> +{
> + imx7_csi_sw_reset(csi);
> +
> + if (csi->is_csi2) {
> + imx7_csi_dmareq_rff_enable(csi);
> + imx7_csi_hw_enable_irq(csi);
> + imx7_csi_hw_enable(csi);
> + return 0;
> + }
> +
> + return 0;
> +}
> +
> +static void imx7_csi_disable(struct imx7_csi *csi)
> +{
> + imx7_csi_dmareq_rff_disable(csi);
> +
> + imx7_csi_hw_disable_irq(csi);
> +
> + imx7_csi_buf_stride_set(csi, 0);
> +
> + imx7_csi_hw_disable(csi);
> +}
> +
> +static int imx7_csi_streaming_start(struct imx7_csi *csi)
> +{
> + int ret;
> +
> + ret = imx7_csi_dma_start(csi);
> + if (ret < 0)
> + return ret;
> +
> + ret = imx7_csi_configure(csi);
> + if (ret < 0)
> + goto dma_stop;
> +
> + imx7_csi_enable(csi);
> +
> + return 0;
> +
> +dma_stop:
> + imx7_csi_dma_stop(csi);
> +
> + return ret;
> +}
> +
> +static int imx7_csi_streaming_stop(struct imx7_csi *csi)
> +{
> + imx7_csi_dma_stop(csi);
> +
> + imx7_csi_disable(csi);
> +
> + return 0;
> +}
> +
> +static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + int ret = 0;
> +
> + mutex_lock(&csi->lock);
> +
> + if (!csi->src_sd || !csi->sink) {
> + ret = -EPIPE;
> + goto out_unlock;
> + }
> +
> + if (csi->is_streaming == !!enable)
> + goto out_unlock;
> +
> + if (enable) {
> + ret = v4l2_subdev_call(csi->src_sd, video, s_stream, 1);
> + if (ret < 0)
> + goto out_unlock;
> +
> + ret = imx7_csi_streaming_start(csi);
> + if (ret < 0) {
> + v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
> + goto out_unlock;
> + }
> + } else {
> + imx7_csi_streaming_stop(csi);
> +
> + v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
> + }
> +
> + csi->is_streaming = !!enable;
> +
> +out_unlock:
> + mutex_unlock(&csi->lock);
> +
> + return ret;
> +}
> +
> +static struct v4l2_mbus_framefmt *imx7_csi_get_format(struct imx7_csi *csi,
> + struct v4l2_subdev_pad_config *cfg,
> + unsigned int pad,
> + enum v4l2_subdev_format_whence which)
> +{
> + if (which == V4L2_SUBDEV_FORMAT_TRY)
> + return v4l2_subdev_get_try_format(&csi->sd, cfg, pad);
> +
> + return &csi->format_mbus[pad];
> +}
> +
> +static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,
> + struct v4l2_subdev_pad_config *cfg,
> + struct v4l2_subdev_mbus_code_enum *code)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + const struct imx_media_pixfmt *in_cc;
> + struct v4l2_mbus_framefmt *in_fmt;
> + int ret = 0;
> +
> + mutex_lock(&csi->lock);
> +
> + in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK, code->which);
> +
> + in_cc = imx_media_find_mbus_format(in_fmt->code, CS_SEL_ANY, true);
> +
> + switch (code->pad) {
> + case IMX7_CSI_PAD_SINK:
> + ret = imx_media_enum_mbus_format(&code->code, code->index,
> + CS_SEL_ANY, true);
> + break;
> + case IMX7_CSI_PAD_SRC:
> + if (code->index != 0) {
> + ret = -EINVAL;
> + goto out_unlock;
> + }
> +
> + code->code = in_fmt->code;
> + break;
> + default:
> + ret = -EINVAL;
> + }
> +
> +out_unlock:
> + mutex_unlock(&csi->lock);
> +
> + return ret;
> +}
> +
> +static int imx7_csi_get_fmt(struct v4l2_subdev *sd,
> + struct v4l2_subdev_pad_config *cfg,
> + struct v4l2_subdev_format *sdformat)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + struct v4l2_mbus_framefmt *fmt;
> + int ret = 0;
> +
> + if (sdformat->pad >= IMX7_CSI_PADS_NUM)
> + return -EINVAL;
The framework validates the pad indices already. You can drop this one.
> +
> + mutex_lock(&csi->lock);
> +
> + fmt = imx7_csi_get_format(csi, cfg, sdformat->pad, sdformat->which);
> + if (!fmt) {
> + ret = -EINVAL;
> + goto out_unlock;
> + }
> +
> + sdformat->format = *fmt;
> +
> +out_unlock:
> + mutex_unlock(&csi->lock);
> +
> + return ret;
> +}
> +
> +static void imx7_csi_try_fmt(struct imx7_csi *csi,
> + struct v4l2_subdev_pad_config *cfg,
> + struct v4l2_subdev_format *sdformat,
> + const struct imx_media_pixfmt **cc)
> +{
> + const struct imx_media_pixfmt *in_cc;
> + struct v4l2_mbus_framefmt *in_fmt;
> + u32 code;
> +
> + in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK,
> + sdformat->which);
> + if (!in_fmt)
> + return;
> +
> + switch (sdformat->pad) {
> + case IMX7_CSI_PAD_SRC:
> + in_cc = imx_media_find_mbus_format(in_fmt->code, CS_SEL_ANY,
> + true);
> +
> + sdformat->format.width = in_fmt->width;
> + sdformat->format.height = in_fmt->height;
> + sdformat->format.code = in_fmt->code;
> + *cc = in_cc;
> +
> + sdformat->format.colorspace = in_fmt->colorspace;
> + sdformat->format.xfer_func = in_fmt->xfer_func;
> + sdformat->format.quantization = in_fmt->quantization;
> + sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
> + break;
> + case IMX7_CSI_PAD_SINK:
> + *cc = imx_media_find_mbus_format(sdformat->format.code,
> + CS_SEL_ANY, true);
> + if (!*cc) {
> + imx_media_enum_mbus_format(&code, 0, CS_SEL_ANY, false);
> + *cc = imx_media_find_mbus_format(code, CS_SEL_ANY,
> + false);
> + sdformat->format.code = (*cc)->codes[0];
> + }
> +
> + imx_media_fill_default_mbus_fields(&sdformat->format, in_fmt,
> + false);
> + break;
> + default:
> + break;
> + }
> +}
> +
> +static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
> + struct v4l2_subdev_pad_config *cfg,
> + struct v4l2_subdev_format *sdformat)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + struct imx_media_video_dev *vdev = csi->vdev;
> + const struct imx_media_pixfmt *outcc;
> + struct v4l2_mbus_framefmt *outfmt;
> + struct v4l2_pix_format vdev_fmt;
> + const struct imx_media_pixfmt *cc;
> + struct v4l2_mbus_framefmt *fmt;
> + struct v4l2_subdev_format format;
> + int ret = 0;
> +
> + if (sdformat->pad >= IMX7_CSI_PADS_NUM)
> + return -EINVAL;
> +
> + mutex_lock(&csi->lock);
> +
> + if (csi->is_streaming) {
> + ret = -EBUSY;
> + goto out_unlock;
> + }
> +
> + imx7_csi_try_fmt(csi, cfg, sdformat, &cc);
> +
> + fmt = imx7_csi_get_format(csi, cfg, sdformat->pad, sdformat->which);
> + if (!fmt) {
> + ret = -EINVAL;
> + goto out_unlock;
> + }
> +
> + *fmt = sdformat->format;
> +
> + if (sdformat->pad == IMX7_CSI_PAD_SINK) {
> + /* propagate format to source pads */
> + format.pad = IMX7_CSI_PAD_SRC;
> + format.which = sdformat->which;
> + format.format = sdformat->format;
> + imx7_csi_try_fmt(csi, cfg, &format, &outcc);
> +
> + outfmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SRC,
> + sdformat->which);
> + *outfmt = format.format;
> +
> + if (sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
> + csi->cc[IMX7_CSI_PAD_SRC] = outcc;
> + }
> +
> + if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY)
> + goto out_unlock;
> +
> + csi->cc[sdformat->pad] = cc;
> +
> + /* propagate output pad format to capture device */
> + imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
> + &csi->format_mbus[IMX7_CSI_PAD_SRC],
> + csi->cc[IMX7_CSI_PAD_SRC]);
The user is expected to configure the format on the video device; the driver
needs to validate that when starting the stream.
> + mutex_unlock(&csi->lock);
> + imx_media_capture_device_set_format(vdev, &vdev_fmt);
> +
> + return 0;
> +
> +out_unlock:
> + mutex_unlock(&csi->lock);
> +
> + return ret;
> +}
> +
> +static int imx7_csi_registered(struct v4l2_subdev *sd)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + int ret;
> + int i;
> +
> + csi->md = dev_get_drvdata(sd->v4l2_dev->dev);
> +
> + for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
> + csi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?
> + MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
> +
> + /* set a default mbus format */
> + ret = imx_media_init_mbus_fmt(&csi->format_mbus[i],
> + 800, 600, 0, V4L2_FIELD_NONE,
> + &csi->cc[i]);
> + if (ret < 0)
> + return ret;
> +
> + /* init default frame interval */
> + csi->frame_interval[i].numerator = 1;
> + csi->frame_interval[i].denominator = 30;
> + }
> +
> + ret = media_entity_pads_init(&sd->entity, IMX7_CSI_PADS_NUM, csi->pad);
> + if (ret < 0)
> + return ret;
> +
> + ret = imx_media_capture_device_register(csi->vdev);
> + if (ret < 0)
> + return ret;
> +
> + ret = imx_media_add_video_device(csi->md, csi->vdev);
> + if (ret < 0) {
> + imx_media_capture_device_unregister(csi->vdev);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static void imx7_csi_unregistered(struct v4l2_subdev *sd)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> +
> + imx_media_capture_device_unregister(csi->vdev);
> +}
> +
> +static int imx7_csi_init_cfg(struct v4l2_subdev *sd,
> + struct v4l2_subdev_pad_config *cfg)
> +{
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> + struct v4l2_mbus_framefmt *mf;
> + int ret;
> + int i;
> +
> + for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
> + mf = v4l2_subdev_get_try_format(sd, cfg, i);
> +
> + ret = imx_media_init_mbus_fmt(mf, 800, 600, 0, V4L2_FIELD_NONE,
> + &csi->cc[i]);
> + if (ret < 0)
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static const struct media_entity_operations imx7_csi_entity_ops = {
> + .link_setup = imx7_csi_link_setup,
> + .link_validate = v4l2_subdev_link_validate,
> +};
> +
> +static const struct v4l2_subdev_video_ops imx7_csi_video_ops = {
> + .s_stream = imx7_csi_s_stream,
> +};
> +
> +static const struct v4l2_subdev_pad_ops imx7_csi_pad_ops = {
> + .init_cfg = imx7_csi_init_cfg,
> + .enum_mbus_code = imx7_csi_enum_mbus_code,
> + .get_fmt = imx7_csi_get_fmt,
> + .set_fmt = imx7_csi_set_fmt,
> + .link_validate = imx7_csi_pad_link_validate,
> +};
> +
> +static const struct v4l2_subdev_ops imx7_csi_subdev_ops = {
> + .video = &imx7_csi_video_ops,
> + .pad = &imx7_csi_pad_ops,
> +};
> +
> +static const struct v4l2_subdev_internal_ops imx7_csi_internal_ops = {
> + .registered = imx7_csi_registered,
> + .unregistered = imx7_csi_unregistered,
> +};
> +
> +static int imx7_csi_parse_endpoint(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd)
> +{
> + return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL;
> +}
> +
> +static int imx7_csi_parse_dt(struct imx7_csi *csi)
> +{
> + struct device *dev = csi->dev;
> +
> + csi->clk_disp_axi = devm_clk_get(dev, "axi");
> + if (IS_ERR(csi->clk_disp_axi)) {
> + dev_err(dev, "Could not get csi axi clock\n");
> + return -ENODEV;
> + }
> +
> + csi->clk_disp_dcic = devm_clk_get(dev, "dcic");
> + if (IS_ERR(csi->clk_disp_dcic)) {
> + dev_err(dev, "Could not get disp dcic clock\n");
> + return -ENODEV;
> + }
> +
> + csi->clk_csi_mclk = devm_clk_get(dev, "mclk");
> + if (IS_ERR(csi->clk_csi_mclk)) {
> + dev_err(dev, "Could not get csi mclk clock\n");
> + return -ENODEV;
> + }
Could you use devm_clk_bulk_get()?
> +
> + return 0;
> +}
> +
> +static int imx7_csi_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *node = dev->of_node;
> + struct imx7_csi *csi;
> + struct resource *res;
> + int ret;
> +
> + csi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL);
> + if (!csi)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, &csi->sd);
> + csi->dev = dev;
> +
> + ret = imx7_csi_parse_dt(csi);
> + if (ret < 0)
> + return -ENODEV;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + csi->irq = platform_get_irq(pdev, 0);
> + if (!res || csi->irq < 0) {
> + dev_err(dev, "Missing platform resources data\n");
> + return -ENODEV;
> + }
> +
> + csi->regbase = devm_ioremap_resource(dev, res);
> + if (IS_ERR(csi->regbase)) {
> + dev_err(dev, "Failed platform resources map\n");
> + return -ENODEV;
> + }
> +
> + spin_lock_init(&csi->irqlock);
> + mutex_init(&csi->lock);
> +
> + /* install interrupt handler */
> + ret = devm_request_irq(dev, csi->irq, imx7_csi_irq_handler, 0, "csi",
> + (void *)csi);
> + if (ret < 0) {
> + dev_err(dev, "Request CSI IRQ failed.\n");
> + return -ENODEV;
mutex_destroy(); better to add a label below.
> + }
> +
> + /* add media device */
> + csi->imxmd = imx_media_dev_init(dev);
> + if (IS_ERR(csi->imxmd))
> + return PTR_ERR(csi->imxmd);
> +
> + ret = imx_media_of_add_csi(csi->imxmd, node);
> + if (ret < 0)
> + goto media_cleanup;
> +
> + ret = imx_media_dev_notifier_register(csi->imxmd);
> + if (ret < 0)
> + goto media_cleanup;
> +
> + v4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);
> + v4l2_set_subdevdata(&csi->sd, csi);
> + csi->sd.internal_ops = &imx7_csi_internal_ops;
> + csi->sd.entity.ops = &imx7_csi_entity_ops;
> + csi->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
> + csi->sd.dev = &pdev->dev;
> + csi->sd.owner = THIS_MODULE;
> + csi->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
> + csi->sd.grp_id = IMX_MEDIA_GRP_ID_CSI;
> + snprintf(csi->sd.name, sizeof(csi->sd.name), "csi");
> +
> + csi->vdev = imx_media_capture_device_init(&csi->sd, IMX7_CSI_PAD_SRC);
> + if (IS_ERR(csi->vdev))
> + return PTR_ERR(csi->vdev);
> +
> + v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
> + csi->sd.ctrl_handler = &csi->ctrl_hdlr;
> +
> + ret = v4l2_async_register_fwnode_subdev(&csi->sd,
> + sizeof(struct v4l2_async_subdev),
> + NULL, 0, imx7_csi_parse_endpoint);
> + if (ret)
> + goto free;
> +
> + return 0;
> +
> +free:
> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
> + mutex_destroy(&csi->lock);
> + imx_media_capture_device_remove(csi->vdev);
> +
> +media_cleanup:
> + imx_media_dev_cleanup(csi->imxmd);
> +
> + return ret;
> +}
> +
> +static int imx7_csi_remove(struct platform_device *pdev)
> +{
> + struct v4l2_subdev *sd = platform_get_drvdata(pdev);
> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
> +
> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
> + mutex_destroy(&csi->lock);
Please unregister the devices before the two above lines.
> + imx_media_capture_device_remove(csi->vdev);
> + imx_media_dev_notifier_unregister(csi->imxmd);
> + imx_media_dev_cleanup(csi->imxmd);
> + media_entity_cleanup(&sd->entity);
> + v4l2_async_unregister_subdev(sd);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id imx7_csi_of_match[] = {
> + { .compatible = "fsl,imx7-csi" },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, imx7_csi_of_match);
> +
> +static struct platform_driver imx7_csi_driver = {
> + .probe = imx7_csi_probe,
> + .remove = imx7_csi_remove,
> + .driver = {
> + .of_match_table = imx7_csi_of_match,
> + .name = "imx7-csi",
> + },
> +};
> +module_platform_driver(imx7_csi_driver);
> +
> +MODULE_DESCRIPTION("i.MX7 CSI subdev driver");
> +MODULE_AUTHOR("Rui Miguel Silva <rui.silva@linaro.org>");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:imx7-csi");
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 01/12] media: staging/imx: refactor imx media device probe
2018-11-21 11:15 ` [PATCH v8 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
@ 2018-11-21 22:40 ` kbuild test robot
0 siblings, 0 replies; 22+ messages in thread
From: kbuild test robot @ 2018-11-21 22:40 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: kbuild-all, sakari.ailus, Philipp Zabel, linux-media, devel,
devicetree, Greg Kroah-Hartman, Rui Miguel Silva
[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]
Hi Rui,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v4.20-rc3 next-20181121]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Rui-Miguel-Silva/media-staging-imx7-add-i-MX7-media-driver/20181122-024200
base: git://linuxtv.org/media_tree.git master
config: i386-allmodconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
>> make[5]: *** No rule to make target 'drivers/staging/media/imx/imx-media-dev-common.o', needed by 'drivers/staging/media/imx/imx-media.o'.
make[5]: Target '__build' not remade because of errors.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 66015 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7
2018-11-21 11:15 ` [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
@ 2018-11-21 22:54 ` kbuild test robot
2018-11-21 22:54 ` [PATCH] media: staging/imx7: fix platform_no_drv_owner.cocci warnings kbuild test robot
1 sibling, 0 replies; 22+ messages in thread
From: kbuild test robot @ 2018-11-21 22:54 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: kbuild-all, sakari.ailus, Philipp Zabel, linux-media, devel,
devicetree, Greg Kroah-Hartman, Rui Miguel Silva
Hi Rui,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v4.20-rc3 next-20181121]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Rui-Miguel-Silva/media-staging-imx7-add-i-MX7-media-driver/20181122-024200
base: git://linuxtv.org/media_tree.git master
coccinelle warnings: (new ones prefixed by >>)
>> drivers/staging/media/imx/imx7-mipi-csis.c:1125:3-8: No need to set .owner here. The core will do it.
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] media: staging/imx7: fix platform_no_drv_owner.cocci warnings
2018-11-21 11:15 ` [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
2018-11-21 22:54 ` kbuild test robot
@ 2018-11-21 22:54 ` kbuild test robot
1 sibling, 0 replies; 22+ messages in thread
From: kbuild test robot @ 2018-11-21 22:54 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: kbuild-all, sakari.ailus, Philipp Zabel, linux-media, devel,
devicetree, Greg Kroah-Hartman, Rui Miguel Silva
From: kbuild test robot <fengguang.wu@intel.com>
drivers/staging/media/imx/imx7-mipi-csis.c:1125:3-8: No need to set .owner here. The core will do it.
Remove .owner field if calls are used which set it automatically
Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci
Fixes: 181331ab8acb ("media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7")
CC: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: kbuild test robot <fengguang.wu@intel.com>
---
url: https://github.com/0day-ci/linux/commits/Rui-Miguel-Silva/media-staging-imx7-add-i-MX7-media-driver/20181122-024200
base: git://linuxtv.org/media_tree.git master
imx7-mipi-csis.c | 1 -
1 file changed, 1 deletion(-)
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -1122,7 +1122,6 @@ static struct platform_driver mipi_csis_
.driver = {
.of_match_table = mipi_csis_of_match,
.name = CSIS_DRIVER_NAME,
- .owner = THIS_MODULE,
.pm = &mipi_csis_pm_ops,
},
};
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver
2018-11-21 11:53 ` [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Hans Verkuil
@ 2018-11-22 9:38 ` Rui Miguel Silva
0 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-22 9:38 UTC (permalink / raw)
To: Hans Verkuil
Cc: sakari.ailus, Philipp Zabel, linux-media, devel, devicetree,
Greg Kroah-Hartman
Hi Hans,
On Wed 21 Nov 2018 at 11:53, Hans Verkuil wrote:
> On 11/21/2018 12:15 PM, Rui Miguel Silva wrote:
>> Hi,
>> This series introduces the Media driver to work with the i.MX7
>> SoC. it uses the
>> already existing imx media core drivers but since the i.MX7,
>> contrary to
>> i.MX5/6, do not have an IPU and because of that some changes in
>> the imx media
>> core are made along this series to make it support that case.
>
> Can you run scripts/checkpatch.pl --strict over these patches? I
> get too
> many messages from it. Most should be easy to fix.
Yeah, I will fix as much as I think is sane, some I will leave it
to
make code more readable.
---
Cheers,
Rui
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver
2018-11-21 22:16 ` Sakari Ailus
@ 2018-11-22 9:42 ` Rui Miguel Silva
0 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-22 9:42 UTC (permalink / raw)
To: Sakari Ailus
Cc: Philipp Zabel, linux-media, devel, devicetree, Greg Kroah-Hartman
Hi Sakari,
On Wed 21 Nov 2018 at 22:16, Sakari Ailus wrote:
> Hi Rui,
>
> On Wed, Nov 21, 2018 at 11:15:51AM +0000, Rui Miguel Silva
> wrote:
>> Add bindings documentation for i.MX7 media drivers.
>> The imx7 MIPI CSI2 and imx7 CMOS Sensor Interface.
>>
>> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
>> Reviewed-by: Rob Herring <robh@kernel.org>
>> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>> ---
>> .../devicetree/bindings/media/imx7-csi.txt | 45 ++++++++++
>> .../bindings/media/imx7-mipi-csi2.txt | 90
>> +++++++++++++++++++
>> 2 files changed, 135 insertions(+)
>> create mode 100644
>> Documentation/devicetree/bindings/media/imx7-csi.txt
>> create mode 100644
>> Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
>>
>> diff --git
>> a/Documentation/devicetree/bindings/media/imx7-csi.txt
>> b/Documentation/devicetree/bindings/media/imx7-csi.txt
>> new file mode 100644
>> index 000000000000..171b089ee91f
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
>> @@ -0,0 +1,45 @@
>> +Freescale i.MX7 CMOS Sensor Interface
>> +=====================================
>> +
>> +csi node
>> +--------
>> +
>> +This is device node for the CMOS Sensor Interface (CSI) which
>> enables the chip
>> +to connect directly to external CMOS image sensors.
>> +
>> +Required properties:
>> +
>> +- compatible : "fsl,imx7-csi";
>> +- reg : base address and length of the register set
>> for the device;
>> +- interrupts : should contain CSI interrupt;
>> +- clocks : list of clock specifiers, see
>> +
>> Documentation/devicetree/bindings/clock/clock-bindings.txt for
>> details;
>> +- clock-names : must contain "axi", "mclk" and "dcic"
>> entries, matching
>> + entries in the clock property;
>> +
>> +The device node shall contain one 'port' child node with one
>> child 'endpoint'
>> +node, according to the bindings defined in:
>> + Documentation/devicetree/bindings/media/video-interfaces.txt.
>> +
>> +In the following example a remote endpoint is a video
>> multiplexer.
>> +
>> +example:
>> +
>> + csi: csi@30710000 {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + compatible = "fsl,imx7-csi";
>> + reg = <0x30710000 0x10000>;
>> + interrupts = <GIC_SPI 7
>> IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&clks IMX7D_CLK_DUMMY>,
>> + <&clks
>> IMX7D_CSI_MCLK_ROOT_CLK>,
>> + <&clks
>> IMX7D_CLK_DUMMY>;
>> + clock-names = "axi", "mclk", "dcic";
>> +
>> + port {
>> + csi_from_csi_mux: endpoint {
>> + remote-endpoint =
>> <&csi_mux_to_csi>;
>> + };
>> + };
>> + };
>> diff --git
>> a/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
>> b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
>> new file mode 100644
>> index 000000000000..71fd74ed3ec8
>> --- /dev/null
>> +++
>> b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
>> @@ -0,0 +1,90 @@
>> +Freescale i.MX7 Mipi CSI2
>> +=========================
>> +
>> +mipi_csi2 node
>> +--------------
>> +
>> +This is the device node for the MIPI CSI-2 receiver core in
>> i.MX7 SoC. It is
>> +compatible with previous version of Samsung D-phy.
>> +
>> +Required properties:
>> +
>> +- compatible : "fsl,imx7-mipi-csi2";
>> +- reg : base address and length of the register set
>> for the device;
>> +- interrupts : should contain MIPI CSIS interrupt;
>> +- clocks : list of clock specifiers, see
>> +
>> Documentation/devicetree/bindings/clock/clock-bindings.txt for
>> details;
>> +- clock-names : must contain "pclk", "wrap" and "phy"
>> entries, matching
>> + entries in the clock property;
>> +- power-domains : a phandle to the power domain, see
>> +
>> Documentation/devicetree/bindings/power/power_domain.txt for
>> details.
>> +- reset-names : should include following entry "mrst";
>> +- resets : a list of phandle, should contain reset
>> entry of
>> + reset-names;
>> +- phy-supply : from the generic phy bindings, a phandle to
>> a regulator that
>> + provides power to MIPI CSIS core;
>> +
>> +Optional properties:
>> +
>> +- clock-frequency : The IP's main (system bus) clock frequency
>> in Hz, default
>> + value when this property is not specified is
>> 166 MHz;
>> +- fsl,csis-hs-settle : differential receiver (HS-RX) settle
>> time;
>> +
>> +The device node should contain two 'port' child nodes with one
>> child 'endpoint'
>> +node, according to the bindings defined in:
>> + Documentation/devicetree/bindings/
>> media/video-interfaces.txt.
>
> Extra space. The two lines are also prefixed by a space; is that
> intended?
Yes, that will be fix by going over the checkpatch strict.
>
>> + The following are properties specific to those nodes.
>> +
>> +port node
>> +---------
>> +
>> +- reg : (required) can take the values 0 or 1,
>> where 0 shall be
>> + related to the sink port and port 1 shall
>> be the source
>> + one;
>> +
>> +endpoint node
>> +-------------
>> +
>> +- data-lanes : (required) an array specifying active
>> physical MIPI-CSI2
>> + data input lanes and their mapping to logical
>> lanes; this
>> + shall only be applied to port 0 (sink
>> port), the array's
>> + content is unused only its length is
>> meaningful,
>> + in this case the maximum length supported
>> is 2;
>
> How about the port 1? Is there anything to configure there (I'm
> not saying
> there is, just wondering)?
maybe the virtual channel, but for now only 0 is supported. if
late we
get to support more, maybe use the same schema as imx6, one port
per vc.
---
Cheers,
Rui
>
>> +
>> +example:
>> +
>> + mipi_csi: mipi-csi@30750000 {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + compatible = "fsl,imx7-mipi-csi2";
>> + reg = <0x30750000 0x10000>;
>> + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&clks IMX7D_IPG_ROOT_CLK>,
>> + <&clks
>> IMX7D_MIPI_CSI_ROOT_CLK>,
>> + <&clks
>> IMX7D_MIPI_DPHY_ROOT_CLK>;
>> + clock-names = "pclk", "wrap", "phy";
>> + clock-frequency = <166000000>;
>> + power-domains = <&pgc_mipi_phy>;
>> + phy-supply = <®_1p0d>;
>> + resets = <&src IMX7_RESET_MIPI_PHY_MRST>;
>> + reset-names = "mrst";
>> + fsl,csis-hs-settle = <3>;
>> +
>> + port@0 {
>> + reg = <0>;
>> +
>> + mipi_from_sensor: endpoint {
>> + remote-endpoint =
>> <&ov2680_to_mipi>;
>> + data-lanes = <1>;
>> + };
>> + };
>> +
>> + port@1 {
>> + reg = <1>;
>> +
>> + mipi_vc0_to_csi_mux: endpoint {
>> + remote-endpoint =
>> <&csi_mux_from_mipi_vc0>;
>> + };
>> + };
>> + };
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver
2018-11-21 22:29 ` Sakari Ailus
@ 2018-11-22 9:46 ` Rui Miguel Silva
0 siblings, 0 replies; 22+ messages in thread
From: Rui Miguel Silva @ 2018-11-22 9:46 UTC (permalink / raw)
To: Sakari Ailus
Cc: Philipp Zabel, linux-media, devel, devicetree, Greg Kroah-Hartman
Hi Sakari,
thanks for all the reviews.
On Wed 21 Nov 2018 at 22:29, Sakari Ailus wrote:
> Hi Rui,
>
> On Wed, Nov 21, 2018 at 11:15:49AM +0000, Rui Miguel Silva
> wrote:
>> This add the media entity subdevice and control driver for the
>> i.MX7
>> CMOS Sensor Interface.
>>
>> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
>> ---
>> drivers/staging/media/imx/Kconfig | 9 +-
>> drivers/staging/media/imx/Makefile | 2 +
>> drivers/staging/media/imx/imx7-media-csi.c | 1352
>> ++++++++++++++++++++
>> 3 files changed, 1362 insertions(+), 1 deletion(-)
>> create mode 100644 drivers/staging/media/imx/imx7-media-csi.c
>>
>> diff --git a/drivers/staging/media/imx/Kconfig
>> b/drivers/staging/media/imx/Kconfig
>> index bfc17de56b17..40a11f988fc6 100644
>> --- a/drivers/staging/media/imx/Kconfig
>> +++ b/drivers/staging/media/imx/Kconfig
>> @@ -11,7 +11,7 @@ config VIDEO_IMX_MEDIA
>> driver for the i.MX5/6 SOC.
>>
>> if VIDEO_IMX_MEDIA
>> -menu "i.MX5/6 Media Sub devices"
>> +menu "i.MX5/6/7 Media Sub devices"
>>
>> config VIDEO_IMX_CSI
>> tristate "i.MX5/6 Camera Sensor Interface driver"
>> @@ -20,5 +20,12 @@ config VIDEO_IMX_CSI
>> ---help---
>> A video4linux camera sensor interface driver for
>> i.MX5/6.
>>
>> +config VIDEO_IMX7_CSI
>> + tristate "i.MX7 Camera Sensor Interface driver"
>> + depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
>
> If you need V4L2 fwnode, you should select V4L2_FWNODE. (I
> ignore if it's
> already selected by VIDEO_IMX_MEDIA.)
Yes it is selected by VIDEO_IMX_MEDIA.
>
>> + default y
>> + ---help---
>> + A video4linux camera sensor interface driver for i.MX7.
>> +
>> endmenu
>> endif
>> diff --git a/drivers/staging/media/imx/Makefile
>> b/drivers/staging/media/imx/Makefile
>> index a30b3033f9a3..074f016d3519 100644
>> --- a/drivers/staging/media/imx/Makefile
>> +++ b/drivers/staging/media/imx/Makefile
>> @@ -12,3 +12,5 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA) +=
>> imx-media-ic.o
>>
>> obj-$(CONFIG_VIDEO_IMX_CSI) += imx-media-csi.o
>> obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
>> +
>> +obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
>> diff --git a/drivers/staging/media/imx/imx7-media-csi.c
>> b/drivers/staging/media/imx/imx7-media-csi.c
>> new file mode 100644
>> index 000000000000..ec5a20880bb6
>> --- /dev/null
>> +++ b/drivers/staging/media/imx/imx7-media-csi.c
>> @@ -0,0 +1,1352 @@
>> +// SPDX-License-Identifier: GPL
>> +/*
>> + * V4L2 Capture CSI Subdev for Freescale i.MX7 SOC
>> + *
>> + * Copyright (c) 2018 Linaro Ltd
>> + *
>> + */
>> +
>> +#include <linux/clk.h>
>> +#include <linux/delay.h>
>> +#include <linux/gcd.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/mfd/syscon.h>
>> +#include <linux/module.h>
>> +#include <linux/of_graph.h>
>> +#include <linux/pinctrl/consumer.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/regmap.h>
>> +#include <linux/types.h>
>> +
>> +#include <media/v4l2-ctrls.h>
>> +#include <media/v4l2-device.h>
>> +#include <media/v4l2-event.h>
>> +#include <media/v4l2-fwnode.h>
>> +#include <media/v4l2-mc.h>
>> +#include <media/v4l2-subdev.h>
>> +#include <media/videobuf2-dma-contig.h>
>> +
>> +#include <media/imx.h>
>> +#include "imx-media.h"
>> +
>> +#define IMX7_CSI_PAD_SINK 0
>> +#define IMX7_CSI_PAD_SRC 1
>> +#define IMX7_CSI_PADS_NUM 2
>> +
>> +/* reset values */
>> +#define CSICR1_RESET_VAL 0x40000800
>> +#define CSICR2_RESET_VAL 0x0
>> +#define CSICR3_RESET_VAL 0x0
>> +
>> +/* csi control reg 1 */
>> +#define BIT_SWAP16_EN BIT(31)
>> +#define BIT_EXT_VSYNC BIT(30)
>> +#define BIT_EOF_INT_EN BIT(29)
>> +#define BIT_PRP_IF_EN BIT(28)
>> +#define BIT_CCIR_MODE BIT(27)
>> +#define BIT_COF_INT_EN BIT(26)
>> +#define BIT_SF_OR_INTEN BIT(25)
>> +#define BIT_RF_OR_INTEN BIT(24)
>> +#define BIT_SFF_DMA_DONE_INTEN BIT(22)
>> +#define BIT_STATFF_INTEN BIT(21)
>> +#define BIT_FB2_DMA_DONE_INTEN BIT(20)
>> +#define BIT_FB1_DMA_DONE_INTEN BIT(19)
>> +#define BIT_RXFF_INTEN BIT(18)
>> +#define BIT_SOF_POL BIT(17)
>> +#define BIT_SOF_INTEN BIT(16)
>> +#define BIT_MCLKDIV (0xF << 12)
>> +#define BIT_HSYNC_POL BIT(11)
>> +#define BIT_CCIR_EN BIT(10)
>> +#define BIT_MCLKEN BIT(9)
>> +#define BIT_FCC BIT(8)
>> +#define BIT_PACK_DIR BIT(7)
>> +#define BIT_CLR_STATFIFO BIT(6)
>> +#define BIT_CLR_RXFIFO BIT(5)
>> +#define BIT_GCLK_MODE BIT(4)
>> +#define BIT_INV_DATA BIT(3)
>> +#define BIT_INV_PCLK BIT(2)
>> +#define BIT_REDGE BIT(1)
>> +#define BIT_PIXEL_BIT BIT(0)
>> +
>> +#define SHIFT_MCLKDIV 12
>> +
>> +/* control reg 3 */
>> +#define BIT_FRMCNT (0xFFFF << 16)
>> +#define BIT_FRMCNT_RST BIT(15)
>> +#define BIT_DMA_REFLASH_RFF BIT(14)
>> +#define BIT_DMA_REFLASH_SFF BIT(13)
>> +#define BIT_DMA_REQ_EN_RFF BIT(12)
>> +#define BIT_DMA_REQ_EN_SFF BIT(11)
>> +#define BIT_STATFF_LEVEL (0x7 << 8)
>> +#define BIT_HRESP_ERR_EN BIT(7)
>> +#define BIT_RXFF_LEVEL (0x7 << 4)
>> +#define BIT_TWO_8BIT_SENSOR BIT(3)
>> +#define BIT_ZERO_PACK_EN BIT(2)
>> +#define BIT_ECC_INT_EN BIT(1)
>> +#define BIT_ECC_AUTO_EN BIT(0)
>> +
>> +#define SHIFT_FRMCNT 16
>> +#define SHIFT_RXFIFO_LEVEL 4
>> +
>> +/* csi status reg */
>> +#define BIT_ADDR_CH_ERR_INT BIT(28)
>> +#define BIT_FIELD0_INT BIT(27)
>> +#define BIT_FIELD1_INT BIT(26)
>> +#define BIT_SFF_OR_INT BIT(25)
>> +#define BIT_RFF_OR_INT BIT(24)
>> +#define BIT_DMA_TSF_DONE_SFF BIT(22)
>> +#define BIT_STATFF_INT BIT(21)
>> +#define BIT_DMA_TSF_DONE_FB2 BIT(20)
>> +#define BIT_DMA_TSF_DONE_FB1 BIT(19)
>> +#define BIT_RXFF_INT BIT(18)
>> +#define BIT_EOF_INT BIT(17)
>> +#define BIT_SOF_INT BIT(16)
>> +#define BIT_F2_INT BIT(15)
>> +#define BIT_F1_INT BIT(14)
>> +#define BIT_COF_INT BIT(13)
>> +#define BIT_HRESP_ERR_INT BIT(7)
>> +#define BIT_ECC_INT BIT(1)
>> +#define BIT_DRDY BIT(0)
>> +
>> +/* csi control reg 18 */
>> +#define BIT_CSI_HW_ENABLE BIT(31)
>> +#define BIT_MIPI_DATA_FORMAT_RAW8 (0x2a << 25)
>> +#define BIT_MIPI_DATA_FORMAT_RAW10 (0x2b << 25)
>> +#define BIT_MIPI_DATA_FORMAT_RAW12 (0x2c << 25)
>> +#define BIT_MIPI_DATA_FORMAT_RAW14 (0x2d << 25)
>> +#define BIT_MIPI_DATA_FORMAT_YUV422_8B (0x1e << 25)
>> +#define BIT_MIPI_DATA_FORMAT_MASK (0x3F << 25)
>> +#define BIT_MIPI_DATA_FORMAT_OFFSET 25
>> +#define BIT_DATA_FROM_MIPI BIT(22)
>> +#define BIT_MIPI_YU_SWAP BIT(21)
>> +#define BIT_MIPI_DOUBLE_CMPNT BIT(20)
>> +#define BIT_BASEADDR_CHG_ERR_EN BIT(9)
>> +#define BIT_BASEADDR_SWITCH_SEL BIT(5)
>> +#define BIT_BASEADDR_SWITCH_EN BIT(4)
>> +#define BIT_PARALLEL24_EN BIT(3)
>> +#define BIT_DEINTERLACE_EN BIT(2)
>> +#define BIT_TVDECODER_IN_EN BIT(1)
>> +#define BIT_NTSC_EN BIT(0)
>> +
>> +#define CSI_MCLK_VF 1
>> +#define CSI_MCLK_ENC 2
>> +#define CSI_MCLK_RAW 4
>> +#define CSI_MCLK_I2C 8
>> +
>> +#define CSI_CSICR1 0x0
>> +#define CSI_CSICR2 0x4
>> +#define CSI_CSICR3 0x8
>> +#define CSI_STATFIFO 0xC
>> +#define CSI_CSIRXFIFO 0x10
>> +#define CSI_CSIRXCNT 0x14
>> +#define CSI_CSISR 0x18
>> +
>> +#define CSI_CSIDBG 0x1C
>> +#define CSI_CSIDMASA_STATFIFO 0x20
>> +#define CSI_CSIDMATS_STATFIFO 0x24
>> +#define CSI_CSIDMASA_FB1 0x28
>> +#define CSI_CSIDMASA_FB2 0x2C
>> +#define CSI_CSIFBUF_PARA 0x30
>> +#define CSI_CSIIMAG_PARA 0x34
>> +
>> +#define CSI_CSICR18 0x48
>> +#define CSI_CSICR19 0x4c
>> +
>> +struct imx7_csi {
>> + struct device *dev;
>> + struct imx_media_dev *md;
>> + struct v4l2_subdev sd;
>> + struct imx_media_video_dev *vdev;
>> + struct imx_media_dev *imxmd;
>> + struct media_pad pad[IMX7_CSI_PADS_NUM];
>> +
>> + struct mutex lock;
>> + spinlock_t irqlock;
>> +
>> + struct v4l2_subdev *src_sd;
>> +
>> + struct media_entity *sink;
>> +
>> + struct v4l2_fwnode_endpoint upstream_ep;
>> +
>> + struct v4l2_mbus_framefmt format_mbus[IMX7_CSI_PADS_NUM];
>> + const struct imx_media_pixfmt *cc[IMX7_CSI_PADS_NUM];
>> + struct v4l2_fract frame_interval[IMX7_CSI_PADS_NUM];
>> +
>> + struct v4l2_ctrl_handler ctrl_hdlr;
>> +
>> + void __iomem *regbase;
>> + int irq;
>> +
>> + struct clk *clk_disp_axi;
>> + struct clk *clk_disp_dcic;
>> + struct clk *clk_csi_mclk;
>> +
>> + /* active vb2 buffers to send to video dev sink */
>> + struct imx_media_buffer *active_vb2_buf[2];
>> + struct imx_media_dma_buf underrun_buf;
>> +
>> + int buf_num;
>> + u32 frame_sequence;
>> +
>> + bool last_eof;
>> + bool is_init;
>> + bool is_streaming;
>> + bool is_csi2;
>> +
>> + struct completion last_eof_completion;
>> +};
>> +
>> +#define imx7_csi_reg_read(_csi, _offset)
>> __raw_readl(_csi->regbase + _offset)
>> +#define imx7_csi_reg_write(_csi, _val, _offset) \
>> + __raw_writel(_val, _csi->regbase + _offset)
>> +
>> +static void imx7_csi_clk_enable(struct imx7_csi *csi)
>> +{
>> + clk_prepare_enable(csi->clk_disp_axi);
>> + clk_prepare_enable(csi->clk_disp_dcic);
>> + clk_prepare_enable(csi->clk_csi_mclk);
>
> Could you use clk_bulk?prepare_enable()? Same below in
> ...clk_disable().
Good point, will be in v9. Same below.
>
>> +}
>> +
>> +static void imx7_csi_clk_disable(struct imx7_csi *csi)
>> +{
>> + clk_disable_unprepare(csi->clk_csi_mclk);
>> + clk_disable_unprepare(csi->clk_disp_dcic);
>> + clk_disable_unprepare(csi->clk_disp_axi);
>> +}
>> +
>> +static void imx7_csi_hw_reset(struct imx7_csi *csi)
>> +{
>> + imx7_csi_reg_write(csi,
>> + imx7_csi_reg_read(csi, CSI_CSICR3) |
>> BIT_FRMCNT_RST,
>> + CSI_CSICR3);
>> +
>> + imx7_csi_reg_write(csi, CSICR1_RESET_VAL, CSI_CSICR1);
>> + imx7_csi_reg_write(csi, CSICR2_RESET_VAL, CSI_CSICR2);
>> + imx7_csi_reg_write(csi, CSICR3_RESET_VAL, CSI_CSICR3);
>> +}
>> +
>> +static unsigned long imx7_csi_irq_clear(struct imx7_csi *csi)
>> +{
>> + unsigned long isr;
>> +
>> + isr = imx7_csi_reg_read(csi, CSI_CSISR);
>> + imx7_csi_reg_write(csi, isr, CSI_CSISR);
>> +
>> + return isr;
>> +}
>> +
>> +static void imx7_csi_init_interface(struct imx7_csi *csi)
>> +{
>> + unsigned int val = 0;
>> + unsigned int imag_para;
>> +
>> + val = BIT_SOF_POL | BIT_REDGE | BIT_GCLK_MODE |
>> BIT_HSYNC_POL |
>> + BIT_FCC | 1 << SHIFT_MCLKDIV | BIT_MCLKEN;
>> + imx7_csi_reg_write(csi, val, CSI_CSICR1);
>> +
>> + imag_para = (800 << 16) | 600;
>> + imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
>> +
>> + val = BIT_DMA_REFLASH_RFF;
>> + imx7_csi_reg_write(csi, val, CSI_CSICR3);
>> +}
>> +
>> +static void imx7_csi_hw_enable_irq(struct imx7_csi *csi)
>> +{
>> + unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> +
>> + cr1 |= BIT_SOF_INTEN;
>> + cr1 |= BIT_RFF_OR_INT;
>> +
>> + /* still capture needs DMA interrupt */
>> + cr1 |= BIT_FB1_DMA_DONE_INTEN;
>> + cr1 |= BIT_FB2_DMA_DONE_INTEN;
>> +
>> + cr1 |= BIT_EOF_INT_EN;
>> +
>> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
>> +}
>> +
>> +static void imx7_csi_hw_disable_irq(struct imx7_csi *csi)
>> +{
>> + unsigned long cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> +
>> + cr1 &= ~BIT_SOF_INTEN;
>> + cr1 &= ~BIT_RFF_OR_INT;
>> + cr1 &= ~BIT_FB1_DMA_DONE_INTEN;
>> + cr1 &= ~BIT_FB2_DMA_DONE_INTEN;
>> + cr1 &= ~BIT_EOF_INT_EN;
>> +
>> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
>> +}
>> +
>> +static void imx7_csi_hw_enable(struct imx7_csi *csi)
>> +{
>> + unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
>> +
>> + cr |= BIT_CSI_HW_ENABLE;
>> +
>> + imx7_csi_reg_write(csi, cr, CSI_CSICR18);
>> +}
>> +
>> +static void imx7_csi_hw_disable(struct imx7_csi *csi)
>> +{
>> + unsigned long cr = imx7_csi_reg_read(csi, CSI_CSICR18);
>> +
>> + cr &= ~BIT_CSI_HW_ENABLE;
>> +
>> + imx7_csi_reg_write(csi, cr, CSI_CSICR18);
>> +}
>> +
>> +static void imx7_csi_dma_reflash(struct imx7_csi *csi)
>> +{
>> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR18);
>> +
>> + cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
>> + cr3 |= BIT_DMA_REFLASH_RFF;
>> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
>> +}
>> +
>> +static void imx7_csi_rx_fifo_clear(struct imx7_csi *csi)
>> +{
>> + unsigned long cr1;
>> +
>> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> + imx7_csi_reg_write(csi, cr1 & ~BIT_FCC, CSI_CSICR1);
>> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> + imx7_csi_reg_write(csi, cr1 | BIT_CLR_RXFIFO, CSI_CSICR1);
>> +
>> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> + imx7_csi_reg_write(csi, cr1 | BIT_FCC, CSI_CSICR1);
>> +}
>> +
>> +static void imx7_csi_buf_stride_set(struct imx7_csi *csi, u32
>> stride)
>> +{
>> + imx7_csi_reg_write(csi, stride, CSI_CSIFBUF_PARA);
>> +}
>> +
>> +static void imx7_csi_deinterlace_enable(struct imx7_csi *csi,
>> bool enable)
>> +{
>> + unsigned long cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
>> +
>> + if (enable)
>> + cr18 |= BIT_DEINTERLACE_EN;
>> + else
>> + cr18 &= ~BIT_DEINTERLACE_EN;
>> +
>> + imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
>> +}
>> +
>> +static void imx7_csi_dmareq_rff_enable(struct imx7_csi *csi)
>> +{
>> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
>> + unsigned long cr2 = imx7_csi_reg_read(csi, CSI_CSICR2);
>> +
>> + /* Burst Type of DMA Transfer from RxFIFO. INCR16 */
>> + cr2 |= 0xC0000000;
>> +
>> + cr3 |= BIT_DMA_REQ_EN_RFF;
>> + cr3 |= BIT_HRESP_ERR_EN;
>> + cr3 &= ~BIT_RXFF_LEVEL;
>> + cr3 |= 0x2 << 4;
>> +
>> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
>> + imx7_csi_reg_write(csi, cr2, CSI_CSICR2);
>> +}
>> +
>> +static void imx7_csi_dmareq_rff_disable(struct imx7_csi *csi)
>> +{
>> + unsigned long cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);
>> +
>> + cr3 &= ~BIT_DMA_REQ_EN_RFF;
>> + cr3 &= ~BIT_HRESP_ERR_EN;
>> + imx7_csi_reg_write(csi, cr3, CSI_CSICR3);
>> +}
>> +
>> +static void imx7_csi_set_imagpara(struct imx7_csi *csi, int
>> width, int height)
>> +{
>> + int imag_para;
>> + int rx_count;
>> +
>> + rx_count = (width * height) >> 2;
>> + imx7_csi_reg_write(csi, rx_count, CSI_CSIRXCNT);
>> +
>> + imag_para = (width << 16) | height;
>> + imx7_csi_reg_write(csi, imag_para, CSI_CSIIMAG_PARA);
>> +
>> + /* reflash the embedded DMA controller */
>> + imx7_csi_dma_reflash(csi);
>> +}
>> +
>> +static void imx7_csi_sw_reset(struct imx7_csi *csi)
>> +{
>> + imx7_csi_hw_disable(csi);
>> +
>> + imx7_csi_rx_fifo_clear(csi);
>> +
>> + imx7_csi_dma_reflash(csi);
>> +
>> + usleep_range(2000, 3000);
>> +
>> + imx7_csi_irq_clear(csi);
>> +
>> + imx7_csi_hw_enable(csi);
>> +}
>> +
>> +static void imx7_csi_error_recovery(struct imx7_csi *csi)
>> +{
>> + imx7_csi_hw_disable(csi);
>> +
>> + imx7_csi_rx_fifo_clear(csi);
>> +
>> + imx7_csi_dma_reflash(csi);
>> +
>> + imx7_csi_hw_enable(csi);
>> +}
>> +
>> +static void imx7_csi_init(struct imx7_csi *csi)
>> +{
>> + if (csi->is_init)
>> + return;
>> +
>> + imx7_csi_clk_enable(csi);
>> + imx7_csi_hw_reset(csi);
>> + imx7_csi_init_interface(csi);
>> + imx7_csi_dmareq_rff_enable(csi);
>> +
>> + csi->is_init = true;
>> +}
>> +
>> +static void imx7_csi_deinit(struct imx7_csi *csi)
>> +{
>> + if (!csi->is_init)
>> + return;
>> +
>> + imx7_csi_hw_reset(csi);
>> + imx7_csi_init_interface(csi);
>> + imx7_csi_dmareq_rff_disable(csi);
>> + imx7_csi_clk_disable(csi);
>> +
>> + csi->is_init = false;
>> +}
>> +
>> +static int imx7_csi_get_upstream_endpoint(struct imx7_csi
>> *csi,
>> + struct
>> v4l2_fwnode_endpoint *ep,
>> + bool skip_mux)
>> +{
>> + struct device_node *endpoint, *port;
>> + struct media_entity *src;
>> + struct v4l2_subdev *sd;
>> + struct media_pad *pad;
>> +
>> + if (!csi->src_sd)
>> + return -EPIPE;
>> +
>> + src = &csi->src_sd->entity;
>> +
>> +skip_video_mux:
>> + /* get source pad of entity directly upstream from src */
>> + pad = imx_media_find_upstream_pad(csi->md, src, 0);
>> + if (IS_ERR(pad))
>> + return PTR_ERR(pad);
>> +
>> + sd = media_entity_to_v4l2_subdev(pad->entity);
>> +
>> + /* To get bus type we may need to skip video mux */
>> + if (skip_mux && src->function == MEDIA_ENT_F_VID_MUX) {
>> + src = &sd->entity;
>> + goto skip_video_mux;
>> + }
>> +
>> + /*
>> + * NOTE: this assumes an OF-graph port id is the same as a
>> + * media pad index.
>> + */
>> + port = of_graph_get_port_by_id(sd->dev->of_node,
>> pad->index);
>> + if (!port)
>> + return -ENODEV;
>> +
>> + endpoint = of_get_next_child(port, NULL);
>> + of_node_put(port);
>> + if (!endpoint)
>> + return -ENODEV;
>> +
>> + v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
>> ep);
>
> I'd suggest to set the bus type before calling this. And do zero
> the rest of
> the struct as well (or put defaults in); otherwise you'll get
> unexpected
> results back.
Yeah, struct will be initialize in the caller.
>
> Just wondering... this seems complicated. What's the exact
> problem this
> function is intended to address?
To get if the upstream ep bus type is csi2 and but we may need
jump over
immediate ep if it is a mux to get to the "real" source.
>
>> + of_node_put(endpoint);
>> +
>> + return 0;
>> +}
>> +
>> +static int imx7_csi_link_setup(struct media_entity *entity,
>> + const struct media_pad *local,
>> + const struct media_pad *remote, u32
>> flags)
>> +{
>> + struct v4l2_subdev *sd =
>> media_entity_to_v4l2_subdev(entity);
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + struct v4l2_subdev *remote_sd;
>> + int ret = 0;
>> +
>> + dev_dbg(csi->dev, "link setup %s -> %s\n",
>> remote->entity->name,
>> + local->entity->name);
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + if (local->flags & MEDIA_PAD_FL_SINK) {
>> + if (!is_media_entity_v4l2_subdev(remote->entity))
>> {
>> + ret = -EINVAL;
>> + goto unlock;
>> + }
>> +
>> + remote_sd =
>> media_entity_to_v4l2_subdev(remote->entity);
>> +
>> + if (flags & MEDIA_LNK_FL_ENABLED) {
>> + if (csi->src_sd) {
>> + ret = -EBUSY;
>> + goto unlock;
>> + }
>> + csi->src_sd = remote_sd;
>> + } else {
>> + csi->src_sd = NULL;
>> + }
>> +
>> + goto init;
>> + }
>> +
>> + /* source pad */
>> + if (flags & MEDIA_LNK_FL_ENABLED) {
>> + if (csi->sink) {
>> + ret = -EBUSY;
>> + goto unlock;
>> + }
>> + csi->sink = remote->entity;
>> + } else {
>> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
>> + v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
>> + csi->sink = NULL;
>> + }
>> +
>> +init:
>> + if (csi->sink || csi->src_sd)
>> + imx7_csi_init(csi);
>> + else
>> + imx7_csi_deinit(csi);
>> +
>> +unlock:
>> + mutex_unlock(&csi->lock);
>> +
>> + return ret;
>> +}
>> +
>> +static int imx7_csi_pad_link_validate(struct v4l2_subdev *sd,
>> + struct media_link *link,
>> + struct v4l2_subdev_format
>> *source_fmt,
>> + struct v4l2_subdev_format
>> *sink_fmt)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + struct v4l2_fwnode_endpoint upstream_ep;
>> + int ret;
>> +
>> + ret = v4l2_subdev_link_validate_default(sd, link,
>> source_fmt, sink_fmt);
>> + if (ret)
>> + return ret;
>> +
>> + ret = imx7_csi_get_upstream_endpoint(csi, &upstream_ep,
>> true);
>> + if (ret) {
>> + v4l2_err(&csi->sd, "failed to find upstream
>> endpoint\n");
>> + return ret;
>> + }
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + csi->upstream_ep = upstream_ep;
>> + csi->is_csi2 = (upstream_ep.bus_type ==
>> V4L2_MBUS_CSI2_DPHY);
>> +
>> + mutex_unlock(&csi->lock);
>> +
>> + return 0;
>> +}
>> +
>> +static void imx7_csi_update_buf(struct imx7_csi *csi,
>> dma_addr_t phys,
>> + int buf_num)
>> +{
>> + if (buf_num == 1)
>> + imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB2);
>> + else
>> + imx7_csi_reg_write(csi, phys, CSI_CSIDMASA_FB1);
>> +}
>> +
>> +static void imx7_csi_setup_vb2_buf(struct imx7_csi *csi)
>> +{
>> + struct imx_media_video_dev *vdev = csi->vdev;
>> + struct imx_media_buffer *buf;
>> + struct vb2_buffer *vb2_buf;
>> + dma_addr_t phys[2];
>> + int i;
>> +
>> + for (i = 0; i < 2; i++) {
>> + buf = imx_media_capture_device_next_buf(vdev);
>> + if (buf) {
>> + csi->active_vb2_buf[i] = buf;
>> + vb2_buf = &buf->vbuf.vb2_buf;
>> + phys[i] =
>> vb2_dma_contig_plane_dma_addr(vb2_buf, 0);
>> + } else {
>> + csi->active_vb2_buf[i] = NULL;
>> + phys[i] = csi->underrun_buf.phys;
>> + }
>> +
>> + imx7_csi_update_buf(csi, phys[i], i);
>> + }
>> +}
>> +
>> +static void imx7_csi_dma_unsetup_vb2_buf(struct imx7_csi *csi,
>> + enum vb2_buffer_state
>> return_status)
>> +{
>> + struct imx_media_buffer *buf;
>> + int i;
>> +
>> + /* return any remaining active frames with return_status
>> */
>> + for (i = 0; i < 2; i++) {
>> + buf = csi->active_vb2_buf[i];
>> + if (buf) {
>> + struct vb2_buffer *vb =
>> &buf->vbuf.vb2_buf;
>> +
>> + vb->timestamp = ktime_get_ns();
>> + vb2_buffer_done(vb, return_status);
>> + }
>> + }
>> +}
>> +
>> +static void imx7_csi_vb2_buf_done(struct imx7_csi *csi)
>> +{
>> + struct imx_media_video_dev *vdev = csi->vdev;
>> + struct imx_media_buffer *done, *next;
>> + struct vb2_buffer *vb;
>> + dma_addr_t phys;
>> +
>> + done = csi->active_vb2_buf[csi->buf_num];
>> + if (done) {
>> + done->vbuf.field = vdev->fmt.fmt.pix.field;
>> + done->vbuf.sequence = csi->frame_sequence;
>> + vb = &done->vbuf.vb2_buf;
>> + vb->timestamp = ktime_get_ns();
>> + vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
>> + }
>> + csi->frame_sequence++;
>> +
>> + /* get next queued buffer */
>> + next = imx_media_capture_device_next_buf(vdev);
>> + if (next) {
>> + phys =
>> vb2_dma_contig_plane_dma_addr(&next->vbuf.vb2_buf, 0);
>> + csi->active_vb2_buf[csi->buf_num] = next;
>> + } else {
>> + phys = csi->underrun_buf.phys;
>> + csi->active_vb2_buf[csi->buf_num] = NULL;
>> + }
>> +
>> + imx7_csi_update_buf(csi, phys, csi->buf_num);
>> +}
>> +
>> +static irqreturn_t imx7_csi_irq_handler(int irq, void *data)
>> +{
>> + struct imx7_csi *csi = data;
>> + unsigned long status;
>> +
>> + spin_lock(&csi->irqlock);
>> +
>> + status = imx7_csi_irq_clear(csi);
>> +
>> + if (status & BIT_RFF_OR_INT) {
>> + dev_warn(csi->dev, "Rx fifo overflow\n");
>> + imx7_csi_error_recovery(csi);
>> + }
>> +
>> + if (status & BIT_HRESP_ERR_INT) {
>> + dev_warn(csi->dev, "Hresponse error detected\n");
>> + imx7_csi_error_recovery(csi);
>> + }
>> +
>> + if (status & BIT_ADDR_CH_ERR_INT) {
>> + imx7_csi_hw_disable(csi);
>> +
>> + imx7_csi_dma_reflash(csi);
>> +
>> + imx7_csi_hw_enable(csi);
>> + }
>> +
>> + if ((status & BIT_DMA_TSF_DONE_FB1) &&
>> + (status & BIT_DMA_TSF_DONE_FB2)) {
>> + /*
>> + * For both FB1 and FB2 interrupter bits set case,
>> + * CSI DMA is work in one of FB1 and FB2 buffer,
>> + * but software can not know the state.
>> + * Skip it to avoid base address updated
>> + * when csi work in field0 and field1 will write
>> to
>> + * new base address.
>> + */
>> + } else if (status & BIT_DMA_TSF_DONE_FB1) {
>> + csi->buf_num = 0;
>> + } else if (status & BIT_DMA_TSF_DONE_FB2) {
>> + csi->buf_num = 1;
>> + }
>> +
>> + if ((status & BIT_DMA_TSF_DONE_FB1) ||
>> + (status & BIT_DMA_TSF_DONE_FB2)) {
>> + imx7_csi_vb2_buf_done(csi);
>> +
>> + if (csi->last_eof) {
>> + complete(&csi->last_eof_completion);
>> + csi->last_eof = false;
>> + }
>> + }
>> +
>> +
>> + spin_unlock(&csi->irqlock);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +static int imx7_csi_dma_start(struct imx7_csi *csi)
>> +{
>> + struct imx_media_video_dev *vdev = csi->vdev;
>> + struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
>> + int ret;
>> +
>> + ret = imx_media_alloc_dma_buf(csi->md, &csi->underrun_buf,
>> + out_pix->sizeimage);
>> + if (ret < 0) {
>> + v4l2_warn(&csi->sd, "consider increasing the CMA
>> area\n");
>> + return ret;
>> + }
>> +
>> + csi->frame_sequence = 0;
>> + csi->last_eof = false;
>> + init_completion(&csi->last_eof_completion);
>> +
>> + imx7_csi_setup_vb2_buf(csi);
>> +
>> + return 0;
>> +}
>> +
>> +static void imx7_csi_dma_stop(struct imx7_csi *csi)
>> +{
>> + unsigned long flags;
>> + int ret;
>> +
>> + /* mark next EOF interrupt as the last before stream off
>> */
>> + spin_lock_irqsave(&csi->irqlock, flags);
>> + csi->last_eof = true;
>> + spin_unlock_irqrestore(&csi->irqlock, flags);
>> +
>> + /*
>> + * and then wait for interrupt handler to mark completion.
>> + */
>> + ret =
>> wait_for_completion_timeout(&csi->last_eof_completion,
>> +
>> msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT));
>> + if (ret == 0)
>> + v4l2_warn(&csi->sd, "wait last EOF timeout\n");
>> +
>> + imx7_csi_hw_disable_irq(csi);
>> +
>> + imx7_csi_dma_unsetup_vb2_buf(csi, VB2_BUF_STATE_ERROR);
>> +
>> + imx_media_free_dma_buf(csi->md, &csi->underrun_buf);
>> +}
>> +
>> +static int imx7_csi_configure(struct imx7_csi *csi)
>> +{
>> + struct imx_media_video_dev *vdev = csi->vdev;
>> + struct v4l2_pix_format *out_pix = &vdev->fmt.fmt.pix;
>> + __u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;
>> + u32 cr1, cr18;
>> +
>> + if (out_pix->field == V4L2_FIELD_INTERLACED) {
>> + imx7_csi_deinterlace_enable(csi, true);
>> + imx7_csi_buf_stride_set(csi, out_pix->width);
>> + } else {
>> + imx7_csi_deinterlace_enable(csi, false);
>> + imx7_csi_buf_stride_set(csi, 0);
>> + }
>> +
>> + imx7_csi_set_imagpara(csi, out_pix->width,
>> out_pix->height);
>> +
>> + if (!csi->is_csi2)
>> + return 0;
>> +
>> + cr1 = imx7_csi_reg_read(csi, CSI_CSICR1);
>> + cr1 &= ~BIT_GCLK_MODE;
>> +
>> + cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);
>> + cr18 &= BIT_MIPI_DATA_FORMAT_MASK;
>> + cr18 |= BIT_DATA_FROM_MIPI;
>> +
>> + switch (out_pix->pixelformat) {
>> + case V4L2_PIX_FMT_UYVY:
>> + case V4L2_PIX_FMT_YUYV:
>> + cr18 |= BIT_MIPI_DATA_FORMAT_YUV422_8B;
>> + break;
>> + case V4L2_PIX_FMT_SBGGR8:
>> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW8;
>> + break;
>> + case V4L2_PIX_FMT_SBGGR16:
>> + if (in_code == MEDIA_BUS_FMT_SBGGR10_1X10)
>> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;
>> + else if (in_code == MEDIA_BUS_FMT_SBGGR12_1X12)
>> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;
>> + else if (in_code == MEDIA_BUS_FMT_SBGGR14_1X14)
>> + cr18 |= BIT_MIPI_DATA_FORMAT_RAW14;
>> + cr1 |= BIT_PIXEL_BIT;
>> + break;
>> + default:
>> + return -EINVAL;
>> + }
>> +
>> + imx7_csi_reg_write(csi, cr1, CSI_CSICR1);
>> + imx7_csi_reg_write(csi, cr18, CSI_CSICR18);
>> +
>> + return 0;
>> +}
>> +
>> +static int imx7_csi_enable(struct imx7_csi *csi)
>> +{
>> + imx7_csi_sw_reset(csi);
>> +
>> + if (csi->is_csi2) {
>> + imx7_csi_dmareq_rff_enable(csi);
>> + imx7_csi_hw_enable_irq(csi);
>> + imx7_csi_hw_enable(csi);
>> + return 0;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void imx7_csi_disable(struct imx7_csi *csi)
>> +{
>> + imx7_csi_dmareq_rff_disable(csi);
>> +
>> + imx7_csi_hw_disable_irq(csi);
>> +
>> + imx7_csi_buf_stride_set(csi, 0);
>> +
>> + imx7_csi_hw_disable(csi);
>> +}
>> +
>> +static int imx7_csi_streaming_start(struct imx7_csi *csi)
>> +{
>> + int ret;
>> +
>> + ret = imx7_csi_dma_start(csi);
>> + if (ret < 0)
>> + return ret;
>> +
>> + ret = imx7_csi_configure(csi);
>> + if (ret < 0)
>> + goto dma_stop;
>> +
>> + imx7_csi_enable(csi);
>> +
>> + return 0;
>> +
>> +dma_stop:
>> + imx7_csi_dma_stop(csi);
>> +
>> + return ret;
>> +}
>> +
>> +static int imx7_csi_streaming_stop(struct imx7_csi *csi)
>> +{
>> + imx7_csi_dma_stop(csi);
>> +
>> + imx7_csi_disable(csi);
>> +
>> + return 0;
>> +}
>> +
>> +static int imx7_csi_s_stream(struct v4l2_subdev *sd, int
>> enable)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + int ret = 0;
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + if (!csi->src_sd || !csi->sink) {
>> + ret = -EPIPE;
>> + goto out_unlock;
>> + }
>> +
>> + if (csi->is_streaming == !!enable)
>> + goto out_unlock;
>> +
>> + if (enable) {
>> + ret = v4l2_subdev_call(csi->src_sd, video,
>> s_stream, 1);
>> + if (ret < 0)
>> + goto out_unlock;
>> +
>> + ret = imx7_csi_streaming_start(csi);
>> + if (ret < 0) {
>> + v4l2_subdev_call(csi->src_sd, video,
>> s_stream, 0);
>> + goto out_unlock;
>> + }
>> + } else {
>> + imx7_csi_streaming_stop(csi);
>> +
>> + v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
>> + }
>> +
>> + csi->is_streaming = !!enable;
>> +
>> +out_unlock:
>> + mutex_unlock(&csi->lock);
>> +
>> + return ret;
>> +}
>> +
>> +static struct v4l2_mbus_framefmt *imx7_csi_get_format(struct
>> imx7_csi *csi,
>> + struct
>> v4l2_subdev_pad_config *cfg,
>> + unsigned int pad,
>> + enum
>> v4l2_subdev_format_whence which)
>> +{
>> + if (which == V4L2_SUBDEV_FORMAT_TRY)
>> + return v4l2_subdev_get_try_format(&csi->sd, cfg,
>> pad);
>> +
>> + return &csi->format_mbus[pad];
>> +}
>> +
>> +static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,
>> + struct v4l2_subdev_pad_config
>> *cfg,
>> + struct
>> v4l2_subdev_mbus_code_enum *code)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + const struct imx_media_pixfmt *in_cc;
>> + struct v4l2_mbus_framefmt *in_fmt;
>> + int ret = 0;
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK,
>> code->which);
>> +
>> + in_cc = imx_media_find_mbus_format(in_fmt->code,
>> CS_SEL_ANY, true);
>> +
>> + switch (code->pad) {
>> + case IMX7_CSI_PAD_SINK:
>> + ret = imx_media_enum_mbus_format(&code->code,
>> code->index,
>> + CS_SEL_ANY,
>> true);
>> + break;
>> + case IMX7_CSI_PAD_SRC:
>> + if (code->index != 0) {
>> + ret = -EINVAL;
>> + goto out_unlock;
>> + }
>> +
>> + code->code = in_fmt->code;
>> + break;
>> + default:
>> + ret = -EINVAL;
>> + }
>> +
>> +out_unlock:
>> + mutex_unlock(&csi->lock);
>> +
>> + return ret;
>> +}
>> +
>> +static int imx7_csi_get_fmt(struct v4l2_subdev *sd,
>> + struct v4l2_subdev_pad_config *cfg,
>> + struct v4l2_subdev_format *sdformat)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + struct v4l2_mbus_framefmt *fmt;
>> + int ret = 0;
>> +
>> + if (sdformat->pad >= IMX7_CSI_PADS_NUM)
>> + return -EINVAL;
>
> The framework validates the pad indices already. You can drop
> this one.
V9.
>
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + fmt = imx7_csi_get_format(csi, cfg, sdformat->pad,
>> sdformat->which);
>> + if (!fmt) {
>> + ret = -EINVAL;
>> + goto out_unlock;
>> + }
>> +
>> + sdformat->format = *fmt;
>> +
>> +out_unlock:
>> + mutex_unlock(&csi->lock);
>> +
>> + return ret;
>> +}
>> +
>> +static void imx7_csi_try_fmt(struct imx7_csi *csi,
>> + struct v4l2_subdev_pad_config *cfg,
>> + struct v4l2_subdev_format *sdformat,
>> + const struct imx_media_pixfmt **cc)
>> +{
>> + const struct imx_media_pixfmt *in_cc;
>> + struct v4l2_mbus_framefmt *in_fmt;
>> + u32 code;
>> +
>> + in_fmt = imx7_csi_get_format(csi, cfg, IMX7_CSI_PAD_SINK,
>> + sdformat->which);
>> + if (!in_fmt)
>> + return;
>> +
>> + switch (sdformat->pad) {
>> + case IMX7_CSI_PAD_SRC:
>> + in_cc = imx_media_find_mbus_format(in_fmt->code,
>> CS_SEL_ANY,
>> + true);
>> +
>> + sdformat->format.width = in_fmt->width;
>> + sdformat->format.height = in_fmt->height;
>> + sdformat->format.code = in_fmt->code;
>> + *cc = in_cc;
>> +
>> + sdformat->format.colorspace = in_fmt->colorspace;
>> + sdformat->format.xfer_func = in_fmt->xfer_func;
>> + sdformat->format.quantization =
>> in_fmt->quantization;
>> + sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
>> + break;
>> + case IMX7_CSI_PAD_SINK:
>> + *cc =
>> imx_media_find_mbus_format(sdformat->format.code,
>> + CS_SEL_ANY,
>> true);
>> + if (!*cc) {
>> + imx_media_enum_mbus_format(&code, 0,
>> CS_SEL_ANY, false);
>> + *cc = imx_media_find_mbus_format(code,
>> CS_SEL_ANY,
>> + false);
>> + sdformat->format.code = (*cc)->codes[0];
>> + }
>> +
>> +
>> imx_media_fill_default_mbus_fields(&sdformat->format, in_fmt,
>> + false);
>> + break;
>> + default:
>> + break;
>> + }
>> +}
>> +
>> +static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
>> + struct v4l2_subdev_pad_config *cfg,
>> + struct v4l2_subdev_format *sdformat)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + struct imx_media_video_dev *vdev = csi->vdev;
>> + const struct imx_media_pixfmt *outcc;
>> + struct v4l2_mbus_framefmt *outfmt;
>> + struct v4l2_pix_format vdev_fmt;
>> + const struct imx_media_pixfmt *cc;
>> + struct v4l2_mbus_framefmt *fmt;
>> + struct v4l2_subdev_format format;
>> + int ret = 0;
>> +
>> + if (sdformat->pad >= IMX7_CSI_PADS_NUM)
>> + return -EINVAL;
>> +
>> + mutex_lock(&csi->lock);
>> +
>> + if (csi->is_streaming) {
>> + ret = -EBUSY;
>> + goto out_unlock;
>> + }
>> +
>> + imx7_csi_try_fmt(csi, cfg, sdformat, &cc);
>> +
>> + fmt = imx7_csi_get_format(csi, cfg, sdformat->pad,
>> sdformat->which);
>> + if (!fmt) {
>> + ret = -EINVAL;
>> + goto out_unlock;
>> + }
>> +
>> + *fmt = sdformat->format;
>> +
>> + if (sdformat->pad == IMX7_CSI_PAD_SINK) {
>> + /* propagate format to source pads */
>> + format.pad = IMX7_CSI_PAD_SRC;
>> + format.which = sdformat->which;
>> + format.format = sdformat->format;
>> + imx7_csi_try_fmt(csi, cfg, &format, &outcc);
>> +
>> + outfmt = imx7_csi_get_format(csi, cfg,
>> IMX7_CSI_PAD_SRC,
>> + sdformat->which);
>> + *outfmt = format.format;
>> +
>> + if (sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
>> + csi->cc[IMX7_CSI_PAD_SRC] = outcc;
>> + }
>> +
>> + if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY)
>> + goto out_unlock;
>> +
>> + csi->cc[sdformat->pad] = cc;
>> +
>> + /* propagate output pad format to capture device */
>> + imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
>> +
>> &csi->format_mbus[IMX7_CSI_PAD_SRC],
>> + csi->cc[IMX7_CSI_PAD_SRC]);
>
> The user is expected to configure the format on the video
> device; the driver
> needs to validate that when starting the stream.
Will take a look at this.
>
>> + mutex_unlock(&csi->lock);
>> + imx_media_capture_device_set_format(vdev, &vdev_fmt);
>> +
>> + return 0;
>> +
>> +out_unlock:
>> + mutex_unlock(&csi->lock);
>> +
>> + return ret;
>> +}
>> +
>> +static int imx7_csi_registered(struct v4l2_subdev *sd)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + int ret;
>> + int i;
>> +
>> + csi->md = dev_get_drvdata(sd->v4l2_dev->dev);
>> +
>> + for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
>> + csi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?
>> + MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
>> +
>> + /* set a default mbus format */
>> + ret =
>> imx_media_init_mbus_fmt(&csi->format_mbus[i],
>> + 800, 600, 0,
>> V4L2_FIELD_NONE,
>> + &csi->cc[i]);
>> + if (ret < 0)
>> + return ret;
>> +
>> + /* init default frame interval */
>> + csi->frame_interval[i].numerator = 1;
>> + csi->frame_interval[i].denominator = 30;
>> + }
>> +
>> + ret = media_entity_pads_init(&sd->entity,
>> IMX7_CSI_PADS_NUM, csi->pad);
>> + if (ret < 0)
>> + return ret;
>> +
>> + ret = imx_media_capture_device_register(csi->vdev);
>> + if (ret < 0)
>> + return ret;
>> +
>> + ret = imx_media_add_video_device(csi->md, csi->vdev);
>> + if (ret < 0) {
>> + imx_media_capture_device_unregister(csi->vdev);
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static void imx7_csi_unregistered(struct v4l2_subdev *sd)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> +
>> + imx_media_capture_device_unregister(csi->vdev);
>> +}
>> +
>> +static int imx7_csi_init_cfg(struct v4l2_subdev *sd,
>> + struct v4l2_subdev_pad_config *cfg)
>> +{
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> + struct v4l2_mbus_framefmt *mf;
>> + int ret;
>> + int i;
>> +
>> + for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
>> + mf = v4l2_subdev_get_try_format(sd, cfg, i);
>> +
>> + ret = imx_media_init_mbus_fmt(mf, 800, 600, 0,
>> V4L2_FIELD_NONE,
>> + &csi->cc[i]);
>> + if (ret < 0)
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static const struct media_entity_operations
>> imx7_csi_entity_ops = {
>> + .link_setup = imx7_csi_link_setup,
>> + .link_validate = v4l2_subdev_link_validate,
>> +};
>> +
>> +static const struct v4l2_subdev_video_ops imx7_csi_video_ops =
>> {
>> + .s_stream = imx7_csi_s_stream,
>> +};
>> +
>> +static const struct v4l2_subdev_pad_ops imx7_csi_pad_ops = {
>> + .init_cfg = imx7_csi_init_cfg,
>> + .enum_mbus_code = imx7_csi_enum_mbus_code,
>> + .get_fmt = imx7_csi_get_fmt,
>> + .set_fmt = imx7_csi_set_fmt,
>> + .link_validate = imx7_csi_pad_link_validate,
>> +};
>> +
>> +static const struct v4l2_subdev_ops imx7_csi_subdev_ops = {
>> + .video = &imx7_csi_video_ops,
>> + .pad = &imx7_csi_pad_ops,
>> +};
>> +
>> +static const struct v4l2_subdev_internal_ops
>> imx7_csi_internal_ops = {
>> + .registered = imx7_csi_registered,
>> + .unregistered = imx7_csi_unregistered,
>> +};
>> +
>> +static int imx7_csi_parse_endpoint(struct device *dev,
>> + struct v4l2_fwnode_endpoint
>> *vep,
>> + struct v4l2_async_subdev *asd)
>> +{
>> + return fwnode_device_is_available(asd->match.fwnode) ? 0 :
>> -EINVAL;
>> +}
>> +
>> +static int imx7_csi_parse_dt(struct imx7_csi *csi)
>> +{
>> + struct device *dev = csi->dev;
>> +
>> + csi->clk_disp_axi = devm_clk_get(dev, "axi");
>> + if (IS_ERR(csi->clk_disp_axi)) {
>> + dev_err(dev, "Could not get csi axi clock\n");
>> + return -ENODEV;
>> + }
>> +
>> + csi->clk_disp_dcic = devm_clk_get(dev, "dcic");
>> + if (IS_ERR(csi->clk_disp_dcic)) {
>> + dev_err(dev, "Could not get disp dcic clock\n");
>> + return -ENODEV;
>> + }
>> +
>> + csi->clk_csi_mclk = devm_clk_get(dev, "mclk");
>> + if (IS_ERR(csi->clk_csi_mclk)) {
>> + dev_err(dev, "Could not get csi mclk clock\n");
>> + return -ENODEV;
>> + }
>
> Could you use devm_clk_bulk_get()?
V9
>
>> +
>> + return 0;
>> +}
>> +
>> +static int imx7_csi_probe(struct platform_device *pdev)
>> +{
>> + struct device *dev = &pdev->dev;
>> + struct device_node *node = dev->of_node;
>> + struct imx7_csi *csi;
>> + struct resource *res;
>> + int ret;
>> +
>> + csi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL);
>> + if (!csi)
>> + return -ENOMEM;
>> +
>> + platform_set_drvdata(pdev, &csi->sd);
>> + csi->dev = dev;
>> +
>> + ret = imx7_csi_parse_dt(csi);
>> + if (ret < 0)
>> + return -ENODEV;
>> +
>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> + csi->irq = platform_get_irq(pdev, 0);
>> + if (!res || csi->irq < 0) {
>> + dev_err(dev, "Missing platform resources data\n");
>> + return -ENODEV;
>> + }
>> +
>> + csi->regbase = devm_ioremap_resource(dev, res);
>> + if (IS_ERR(csi->regbase)) {
>> + dev_err(dev, "Failed platform resources map\n");
>> + return -ENODEV;
>> + }
>> +
>> + spin_lock_init(&csi->irqlock);
>> + mutex_init(&csi->lock);
>> +
>> + /* install interrupt handler */
>> + ret = devm_request_irq(dev, csi->irq,
>> imx7_csi_irq_handler, 0, "csi",
>> + (void *)csi);
>> + if (ret < 0) {
>> + dev_err(dev, "Request CSI IRQ failed.\n");
>> + return -ENODEV;
>
> mutex_destroy(); better to add a label below.
V9.
>
>> + }
>> +
>> + /* add media device */
>> + csi->imxmd = imx_media_dev_init(dev);
>> + if (IS_ERR(csi->imxmd))
>> + return PTR_ERR(csi->imxmd);
>> +
>> + ret = imx_media_of_add_csi(csi->imxmd, node);
>> + if (ret < 0)
>> + goto media_cleanup;
>> +
>> + ret = imx_media_dev_notifier_register(csi->imxmd);
>> + if (ret < 0)
>> + goto media_cleanup;
>> +
>> + v4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);
>> + v4l2_set_subdevdata(&csi->sd, csi);
>> + csi->sd.internal_ops = &imx7_csi_internal_ops;
>> + csi->sd.entity.ops = &imx7_csi_entity_ops;
>> + csi->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
>> + csi->sd.dev = &pdev->dev;
>> + csi->sd.owner = THIS_MODULE;
>> + csi->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
>> + csi->sd.grp_id = IMX_MEDIA_GRP_ID_CSI;
>> + snprintf(csi->sd.name, sizeof(csi->sd.name), "csi");
>> +
>> + csi->vdev = imx_media_capture_device_init(&csi->sd,
>> IMX7_CSI_PAD_SRC);
>> + if (IS_ERR(csi->vdev))
>> + return PTR_ERR(csi->vdev);
>> +
>> + v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);
>> + csi->sd.ctrl_handler = &csi->ctrl_hdlr;
>> +
>> + ret = v4l2_async_register_fwnode_subdev(&csi->sd,
>> + sizeof(struct
>> v4l2_async_subdev),
>> + NULL, 0,
>> imx7_csi_parse_endpoint);
>> + if (ret)
>> + goto free;
>> +
>> + return 0;
>> +
>> +free:
>> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
>> + mutex_destroy(&csi->lock);
>> + imx_media_capture_device_remove(csi->vdev);
>> +
>> +media_cleanup:
>> + imx_media_dev_cleanup(csi->imxmd);
>> +
>> + return ret;
>> +}
>> +
>> +static int imx7_csi_remove(struct platform_device *pdev)
>> +{
>> + struct v4l2_subdev *sd = platform_get_drvdata(pdev);
>> + struct imx7_csi *csi = v4l2_get_subdevdata(sd);
>> +
>> + v4l2_ctrl_handler_free(&csi->ctrl_hdlr);
>> + mutex_destroy(&csi->lock);
>
> Please unregister the devices before the two above lines.
Right.
---
Cheers,
Rui
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2018-11-22 20:25 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 11:15 [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 01/12] media: staging/imx: refactor imx media device probe Rui Miguel Silva
2018-11-21 22:40 ` kbuild test robot
2018-11-21 11:15 ` [PATCH v8 02/12] media: staging/imx: rearrange group id to take in account IPU Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 03/12] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
2018-11-21 22:29 ` Sakari Ailus
2018-11-22 9:46 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 04/12] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
2018-11-21 22:54 ` kbuild test robot
2018-11-21 22:54 ` [PATCH] media: staging/imx7: fix platform_no_drv_owner.cocci warnings kbuild test robot
2018-11-21 11:15 ` [PATCH v8 05/12] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
2018-11-21 22:16 ` Sakari Ailus
2018-11-22 9:42 ` Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 06/12] ARM: dts: imx7s: add mipi phy power domain Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 07/12] ARM: dts: imx7s: add multiplexer controls Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 08/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 09/12] ARM: dts: imx7s-warp: add ov2680 sensor node Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 10/12] media: imx7.rst: add documentation for i.MX7 media driver Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 11/12] media: staging/imx: add i.MX7 entries to TODO file Rui Miguel Silva
2018-11-21 11:15 ` [PATCH v8 12/12] media: video-mux: add bayer formats Rui Miguel Silva
2018-11-21 11:53 ` [PATCH v8 00/12] media: staging/imx7: add i.MX7 media driver Hans Verkuil
2018-11-22 9:38 ` Rui Miguel Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).