Allwinner A31/A83T MIPI CSI-2 Support and A31 ISP Support
Subsystems (10)
v2 cover Allwinner A31/A83T MIPI CSI-2 Support and A31 ISP Support
This series introduces support for the Allwinner A31 and A83T MIPI CSI-2 controllers as well as the Allwinner A31 Image Signal Processor (ISP). It follows v5 of the "Allwinner MIPI CSI-2 support for A31/V3s/A83T" series, with the addition of ISP support for the V3. Since both aspect are quite dependent due to changes to the sun6i-csi driver, they are merged into this new series.
Aside from the ISP driver itself, the most outstanding change is a significant rework of the CSI driver, to bring it to a state that makes it possible to integrate with the ISP workflow.
A number of other improvments are also added along the way.
The commit message introducing the ISP driver should also contain useful details regarding the implementation and outstanding specifics of the hardware.
This was tested on the V3s and A83T, using the IMX219, OV5648, OV8856 and OV8865 sensors.
v4l2-compliance seems pretty happy about the video nodes, see the detailed reports below.
Thanks!
-- Changelog
Changes since v1:
- Split changes to the sun6i-csi driver into specific patches;
- Added myself as maintainer of the reworked driver;
- Defined and used mbus interconnect as requested, although the approach appears to be broken currently (see final commit);
- Removed the patches dealing with PLL clock parenting issues, since they are a bit out of scope;
- Fixed various minor issues caught in code review;
- Fixed an undefined return issue;
- Reset capture sequence to 0 at stream start;
- Kept runtime pm only in the bridge/proc paths;
- Followed v4l2 API changes (notifier -> nf);
- A few misc cosmetic changes;
-- Previous MIPI CSI-2 series changelog
Changes since v5:
- D-PHY direction is no longer represented with a submode since this is not a runtime decision: no switching between the two submodes is possible and each instance of a controller will be dedicated to one direction only. Instead, a device-tree property is used.
A separate compatible was considered, but it feels unfit since the direction does not describe the particular type of hardware implementation, but rather how it is used;
- Updated comments about channels based on latest information;
- Various cosmetic changes (and splitting) to the code;
-- Allwinner MIPI CSI-2 support for A31/V3s/A83T changelog
Changes since v4:
- Added patch to stop using v4l2_async_notifier_parse_fwnode_endpoints;
- Fixed checkpatch strict issues (parenthesis alignment);
- Fixed runtime PM call order and disable;
- Fixed fwnode_handle_put order;
- Brought back phy-names for A31 since it's mandatory according to the generic PHY binding and needed by the code;
- Added collected tags.
Changes since v3:
- Fixed single-item phys description in sun6i mipi csi-2 binding;
- Fixed variables names in macros using container_of;
- Fixed style issue with operators at the end of lines;
- Reworked source endpoint/subdev assignment in sun6i-csi to handle link_validate error case;
- Removed unrelated dt change in sun8i-a83t mipi csi-2 driver;
- Added collected tags.
Changes since v2:
- added Kconfig depend on PM since it's not optional;
- removed phy-names for A31 MIPI CSI-2 controller;
- removed v3s compatible in the A31 MIPI CSI-2 controller driver;
- removed A31 CSI controller single-port binding deprecation;
- removed empty dt port definitions;
- fixed minor checkpatch warnings;
- added collected tags;
- added media-ctl output in cover letter.
Changes since v1:
- reworked fwnode and media graph on the CSI controller end to have one port per interface, which solves the bus type representation issue;
- removed unused IRQ handlers in the MIPI CSI-2 bridges;
- avoided the use of devm_regmap_init_mmio_clk;
- deasserted reset before enabling clocks;
- fixed reported return code issues (ret |=, missing checks);
- applied requested cosmetic changes (backward goto, etc);
- switched over to runtime PM for the mipi csi-2 bridge drivers;
- selected PHY_SUN6I_MIPI_DPHY in Kconfig for sun6i-mipi-csi2;
- registered nodes with mipi csi-2 bridge subdevs;
- used V4L2 format info instead of switch/case for sun6i-csi bpp;
- fixed device-tree bindings as requested (useless properties, license);
- fixed mipi bridge dt instances names;
- added PHY API documentation about mode/power on order requirement;
- fixed clock error return code in d-phy code;
- fixed D-PHY mode check in d-phy code;
- added MAINTAINERS entries for the new drivers;
- added V4L2 compliance results;
- added various comments and rework commit mesages as requested.
-- V3 media topology
Media controller API version 5.13.0
Media device information
------------------------
driver sun6i-isp
model Allwinner A31 ISP Device
serial
bus info platform:1cb8000.isp hw revision 0x0 driver version 5.13.0
Device topology
- entity 1: sun6i-isp-proc (3 pads, 3 links)
type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev0
pad0: Sink
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
<- "sun6i-csi-bridge":1 [ENABLED]
pad1: Sink
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
<- "sun6i-isp-params":0 [ENABLED,IMMUTABLE]
pad2: Source
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
-> "sun6i-isp-capture":0 [ENABLED,IMMUTABLE]- entity 5: sun6i-csi-bridge (2 pads, 3 links)
type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev1
pad0: Sink
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
<- "sun6i-mipi-csi2":1 [ENABLED]
pad1: Source
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
-> "sun6i-isp-proc":0 [ENABLED]
-> "sun6i-csi-capture":0 []- entity 10: sun6i-mipi-csi2 (2 pads, 2 links)
type V4L2 subdev subtype Unknown flags 0
device node name /dev/v4l-subdev2
pad0: Sink
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
<- "imx219 1-0010":0 [ENABLED,IMMUTABLE]
pad1: Source
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:raw]
-> "sun6i-csi-bridge":0 [ENABLED]- entity 13: sun6i-csi-capture (1 pad, 1 link)
type Node subtype V4L flags 0
device node name /dev/video0
pad0: Sink
<- "sun6i-csi-bridge":1 []
- entity 21: sun6i-isp-capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1
pad0: Sink
<- "sun6i-isp-proc":2 [ENABLED,IMMUTABLE]
- entity 27: sun6i-isp-params (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video2
pad0: Source
-> "sun6i-isp-proc":1 [ENABLED,IMMUTABLE]
- entity 33: imx219 1-0010 (1 pad, 1 link)
type V4L2 subdev subtype Sensor flags 0
device node name /dev/v4l-subdev3
pad0: Source
[fmt:SRGGB8_1X8/1920x1080 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:full-range
crop.bounds:(8,8)/3280x2464
crop:(688,700)/1920x1080]
-> "sun6i-mipi-csi2":0 [ENABLED,IMMUTABLE]-- sun6i-csi-capture v4l2-compliance run
v4l2-compliance SHA: not available, 32 bits
Compliance test for sun6i-csi device /dev/video0:
Driver Info:
Driver name : sun6i-csi Card type : sun6i-csi-capture Bus info : platform:1cb0000.camera Driver version : 5.13.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 : sun6i-isp Model : Allwinner A31 ISP Device Serial : Bus info : platform:1cb8000.isp Media version : 5.13.0 Hardware revision: 0x00000000 (0) Driver version : 5.13.0 Interface Info: ID : 0x0300000f Type : V4L Video Entity Info: ID : 0x0000000d (13) Name : sun6i-csi-capture Function : V4L2 I/O Pad 0x0100000e : 0: Sink Link 0x02000011: from remote pad 0x1000007 of entity 'sun6i-csi-bridge': Data
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
warn: v4l2-compliance.cpp(633): media bus_info 'platform:1cb8000.isp' differs from V4L2 bus_info 'platform:1cb0000.camera'
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video0 open: OK
warn: v4l2-compliance.cpp(633): media bus_info 'platform:1cb8000.isp' differs from V4L2 bus_info 'platform:1cb0000.camera'
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
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
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 1 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 (Input 0):
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 test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 17 Private Controls: 0
Format ioctls (Input 0):
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
Codec ioctls (Input 0):
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 (Input 0):
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for sun6i-csi device /dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 2
-- sun6i-isp-capture v4l2-compliance run
v4l2-compliance SHA: not available, 32 bits
Compliance test for sun6i-isp device /dev/video1:
Driver Info:
Driver name : sun6i-isp Card type : sun6i-isp-capture Bus info : platform:1cb8000.isp Driver version : 5.13.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 : sun6i-isp Model : Allwinner A31 ISP Device Serial : Bus info : platform:1cb8000.isp Media version : 5.13.0 Hardware revision: 0x00000000 (0) Driver version : 5.13.0 Interface Info: ID : 0x03000017 Type : V4L Video Entity Info: ID : 0x00000015 (21) Name : sun6i-isp-capture Function : V4L2 I/O Pad 0x01000016 : 0: Sink, Must Connect Link 0x02000019: from remote pad 0x1000004 of entity 'sun6i-isp-proc': Data, Enabled, Immutable
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video1 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
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
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 1 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 (Input 0):
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 test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 17 Private Controls: 0
Format ioctls (Input 0):
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
Codec ioctls (Input 0):
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 (Input 0):
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for sun6i-isp device /dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0
-- sun6i-isp-params v4l2-compliance run
v4l2-compliance SHA: not available, 32 bits
Compliance test for sun6i-isp device /dev/video2:
Driver Info:
Driver name : sun6i-isp Card type : sun6i-isp-params Bus info : platform:1cb8000.isp Driver version : 5.13.0 Capabilities : 0x8c200000
Metadata Output
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x0c200000
Metadata Output
Streaming
Extended Pix Format
Media Driver Info:
Driver name : sun6i-isp Model : Allwinner A31 ISP Device Serial : Bus info : platform:1cb8000.isp Media version : 5.13.0 Hardware revision: 0x00000000 (0) Driver version : 5.13.0 Interface Info: ID : 0x0300001d Type : V4L Video Entity Info: ID : 0x0000001b (27) Name : sun6i-isp-params Function : V4L2 I/O Pad 0x0100001c : 0: Source, Must Connect Link 0x0200001f: to remote pad 0x1000003 of entity 'sun6i-isp-proc': Data, Enabled, Immutable
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video2 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
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)
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 test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 17 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
test Requests: OK (Not Supported)
Total for sun6i-isp device /dev/video2: 45, Succeeded: 45, Failed: 0, Warnings: 0
Kévin L'hôpital (1):
ARM: dts: sun8i: a83t: bananapi-m3: Enable MIPI CSI-2 with OV8865
Paul Kocialkowski (65):
ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
dt-bindings: interconnect: sunxi: Add V3s mbus compatible
clk: sunxi-ng: v3s: Export the MBUS clock to the public header
ARM: dts: sun8i: v3s: Add mbus node to represent the interconnect
dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property
phy: allwinner: phy-sun6i-mipi-dphy: Support D-PHY Rx mode for MIPI
CSI-2
dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
dt-bindings: media: Add Allwinner A31 MIPI CSI-2 bindings
documentation
media: sunxi: Add support for the A31 MIPI CSI-2 controller
MAINTAINERS: Add entry for the Allwinner A31 MIPI CSI-2 bridge driver
ARM: dts: sun8i: v3s: Add nodes for MIPI CSI-2 support
dt-bindings: media: Add Allwinner A83T MIPI CSI-2 bindings
documentation
media: sunxi: Add support for the A83T MIPI CSI-2 controller
MAINTAINERS: Add entry for the Allwinner A83T MIPI CSI-2 bridge
ARM: dts: sun8i: a83t: Add MIPI CSI-2 controller node
media: sun6i-csi: Define and use driver name and (reworked)
description
media: sun6i-csi: Refactor main driver data structures
media: sun6i-csi: Grab bus clock instead of passing it to regmap
media: sun6i-csi: Tidy up platform code
media: sun6i-csi: Always set exclusive module clock rate
media: sun6i-csi: Use runtime pm for clocks and reset
media: sun6i-csi: Tidy up v4l2 code
media: sun6i-csi: Tidy up video code
media: sun6i-csi: Pass and store csi device directly in video code
media: sun6i-csi: Register the media device after creation
media: sun6i-csi: Add media ops with link notify callback
media: sun6i-csi: Introduce and use video helper functions
media: sun6i-csi: Move csi buffer definition to main header file
media: sun6i-csi: Add bridge v4l2 subdev with port management
media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture
media: sun6i-csi: Add capture state using vsync for page flip
media: sun6i-csi: Rework register definitions, invert misleading
fields
media: sun6i-csi: Add dimensions and format helpers to capture
media: sun6i-csi: Implement address configuration without indirection
media: sun6i-csi: Split stream sequences and irq code in capture
media: sun6i-csi: Move power management to runtime pm in capture
media: sun6i-csi: Move register configuration to capture
media: sun6i-csi: Rework capture format management with helper
media: sun6i-csi: Remove custom format helper and rework configure
media: sun6i-csi: Add bridge dimensions and format helpers
media: sun6i-csi: Get mbus code from bridge instead of storing it
media: sun6i-csi: Tidy capture configure code
media: sun6i-csi: Introduce bridge format structure, list and helper
media: sun6i-csi: Introduce capture format structure, list and helper
media: sun6i-csi: Configure registers from format tables
media: sun6i-csi: Introduce format match structure, list and helper
media: sun6i-csi: Implement capture link validation with logic
media: sun6i-csi: Get bridge subdev directly in capture stream ops
media: sun6i-csi: Move hardware control to the bridge
media: sun6i-csi: Unset bridge source on capture streamon fail
media: sun6i-csi: Rename the capture video device to sun6i-csi-capture
media: sun6i-csi: Cleanup headers and includes, update copyright lines
media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code
media: sun6i-csi: Only configure capture when streaming
media: sun6i-csi: Add extra checks to the interrupt routine
media: sun6i-csi: Request a shared interrupt
media: sun6i-csi: Detect the availability of the ISP
media: sun6i-csi: Add support for hooking to the isp devices
MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry
dt-bindings: media: Add Allwinner A31 ISP bindings documentation
dt-bindings: media: sun6i-a31-csi: Add ISP output port
staging: media: Add support for the Allwinner A31 ISP
MAINTAINERS: Add entry for the Allwinner A31 ISP driver
ARM: dts: sun8i: v3s: Add support for the ISP
of: Mark interconnects property supplier as optional
.../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + .../media/allwinner,sun6i-a31-csi.yaml | 74 +- .../media/allwinner,sun6i-a31-isp.yaml | 117 ++ .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 142 +++ .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 133 ++ .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 + MAINTAINERS | 42 +- arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 102 ++ arch/arm/boot/dts/sun8i-a83t.dtsi | 26 + arch/arm/boot/dts/sun8i-v3s.dtsi | 134 +- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 - drivers/media/platform/sunxi/Kconfig | 2 + drivers/media/platform/sunxi/Makefile | 2 + .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 1054 +++++----------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 152 +-- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 885 +++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 64 + .../sunxi/sun6i-csi/sun6i_csi_capture.c | 1102 +++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 89 ++ .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 362 +++--- .../platform/sunxi/sun6i-csi/sun6i_video.c | 681 ---------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 38 - .../platform/sunxi/sun6i-mipi-csi2/Kconfig | 12 + .../platform/sunxi/sun6i-mipi-csi2/Makefile | 4 + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 746 +++++++++++ .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h | 52 + .../sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h | 82 ++ .../sunxi/sun8i-a83t-mipi-csi2/Kconfig | 11 + .../sunxi/sun8i-a83t-mipi-csi2/Makefile | 4 + .../sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c | 72 ++ .../sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h | 39 + .../sun8i_a83t_mipi_csi2.c | 812 ++++++++++++ .../sun8i_a83t_mipi_csi2.h | 55 + .../sun8i_a83t_mipi_csi2_reg.h | 157 +++ drivers/of/property.c | 2 +- drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 166 ++- drivers/staging/media/sunxi/Kconfig | 1 + drivers/staging/media/sunxi/Makefile | 1 + drivers/staging/media/sunxi/sun6i-isp/Kconfig | 13 + .../staging/media/sunxi/sun6i-isp/Makefile | 4 + .../staging/media/sunxi/sun6i-isp/sun6i_isp.c | 572 +++++++++ .../staging/media/sunxi/sun6i-isp/sun6i_isp.h | 86 ++ .../media/sunxi/sun6i-isp/sun6i_isp_capture.c | 751 +++++++++++ .../media/sunxi/sun6i-isp/sun6i_isp_capture.h | 78 ++ .../media/sunxi/sun6i-isp/sun6i_isp_params.c | 573 +++++++++ .../media/sunxi/sun6i-isp/sun6i_isp_params.h | 52 + .../media/sunxi/sun6i-isp/sun6i_isp_proc.c | 599 +++++++++ .../media/sunxi/sun6i-isp/sun6i_isp_proc.h | 61 + .../media/sunxi/sun6i-isp/sun6i_isp_reg.h | 275 ++++ .../sunxi/sun6i-isp/uapi/sun6i-isp-config.h | 43 + include/dt-bindings/clock/sun8i-v3s-ccu.h | 2 +- 52 files changed, 8720 insertions(+), 1823 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Makefile create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2_reg.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/Kconfig create mode 100644 drivers/staging/media/sunxi/sun6i-isp/Makefile create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_reg.h create mode 100644 drivers/staging/media/sunxi/sun6i-isp/uapi/sun6i-isp-config.h
Signature · 1 line
2.34.1
PATCH v2 1/66 ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
The csi1 block node was mistakenly added before the gic node, although its address comes after the gic's. Move the node to its correct position.
--- arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/boot/dts/sun8i-v3s.dtsi +11 -11
@@ -593,6 +593,17 @@ spi0: spi@1c68000 { #size-cells = <0>; }; + gic: interrupt-controller@1c81000 { + compatible = "arm,gic-400"; + reg = <0x01c81000 0x1000>, + <0x01c82000 0x2000>, + <0x01c84000 0x2000>, + <0x01c86000 0x2000>; + interrupt-controller; + #interrupt-cells = <3>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + }; + csi1: camera@1cb4000 { compatible = "allwinner,sun8i-v3s-csi"; reg = <0x01cb4000 0x3000>;
@@ -604,16 +615,5 @@ csi1: camera@1cb4000 { resets = <&ccu RST_BUS_CSI>; status = "disabled"; }; - - gic: interrupt-controller@1c81000 { - compatible = "arm,gic-400"; - reg = <0x01c81000 0x1000>, - <0x01c82000 0x2000>, - <0x01c84000 0x2000>, - <0x01c86000 0x2000>; - interrupt-controller; - #interrupt-cells = <3>; - interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; - }; }; };
Signature · 1 line
2.34.1
Maxime Ripard
AppliedRe: (subset) [PATCH v2 01/66] ARM: dts: sun8i: v3s: Move the csi1 block to follow address order
Quoted 5 lines · Paul Kocialkowski
The csi1 block node was mistakenly added before the gic node, although its address comes after the gic's. Move the node to its correct position.
Applied to sunxi/linux.git (sunxi/dt-for-5.18).
Thanks!
Maxime
PATCH v2 2/66 dt-bindings: interconnect: sunxi: Add V3s mbus compatible
In reply to Paul KocialkowskiSince the V3s uses the internal mbus, document its compatible.
--- .../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +1 -0
@@ -31,6 +31,7 @@ properties: - allwinner,sun5i-a13-mbus - allwinner,sun8i-h3-mbus - allwinner,sun8i-r40-mbus + - allwinner,sun8i-v3s-mbus - allwinner,sun50i-a64-mbus reg:
Signature · 1 line
2.34.1
Samuel Holland
maintainerRe: [PATCH v2 02/66] dt-bindings: interconnect: sunxi: Add V3s mbus compatible
Quoted 12 lines · Paul Kocialkowski
Since the V3s uses the internal mbus, document its compatible.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml properties: · line 34
Quoted 4 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +1
-0@@ -31,6 +31,7 @@ properties: - allwinner,sun5i-a13-mbus - allwinner,sun8i-h3-mbus - allwinner,sun8i-r40-mbus + - allwinner,sun8i-v3s-mbus
Please enable the expanded binding added in commit 245578ba9f03 ("dt-bindings:
arm: sunxi: Expand MBUS binding")[1] by adding the new compatible to the "if" block lower in the file. That way we can add V3S devfreq support in the future without changing that binding.
Regards,
Samuel
Quoted 4 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0- allwinner,sun50i-a64-mbus reg:
Re: [PATCH v2 02/66] dt-bindings: interconnect: sunxi: Add V3s mbus compatible
Hi,
Quoted 8 lines · Samuel Holland
Quoted 7 lines · Paul Kocialkowski
Since the V3s uses the internal mbus, document its compatible.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml properties: · line 34
Quoted 9 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +1
-0@@ -31,6 +31,7 @@ properties: - allwinner,sun5i-a13-mbus - allwinner,sun8i-h3-mbus - allwinner,sun8i-r40-mbus + - allwinner,sun8i-v3s-mbusPlease enable the expanded binding added in commit
245578ba9f03("dt-bindings:
arm: sunxi: Expand MBUS binding")[1] by adding the new compatible to the "if" block lower in the file. That way we can add V3S devfreq support in the future without changing that binding.
I had missed that new driver but surely I will expand the updated binding.
By the way do you have an explanation about the cell index given to the interconnects (after &mbus)?
Paul
Quoted 10 lines
Regards,
Samuel[1]: https://git.kernel.org/torvalds/c/245578ba9f03
Quoted 4 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0- allwinner,sun50i-a64-mbus reg:
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Jernej Škrabec
maintainerRe: [PATCH v2 02/66] dt-bindings: interconnect: sunxi: Add V3s mbus compatible
Hi Paul,
Dne ponedeljek, 07. februar 2022 ob 09:43:43 CET je Paul Kocialkowski napisal(a):
Quoted 34 lines
Hi,
Quoted 24 lines · Samuel Holland
Quoted 23 lines · Paul Kocialkowski
Since the V3s uses the internal mbus, document its compatible.
Signed-off-by Paul Kocialkowski <[email protected]>---
.../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + 1 file changed, 1 insertion(+)diff --git a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml index
29c9961ee2d8..b67bf9261a6a100644
---
a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml +++ b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml> >Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0@@ -31,6 +31,7 @@ properties: - allwinner,sun5i-a13-mbus - allwinner,sun8i-h3-mbus - allwinner,sun8i-r40-mbusQuoted 6 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml properties: · line 34
Quoted 1 line
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +1
-0+ - allwinner,sun8i-v3s-mbusPlease enable the expanded binding added in commit
245578ba9f03("dt-bindings: arm: sunxi: Expand MBUS binding")[1] by adding the new compatible to the "if" block lower in the file. That way we can add V3S devfreq support in the future without changing that binding.
Quoted 4 lines
I had missed that new driver but surely I will expand the updated binding.
By the way do you have an explanation about the cell index given to the interconnects (after &mbus)?
This is mbus channel. You can find appropriate one checking DRAM driver in U- Boot, where mbus is configured.
Best regards,
Jernej
Quoted 11 lines
Paul
Quoted 8 lines
Regards,
Samuel[1]: https://git.kernel.org/torvalds/c/245578ba9f03
Quoted 3 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0- allwinner,sun50i-a64-mbusreg:
Re: [PATCH v2 02/66] dt-bindings: interconnect: sunxi: Add V3s mbus compatible
Hi Jernej,
Quoted 38 lines · Jernej Škrabec
Hi Paul,
Dne ponedeljek, 07. februar 2022 ob 09:43:43 CET je Paul Kocialkowski napisal(a):
Quoted 34 lines
Hi,
Quoted 30 lines · Samuel Holland
Quoted 19 lines · Paul Kocialkowski
Since the V3s uses the internal mbus, document its compatible.
Signed-off-by Paul Kocialkowski <[email protected]>---
.../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + 1 file changed, 1 insertion(+)diff --git a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml index
29c9961ee2d8..b67bf9261a6a100644
---
a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml +++ b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus. yaml> >Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml properties: · line 35
Quoted 5 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +1
-0@@ -31,6 +31,7 @@ properties: - allwinner,sun5i-a13-mbus - allwinner,sun8i-h3-mbus - allwinner,sun8i-r40-mbus + - allwinner,sun8i-v3s-mbusPlease enable the expanded binding added in commit
245578ba9f03("dt-bindings: arm: sunxi: Expand MBUS binding")[1] by adding the new compatible to the "if" block lower in the file. That way we can add V3S devfreq support in the future without changing that binding.
Quoted 7 lines
Quoted 4 lines
I had missed that new driver but surely I will expand the updated binding.
By the way do you have an explanation about the cell index given to the interconnects (after &mbus)?
This is mbus channel. You can find appropriate one checking DRAM driver in U- Boot, where mbus is configured.
Thanks, that's exactly what I was looking for! Looks like in my case MBUS_PORT_CSI will be used both for CSI and ISP.
For the record it's also defined in the BSP kernel at:include/linux/sunxi_mbus.h
Thanks,
Paul
Quoted 18 lines
Best regards,
JernejQuoted 11 lines
Paul
Quoted 8 lines
Regards,
Samuel[1]: https://git.kernel.org/torvalds/c/245578ba9f03
Quoted 3 lines
Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml +0
-0- allwinner,sun50i-a64-mbusreg:
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 3/66 clk: sunxi-ng: v3s: Export the MBUS clock to the public header
In reply to Paul KocialkowskiIn order to declare a mbus node for the v3s, expose its dedicated clock to the public header.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 -- include/dt-bindings/clock/sun8i-v3s-ccu.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.h +0 -2
@@ -45,8 +45,6 @@/* Some more module clocks are exported */ -#define CLK_MBUS 72 -/* And the GPU module clock is exported */ #define CLK_PLL_DDR1 74
include/dt-bindings/clock/sun8i-v3s-ccu.h +1 -1
@@ -101,7 +101,7 @@#define CLK_VE 69#define CLK_AC_DIG 70#define CLK_AVS 71 - +#define CLK_MBUS 72#define CLK_MIPI_CSI 73/* Clocks not available on V3s */
Signature · 1 line
2.34.1
PATCH v2 4/66 ARM: dts: sun8i: v3s: Add mbus node to represent the interconnect
In reply to Paul KocialkowskiThe V3s uses the mbus interconnect to provide DRAM access for a number of blocks. The SoC can only map 2 GiB of DRAM, which is reflected in the dma-ranges property.
--- arch/arm/boot/dts/sun8i-v3s.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/sun8i-v3s.dtsi +10 -0
@@ -577,6 +577,16 @@ int_mii_phy: ethernet-phy@1 { }; }; + mbus: dram-controller@1c62000 { + compatible = "allwinner,sun8i-v3s-mbus"; + reg = <0x01c62000 0x1000>; + clocks = <&ccu CLK_MBUS>; + #address-cells = <1>; + #size-cells = <1>; + dma-ranges = <0x00000000 0x40000000 0x80000000>; + #interconnect-cells = <1>; + }; + spi0: spi@1c68000 { compatible = "allwinner,sun8i-h3-spi"; reg = <0x01c68000 0x1000>;
Signature · 1 line
2.34.1
PATCH v2 5/66 dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property
In reply to Paul KocialkowskiThe Allwinner A31 MIPI D-PHY block supports both tx and rx directions, although each instance of the block is meant to be used in one direction only. There will typically be one instance for MIPI DSI and one for MIPI CSI-2 (it seems unlikely to ever see a shared instance).
Describe the direction with a new allwinner,direction property. For backwards compatibility, the property is optional and tx mode should be assumed by default.
--- .../bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +12 -0
@@ -37,6 +37,18 @@ properties: resets: maxItems: 1 + allwinner,direction: + $ref: '/schemas/types.yaml#/definitions/string' + description: | + Direction of the D-PHY: + - "rx" for receiving (e.g. when used with MIPI CSI-2); + - "tx" for transmitting (e.g. when used with MIPI DSI). + + enum: + - tx + - rx + default: tx + required: - "#phy-cells" - compatible
Signature · 1 line
2.34.1
Rob Herring
maintainerRe: [PATCH v2 05/66] dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property
Quoted 23 lines · Paul Kocialkowski
The Allwinner A31 MIPI D-PHY block supports both tx and rx directions, although each instance of the block is meant to be used in one direction only. There will typically be one instance for MIPI DSI and one for MIPI CSI-2 (it seems unlikely to ever see a shared instance).
Describe the direction with a new allwinner,direction property. For backwards compatibility, the property is optional and tx mode should be assumed by default.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+)Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +1
-0@@ -37,6 +37,18 @@ properties: resets: maxItems: 1 + allwinner,direction:
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml properties: · line 50
Quoted 10 lines
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +10
-0+ $ref: '/schemas/types.yaml#/definitions/string' + description: | + Direction of the D-PHY: + - "rx" for receiving (e.g. when used with MIPI CSI-2); + - "tx" for transmitting (e.g. when used with MIPI DSI). + + enum: + - tx + - rx + default: tx
Can you the phy mode to imply the direction?
Rob
Re: [PATCH v2 05/66] dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property
Hi Rob,
Quoted 23 lines · Rob Herring
Quoted 22 lines · Paul Kocialkowski
The Allwinner A31 MIPI D-PHY block supports both tx and rx directions, although each instance of the block is meant to be used in one direction only. There will typically be one instance for MIPI DSI and one for MIPI CSI-2 (it seems unlikely to ever see a shared instance).
Describe the direction with a new allwinner,direction property. For backwards compatibility, the property is optional and tx mode should be assumed by default.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+)Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +0
-0@@ -37,6 +37,18 @@ properties: resets: maxItems: 1
Quoted 13 lines
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml properties: · line 50
Quoted 11 lines
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +11
-0+ allwinner,direction: + $ref: '/schemas/types.yaml#/definitions/string' + description: | + Direction of the D-PHY: + - "rx" for receiving (e.g. when used with MIPI CSI-2); + - "tx" for transmitting (e.g. when used with MIPI DSI). + + enum: + - tx + - rx + default: txCan you the phy mode to imply the direction?
So there was a first attempt at this which introduced a PHY submode but it was concluded after discussions that the direction is not really a mode of operation choice, in the sense that the D-PHY cannot be reconfigured to behave in Rx or Tx mode: it is instead statically assigned to one role or the other. This is why it feels more appropriate to describe it in the device-tree.
See this thread from the previous iteration:
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/#128800
Cheers,
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 05/66] dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property
Quoted 40 lines · Paul Kocialkowski
Hi Rob,
Quoted 23 lines · Rob Herring
Quoted 22 lines · Paul Kocialkowski
The Allwinner A31 MIPI D-PHY block supports both tx and rx directions, although each instance of the block is meant to be used in one direction only. There will typically be one instance for MIPI DSI and one for MIPI CSI-2 (it seems unlikely to ever see a shared instance).
Describe the direction with a new allwinner,direction property. For backwards compatibility, the property is optional and tx mode should be assumed by default.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+)Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +0
-0@@ -37,6 +37,18 @@ properties: resets: maxItems: 1Quoted 13 lines
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml properties: · line 50
Quoted 11 lines
Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml +11
-0+ allwinner,direction: + $ref: '/schemas/types.yaml#/definitions/string' + description: | + Direction of the D-PHY: + - "rx" for receiving (e.g. when used with MIPI CSI-2); + - "tx" for transmitting (e.g. when used with MIPI DSI). + + enum: + - tx + - rx + default: txCan you the phy mode to imply the direction?
Quoted 6 lines
So there was a first attempt at this which introduced a PHY submode but it was concluded after discussions that the direction is not really a mode of operation choice, in the sense that the D-PHY cannot be reconfigured to behave in Rx or Tx mode: it is instead statically assigned to one role or the other. This is why it feels more appropriate to describe it in the device-tree.
Another option could be different compatible strings, as the RX and TX PHYs actually have very little in common. I don't mind much either way.
Quoted 2 lines
See this thread from the previous iteration:
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/#128800
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v2 6/66 phy: allwinner: phy-sun6i-mipi-dphy: Support D-PHY Rx mode for MIPI CSI-2
In reply to Paul KocialkowskiThe Allwinner A31 D-PHY supports both Rx and Tx modes. While the latter is already supported and used for MIPI DSI this adds support for the former, to be used with MIPI CSI-2.
This implementation is inspired by Allwinner's V3s Linux SDK implementation, which was used as a documentation base.
It uses the direction dt property to distinguish between tx and rx directions.
--- drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 166 +++++++++++++++++++- 1 file changed, 162 insertions(+), 4 deletions(-)
drivers/phy/allwinner/phy-sun6i-mipi-dphy.c +162 -4
@@ -24,6 +24,14 @@#define SUN6I_DPHY_TX_CTL_REG 0x04#define SUN6I_DPHY_TX_CTL_HS_TX_CLK_CONT BIT(28) +#define SUN6I_DPHY_RX_CTL_REG 0x08 +#define SUN6I_DPHY_RX_CTL_EN_DBC BIT(31) +#define SUN6I_DPHY_RX_CTL_RX_CLK_FORCE BIT(24) +#define SUN6I_DPHY_RX_CTL_RX_D3_FORCE BIT(23) +#define SUN6I_DPHY_RX_CTL_RX_D2_FORCE BIT(22) +#define SUN6I_DPHY_RX_CTL_RX_D1_FORCE BIT(21) +#define SUN6I_DPHY_RX_CTL_RX_D0_FORCE BIT(20) +#define SUN6I_DPHY_TX_TIME0_REG 0x10#define SUN6I_DPHY_TX_TIME0_HS_TRAIL (n) (((n) & 0xff) << 24)#define SUN6I_DPHY_TX_TIME0_HS_PREPARE (n) (((n) & 0xff) << 16)
@@ -44,12 +52,29 @@#define SUN6I_DPHY_TX_TIME4_HS_TX_ANA1 (n) (((n) & 0xff) << 8)#define SUN6I_DPHY_TX_TIME4_HS_TX_ANA0 (n) ((n) & 0xff) +#define SUN6I_DPHY_RX_TIME0_REG 0x30 +#define SUN6I_DPHY_RX_TIME0_HS_RX_SYNC (n) (((n) & 0xff) << 24) +#define SUN6I_DPHY_RX_TIME0_HS_RX_CLK_MISS (n) (((n) & 0xff) << 16) +#define SUN6I_DPHY_RX_TIME0_LP_RX (n) (((n) & 0xff) << 8) + +#define SUN6I_DPHY_RX_TIME1_REG 0x34 +#define SUN6I_DPHY_RX_TIME1_RX_DLY (n) (((n) & 0xfff) << 20) +#define SUN6I_DPHY_RX_TIME1_LP_RX_ULPS_WP (n) ((n) & 0xfffff) + +#define SUN6I_DPHY_RX_TIME2_REG 0x38 +#define SUN6I_DPHY_RX_TIME2_HS_RX_ANA1 (n) (((n) & 0xff) << 8) +#define SUN6I_DPHY_RX_TIME2_HS_RX_ANA0 (n) ((n) & 0xff) + +#define SUN6I_DPHY_RX_TIME3_REG 0x40 +#define SUN6I_DPHY_RX_TIME3_LPRST_DLY (n) (((n) & 0xffff) << 16) +#define SUN6I_DPHY_ANA0_REG 0x4c#define SUN6I_DPHY_ANA0_REG_PWS BIT(31)#define SUN6I_DPHY_ANA0_REG_DMPC BIT(28)#define SUN6I_DPHY_ANA0_REG_DMPD (n) (((n) & 0xf) << 24)#define SUN6I_DPHY_ANA0_REG_SLV (n) (((n) & 7) << 12)#define SUN6I_DPHY_ANA0_REG_DEN (n) (((n) & 0xf) << 8) +#define SUN6I_DPHY_ANA0_REG_SFB (n) (((n) & 3) << 2)#define SUN6I_DPHY_ANA1_REG 0x50#define SUN6I_DPHY_ANA1_REG_VTTMODE BIT(31)
@@ -84,6 +109,11 @@#define SUN6I_DPHY_DBG5_REG 0xf4 +enum sun6i_dphy_direction { +SUN6I_DPHY_DIRECTION_TX , +SUN6I_DPHY_DIRECTION_RX , +}; +struct sun6i_dphy {struct clk *bus_clk;struct clk *mod_clk;
@@ -92,6 +122,8 @@ struct sun6i_dphy {struct phy *phy;struct phy_configure_opts_mipi_dphy config; + +enum sun6i_dphy_direction direction; };static int sun6i_dphy_init (struct phy *phy)
@@ -119,9 +151,8 @@ static int sun6i_dphy_configure(struct phy *phy, union phy_configure_opts *opts)return 0 ; } -static int sun6i_dphy_power_on (struct phy *phy) +static int sun6i_dphy_tx_power_on (struct sun6i_dphy *dphy) { -struct sun6i_dphy *dphy =phy_get_drvdata (phy);u8 lanes_mask =GENMASK (dphy->config.lanes -1 ,0 ); regmap_write(dphy->regs, SUN6I_DPHY_TX_CTL_REG,
@@ -211,12 +242,129 @@ static int sun6i_dphy_power_on(struct phy *phy)return 0 ; } +static int sun6i_dphy_rx_power_on (struct sun6i_dphy *dphy) +{ +/* Physical clock rate is actually half of symbol rate with DDR. */ +unsigned long mipi_symbol_rate = dphy->config.hs_clk_rate; +unsigned long dphy_clk_rate; +unsigned int rx_dly; +unsigned int lprst_dly; +u32 value; + + dphy_clk_rate =clk_get_rate (dphy->mod_clk); +if (!dphy_clk_rate) +return -EINVAL ; + +/* Hardcoded timing parameters from the Allwinner BSP. */ +regmap_write (dphy->regs,SUN6I_DPHY_RX_TIME0_REG , +SUN6I_DPHY_RX_TIME0_HS_RX_SYNC (255 ) | +SUN6I_DPHY_RX_TIME0_HS_RX_CLK_MISS (255 ) | +SUN6I_DPHY_RX_TIME0_LP_RX (255 )); + +/* +* Formula from the Allwinner BSP, with hardcoded coefficients +* (probably internal divider/multiplier). +*/ + rx_dly =8 * (unsigned int )(dphy_clk_rate / (mipi_symbol_rate /8 )); + +/* +* The Allwinner BSP has an alternative formula for LP_RX_ULPS_WP: +* lp_ulps_wp_cnt = lp_ulps_wp_ms * lp_clk / 1000 +* but does not use it and hardcodes 255 instead. +*/ +regmap_write (dphy->regs,SUN6I_DPHY_RX_TIME1_REG , +SUN6I_DPHY_RX_TIME1_RX_DLY (rx_dly) | +SUN6I_DPHY_RX_TIME1_LP_RX_ULPS_WP (255 )); + +/* HS_RX_ANA0 value is hardcoded in the Allwinner BSP. */ +regmap_write (dphy->regs,SUN6I_DPHY_RX_TIME2_REG , +SUN6I_DPHY_RX_TIME2_HS_RX_ANA0 (4 )); + +/* +* Formula from the Allwinner BSP, with hardcoded coefficients +* (probably internal divider/multiplier). +*/ + lprst_dly =4 * (unsigned int )(dphy_clk_rate / (mipi_symbol_rate /2 )); + +regmap_write (dphy->regs,SUN6I_DPHY_RX_TIME3_REG , +SUN6I_DPHY_RX_TIME3_LPRST_DLY (lprst_dly)); + +/* Analog parameters are hardcoded in the Allwinner BSP. */ +regmap_write (dphy->regs,SUN6I_DPHY_ANA0_REG , +SUN6I_DPHY_ANA0_REG_PWS | +SUN6I_DPHY_ANA0_REG_SLV (7 ) | +SUN6I_DPHY_ANA0_REG_SFB (2 )); + +regmap_write (dphy->regs,SUN6I_DPHY_ANA1_REG , +SUN6I_DPHY_ANA1_REG_SVTT (4 )); + +regmap_write (dphy->regs,SUN6I_DPHY_ANA4_REG , +SUN6I_DPHY_ANA4_REG_DMPLVC | +SUN6I_DPHY_ANA4_REG_DMPLVD (1 )); + +regmap_write (dphy->regs,SUN6I_DPHY_ANA2_REG , +SUN6I_DPHY_ANA2_REG_ENIB ); + +regmap_write (dphy->regs,SUN6I_DPHY_ANA3_REG , +SUN6I_DPHY_ANA3_EN_LDOR | +SUN6I_DPHY_ANA3_EN_LDOC | +SUN6I_DPHY_ANA3_EN_LDOD ); + +/* +* Delay comes from the Allwinner BSP, likely for internal regulator +* ramp-up. +*/ +udelay (3 ); + + value =SUN6I_DPHY_RX_CTL_EN_DBC |SUN6I_DPHY_RX_CTL_RX_CLK_FORCE ; + +/* +* Rx data lane force-enable bits are used as regular RX enable by the +* Allwinner BSP. +*/ +if (dphy->config.lanes >=1 ) + value |=SUN6I_DPHY_RX_CTL_RX_D0_FORCE ; +if (dphy->config.lanes >=2 ) + value |=SUN6I_DPHY_RX_CTL_RX_D1_FORCE ; +if (dphy->config.lanes >=3 ) + value |=SUN6I_DPHY_RX_CTL_RX_D2_FORCE ; +if (dphy->config.lanes ==4 ) + value |=SUN6I_DPHY_RX_CTL_RX_D3_FORCE ; + +regmap_write (dphy->regs,SUN6I_DPHY_RX_CTL_REG , value); + +regmap_write (dphy->regs,SUN6I_DPHY_GCTL_REG , +SUN6I_DPHY_GCTL_LANE_NUM (dphy->config.lanes) | +SUN6I_DPHY_GCTL_EN ); + +return 0 ; +} + +static int sun6i_dphy_power_on (struct phy *phy) +{ +struct sun6i_dphy *dphy =phy_get_drvdata (phy); + +switch (dphy->direction) { +case SUN6I_DPHY_DIRECTION_TX : +return sun6i_dphy_tx_power_on (dphy); +case SUN6I_DPHY_DIRECTION_RX : +return sun6i_dphy_rx_power_on (dphy); +default : +return -EINVAL ; + } +} +static int sun6i_dphy_power_off (struct phy *phy) {struct sun6i_dphy *dphy =phy_get_drvdata (phy); -regmap_update_bits (dphy->regs,SUN6I_DPHY_ANA1_REG , -SUN6I_DPHY_ANA1_REG_VTTMODE ,0 ); +regmap_write (dphy->regs,SUN6I_DPHY_GCTL_REG ,0 ); + +regmap_write (dphy->regs,SUN6I_DPHY_ANA0_REG ,0 ); +regmap_write (dphy->regs,SUN6I_DPHY_ANA1_REG ,0 ); +regmap_write (dphy->regs,SUN6I_DPHY_ANA2_REG ,0 ); +regmap_write (dphy->regs,SUN6I_DPHY_ANA3_REG ,0 ); +regmap_write (dphy->regs,SUN6I_DPHY_ANA4_REG ,0 );return 0 ; }
@@ -253,7 +401,9 @@ static int sun6i_dphy_probe(struct platform_device *pdev) {struct phy_provider *phy_provider;struct sun6i_dphy *dphy; +const char *direction;void __iomem *regs; +int ret; dphy =devm_kzalloc (&pdev->dev,sizeof (*dphy),GFP_KERNEL );if (!dphy)
@@ -290,6 +440,14 @@ static int sun6i_dphy_probe(struct platform_device *pdev)return PTR_ERR (dphy->phy); } + dphy->direction =SUN6I_DPHY_DIRECTION_TX ; + + ret =of_property_read_string (pdev->dev.of_node,"allwinner,direction" , + &direction); + +if (!ret && !strncmp (direction,"rx" ,2 )) + dphy->direction =SUN6I_DPHY_DIRECTION_RX ; +phy_set_drvdata (dphy->phy, dphy); phy_provider =devm_of_phy_provider_register (&pdev->dev, of_phy_simple_xlate);
Signature · 1 line
2.34.1
PATCH v2 7/66 dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
In reply to Paul KocialkowskiThe A31 CSI controller supports two distinct input interfaces:
parallel and an external MIPI CSI-2 bridge. The parallel interface is often connected to a set of hardware pins while the MIPI CSI-2 bridge is an internal FIFO-ish link. As a result, these two inputs are distinguished as two different ports.
Note that only one of the two may be present on a controller instance. For example, the V3s has one controller dedicated to MIPI-CSI2 and one dedicated to parallel.
Update the binding with an explicit ports node that holds two distinct port nodes: one for parallel input and one for MIPI CSI-2.
This is backward-compatible with the single-port approach that was previously taken for representing the parallel interface port, which stays enumerated as fwnode port 0.
Note that additional ports may be added in the future, especially to support feeding the CSI controller's output to the ISP.
--- .../media/allwinner,sun6i-a31-csi.yaml | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +47 -13
@@ -61,6 +61,34 @@ properties: additionalProperties: false + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: "#/properties/port" + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: MIPI CSI-2 bridge input port + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1 + required: - compatible - reg
@@ -89,19 +117,25 @@ examples: "ram"; resets = <&ccu RST_BUS_CSI>; - port { - /* Parallel bus endpoint */ - csi1_ep: endpoint { - remote-endpoint = <&adv7611_ep>; - bus-width = <16>; - - /* - * If hsync-active/vsync-active are missing, - * embedded BT.656 sync is used. - */ - hsync-active = <0>; /* Active low */ - vsync-active = <0>; /* Active low */ - pclk-sample = <1>; /* Rising */ + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + /* Parallel bus endpoint */ + csi1_ep: endpoint { + remote-endpoint = <&adv7611_ep>; + bus-width = <16>; + + /* + * If hsync-active/vsync-active are missing, + * embedded BT.656 sync is used. + */ + hsync-active = <0>; /* Active low */ + vsync-active = <0>; /* Active low */ + pclk-sample = <1>; /* Rising */ + }; }; }; };
Signature · 1 line
2.34.1
Re: [PATCH v2 07/66] dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
Hi Paul,
Thank you for the patch.
Quoted 9 lines · Paul Kocialkowski
The A31 CSI controller supports two distinct input interfaces:
parallel and an external MIPI CSI-2 bridge. The parallel interface is often connected to a set of hardware pins while the MIPI CSI-2 bridge is an internal FIFO-ish link. As a result, these two inputs are distinguished as two different ports.Note that only one of the two may be present on a controller instance. For example, the V3s has one controller dedicated to MIPI-CSI2 and one dedicated to parallel.
Is it that only one of the two is present, or only one of the two is connected ? In the latter case I'd make both ports required, but with only one of them connected.
Quoted 46 lines
Update the binding with an explicit ports node that holds two distinct port nodes: one for parallel input and one for MIPI CSI-2.
This is backward-compatible with the single-port approach that was previously taken for representing the parallel interface port, which stays enumerated as fwnode port 0.
Note that additional ports may be added in the future, especially to support feeding the CSI controller's output to the ISP.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Rob Herring <[email protected]>Acked-by Maxime Ripard <[email protected]>--- .../media/allwinner,sun6i-a31-csi.yaml | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-)Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +21
-0@@ -61,6 +61,34 @@ properties: additionalProperties: false + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: "#/properties/port" + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: MIPI CSI-2 bridge input port + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml properties: · line 94
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +7
-0+ + anyOf: + - required: + - port@0 + - required: + - port@1 + required: - compatible - reg
Shouldn't you specify that either port or ports is required, but not both ? I'd also add a comment in the port node to tell it's deprecated, and that ports should be used instead.
Quoted 25 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +8
-13@@ -89,19 +117,25 @@ examples: "ram"; resets = <&ccu RST_BUS_CSI>; - port { - /* Parallel bus endpoint */ - csi1_ep: endpoint { - remote-endpoint = <&adv7611_ep>; - bus-width = <16>; - - /* - * If hsync-active/vsync-active are missing, - * embedded BT.656 sync is used. - */ - hsync-active = <0>; /* Active low */ - vsync-active = <0>; /* Active low */ - pclk-sample = <1>; /* Rising */ + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + /* Parallel bus endpoint */ + csi1_ep: endpoint {
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml examples: · line 137
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +10
-0+ remote-endpoint = <&adv7611_ep>; + bus-width = <16>; + + /* + * If hsync-active/vsync-active are missing, + * embedded BT.656 sync is used. + */ + hsync-active = <0>; /* Active low */ + vsync-active = <0>; /* Active low */ + pclk-sample = <1>; /* Rising */
Wrong indentation.
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ }; }; }; };
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH v2 07/66] dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
Hi Laurent,
Thanks for the review!
Quoted 11 lines · Laurent Pinchart
Hi Paul,
Thank you for the patch.
Quoted 6 lines · Paul Kocialkowski
The A31 CSI controller supports two distinct input interfaces:
parallel and an external MIPI CSI-2 bridge. The parallel interface is often connected to a set of hardware pins while the MIPI CSI-2 bridge is an internal FIFO-ish link. As a result, these two inputs are distinguished as two different ports.
Quoted 7 lines
Quoted 3 lines
Note that only one of the two may be present on a controller instance. For example, the V3s has one controller dedicated to MIPI-CSI2 and one dedicated to parallel.
Is it that only one of the two is present, or only one of the two is connected ? In the latter case I'd make both ports required, but with only one of them connected.
There are situations where the actual pins for parallel (port@0) are missing and the controller is dedicated to its mipi csi-2 bridge (port@1), cases where the two are present and cases where the mipi csi-2 bridge doesn't exist. So all in all it's really legit that only one port may be defined.
Quoted 52 lines
Quoted 52 lines
Update the binding with an explicit ports node that holds two distinct port nodes: one for parallel input and one for MIPI CSI-2.
This is backward-compatible with the single-port approach that was previously taken for representing the parallel interface port, which stays enumerated as fwnode port 0.
Note that additional ports may be added in the future, especially to support feeding the CSI controller's output to the ISP.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Rob Herring <[email protected]>Acked-by Maxime Ripard <[email protected]>--- .../media/allwinner,sun6i-a31-csi.yaml | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-)Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +27
-0@@ -61,6 +61,34 @@ properties: additionalProperties: false + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: "#/properties/port" + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: MIPI CSI-2 bridge input port + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1
Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml properties: · line 94
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ required: - compatible - regShouldn't you specify that either port or ports is required, but not both ? I'd also add a comment in the port node to tell it's deprecated, and that ports should be used instead.
Yes I agree on both points. I guess that should be a:
oneOf:
- required:
- ports
- required:
- port
(but feel free to correct me).
Quoted 29 lines
Quoted 29 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +12
-13@@ -89,19 +117,25 @@ examples: "ram"; resets = <&ccu RST_BUS_CSI>; - port { - /* Parallel bus endpoint */ - csi1_ep: endpoint { - remote-endpoint = <&adv7611_ep>; - bus-width = <16>; - - /* - * If hsync-active/vsync-active are missing, - * embedded BT.656 sync is used. - */ - hsync-active = <0>; /* Active low */ - vsync-active = <0>; /* Active low */ - pclk-sample = <1>; /* Rising */ + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + /* Parallel bus endpoint */ + csi1_ep: endpoint { + remote-endpoint = <&adv7611_ep>; + bus-width = <16>; + + /*
Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml examples: · line 137
Quoted 6 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +6
-0+ * If hsync-active/vsync-active are missing, + * embedded BT.656 sync is used. + */ + hsync-active = <0>; /* Active low */ + vsync-active = <0>; /* Active low */ + pclk-sample = <1>; /* Rising */Wrong indentation.
The double-space before /* Rising */ or something with the heading indent?
Thanks,
Paul
Quoted 9 lines
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ }; }; }; };Signature · 3 lines
Regards, Laurent Pinchart
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 07/66] dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
Quoted 20 lines · Paul Kocialkowski
Hi Laurent,
Thanks for the review!
Quoted 15 lines · Laurent Pinchart
Hi Paul,
Thank you for the patch.
Quoted 9 lines · Paul Kocialkowski
The A31 CSI controller supports two distinct input interfaces:
parallel and an external MIPI CSI-2 bridge. The parallel interface is often connected to a set of hardware pins while the MIPI CSI-2 bridge is an internal FIFO-ish link. As a result, these two inputs are distinguished as two different ports.Note that only one of the two may be present on a controller instance. For example, the V3s has one controller dedicated to MIPI-CSI2 and one dedicated to parallel.
Quoted 8 lines
Quoted 3 lines
Is it that only one of the two is present, or only one of the two is connected ? In the latter case I'd make both ports required, but with only one of them connected.
There are situations where the actual pins for parallel (port@0) are missing and the controller is dedicated to its mipi csi-2 bridge (port@1), cases where the two are present and cases where the mipi csi-2 bridge doesn't exist. So all in all it's really legit that only one port may be defined.
The port could still exist internally in the IP core though. Of course that's hard to tell.
Quoted 109 lines
Quoted 52 lines
Quoted 52 lines
Update the binding with an explicit ports node that holds two distinct port nodes: one for parallel input and one for MIPI CSI-2.
This is backward-compatible with the single-port approach that was previously taken for representing the parallel interface port, which stays enumerated as fwnode port 0.
Note that additional ports may be added in the future, especially to support feeding the CSI controller's output to the ISP.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Rob Herring <[email protected]>Acked-by Maxime Ripard <[email protected]>--- .../media/allwinner,sun6i-a31-csi.yaml | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-)Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +27
-0@@ -61,6 +61,34 @@ properties: additionalProperties: false + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: "#/properties/port" + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: MIPI CSI-2 bridge input port + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml properties: · line 94
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ required: - compatible - regShouldn't you specify that either port or ports is required, but not both ? I'd also add a comment in the port node to tell it's deprecated, and that ports should be used instead.
Yes I agree on both points. I guess that should be a:
oneOf:
- required:
- ports
- required:
- port(but feel free to correct me).
Quoted 29 lines
Quoted 29 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +12
-13@@ -89,19 +117,25 @@ examples: "ram"; resets = <&ccu RST_BUS_CSI>; - port { - /* Parallel bus endpoint */ - csi1_ep: endpoint { - remote-endpoint = <&adv7611_ep>; - bus-width = <16>; - - /* - * If hsync-active/vsync-active are missing, - * embedded BT.656 sync is used. - */ - hsync-active = <0>; /* Active low */ - vsync-active = <0>; /* Active low */ - pclk-sample = <1>; /* Rising */ + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + /* Parallel bus endpoint */ + csi1_ep: endpoint { + remote-endpoint = <&adv7611_ep>; + bus-width = <16>; + + /*Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml examples: · line 137
Quoted 6 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +6
-0+ * If hsync-active/vsync-active are missing, + * embedded BT.656 sync is used. + */ + hsync-active = <0>; /* Active low */ + vsync-active = <0>; /* Active low */ + pclk-sample = <1>; /* Rising */Wrong indentation.
Quoted 1 line
The double-space before /* Rising */ or something with the heading indent?
The heading has one extra space for all three lines, they should be aligned to the / of /*, not to the *.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ }; }; }; };
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH v2 07/66] dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port
Hi,
Quoted 25 lines · Laurent Pinchart
Quoted 24 lines · Paul Kocialkowski
Hi Laurent,
Thanks for the review!
Quoted 18 lines · Laurent Pinchart
Hi Paul,
Thank you for the patch.
Quoted 9 lines · Paul Kocialkowski
The A31 CSI controller supports two distinct input interfaces:
parallel and an external MIPI CSI-2 bridge. The parallel interface is often connected to a set of hardware pins while the MIPI CSI-2 bridge is an internal FIFO-ish link. As a result, these two inputs are distinguished as two different ports.Note that only one of the two may be present on a controller instance. For example, the V3s has one controller dedicated to MIPI-CSI2 and one dedicated to parallel.
Is it that only one of the two is present, or only one of the two is connected ? In the latter case I'd make both ports required, but with only one of them connected.
Quoted 7 lines
Quoted 4 lines
There are situations where the actual pins for parallel (port@0) are missing and the controller is dedicated to its mipi csi-2 bridge (port@1), cases where the two are present and cases where the mipi csi-2 bridge doesn't exist. So all in all it's really legit that only one port may be defined.
The port could still exist internally in the IP core though. Of course that's hard to tell.
Yes that's true, the bit to switch input to mipi csi-2 is there in all cases but I don't think it makes sense to expose the port in situations where no controller is attached.
Quoted 109 lines
Quoted 109 lines
Quoted 52 lines
Quoted 52 lines
Update the binding with an explicit ports node that holds two distinct port nodes: one for parallel input and one for MIPI CSI-2.
This is backward-compatible with the single-port approach that was previously taken for representing the parallel interface port, which stays enumerated as fwnode port 0.
Note that additional ports may be added in the future, especially to support feeding the CSI controller's output to the ISP.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Rob Herring <[email protected]>Acked-by Maxime Ripard <[email protected]>--- .../media/allwinner,sun6i-a31-csi.yaml | 60 +++++++++++++++---- 1 file changed, 47 insertions(+), 13 deletions(-)Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +27
-0@@ -61,6 +61,34 @@ properties: additionalProperties: false + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: "#/properties/port" + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: MIPI CSI-2 bridge input port + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml properties: · line 94
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ required: - compatible - regShouldn't you specify that either port or ports is required, but not both ? I'd also add a comment in the port node to tell it's deprecated, and that ports should be used instead.
Yes I agree on both points. I guess that should be a:
oneOf:
- required:
- ports
- required:
- port(but feel free to correct me).
Quoted 37 lines
Quoted 25 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +8
-13@@ -89,19 +117,25 @@ examples: "ram"; resets = <&ccu RST_BUS_CSI>; - port { - /* Parallel bus endpoint */ - csi1_ep: endpoint { - remote-endpoint = <&adv7611_ep>; - bus-width = <16>; - - /* - * If hsync-active/vsync-active are missing, - * embedded BT.656 sync is used. - */ - hsync-active = <0>; /* Active low */ - vsync-active = <0>; /* Active low */ - pclk-sample = <1>; /* Rising */ + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + /* Parallel bus endpoint */ + csi1_ep: endpoint {Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml examples: · line 137
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +10
-0+ remote-endpoint = <&adv7611_ep>; + bus-width = <16>; + + /* + * If hsync-active/vsync-active are missing, + * embedded BT.656 sync is used. + */ + hsync-active = <0>; /* Active low */ + vsync-active = <0>; /* Active low */ + pclk-sample = <1>; /* Rising */Wrong indentation.
Quoted 4 lines
Quoted 1 line
The double-space before /* Rising */ or something with the heading indent?
The heading has one extra space for all three lines, they should be aligned to the / of /*, not to the *.
Oh that's true, good catch thanks!
Paul
Quoted 9 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +1
-0+ }; }; }; };Signature · 3 lines
Regards, Laurent Pinchart
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 8/66 dt-bindings: media: Add Allwinner A31 MIPI CSI-2 bindings documentation
In reply to Paul KocialkowskiThis introduces YAML bindings documentation for the Allwinner A31 MIPI CSI-2 controller.
--- .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +142 -0
@@ -0,0 +1,142 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-mipi-csi2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 MIPI CSI-2 Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + oneOf: + - const: allwinner,sun6i-a31-mipi-csi2 + - items: + - const: allwinner,sun8i-v3s-mipi-csi2 + - const: allwinner,sun6i-a31-mipi-csi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: bus + - const: mod + + phys: + maxItems: 1 + description: MIPI D-PHY + + phy-names: + items: + - const: dphy + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Input port, connect to a MIPI CSI-2 sensor + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - data-lanes + + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Output port, connect to a CSI controller + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - phys + - phy-names + - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-v3s-ccu.h> + #include <dt-bindings/reset/sun8i-v3s-ccu.h> + + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-v3s-mipi-csi2", + "allwinner,sun6i-a31-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_CSI>; + + phys = <&dphy>; + phy-names = "dphy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + + mipi_csi2_in_ov5648: endpoint { + data-lanes = <1 2 3 4>; + + remote-endpoint = <&ov5648_out_mipi_csi2>; + }; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + + mipi_csi2_out_csi0: endpoint { + remote-endpoint = <&csi0_in_mipi_csi2>; + }; + }; + }; + }; + +...
Signature · 1 line
2.34.1
Re: [PATCH v2 08/66] dt-bindings: media: Add Allwinner A31 MIPI CSI-2 bindings documentation
Hi Paul,
Thank you for the patch.
Quoted 92 lines · Paul Kocialkowski
This introduces YAML bindings documentation for the Allwinner A31 MIPI CSI-2 controller.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Maxime Ripard <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yamlDocumentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +75
-0@@ -0,0 +1,142 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-mipi-csi2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 MIPI CSI-2 Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + oneOf: + - const: allwinner,sun6i-a31-mipi-csi2 + - items: + - const: allwinner,sun8i-v3s-mipi-csi2 + - const: allwinner,sun6i-a31-mipi-csi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: bus + - const: mod + + phys: + maxItems: 1 + description: MIPI D-PHY + + phy-names: + items: + - const: dphy + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Input port, connect to a MIPI CSI-2 sensor + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - data-lanes + + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Output port, connect to a CSI controller
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml line 85
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +10
-0+ + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false
The two ports should be required.
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml line 94
Quoted 9 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +9
-0+ +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - phys + - phy-names
And ports should be required here.
Quoted 48 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +48
-0+ - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-v3s-ccu.h> + #include <dt-bindings/reset/sun8i-v3s-ccu.h> + + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-v3s-mipi-csi2", + "allwinner,sun6i-a31-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_CSI>; + + phys = <&dphy>; + phy-names = "dphy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + + mipi_csi2_in_ov5648: endpoint { + data-lanes = <1 2 3 4>; + + remote-endpoint = <&ov5648_out_mipi_csi2>; + }; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + + mipi_csi2_out_csi0: endpoint { + remote-endpoint = <&csi0_in_mipi_csi2>; + }; + }; + }; + }; + +...
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH v2 08/66] dt-bindings: media: Add Allwinner A31 MIPI CSI-2 bindings documentation
Hi Laurent,
Thanks for the review!
Quoted 101 lines · Laurent Pinchart
Hi Paul,
Thank you for the patch.
Quoted 96 lines · Paul Kocialkowski
This introduces YAML bindings documentation for the Allwinner A31 MIPI CSI-2 controller.
Signed-off-by Paul Kocialkowski <[email protected]>Reviewed-by Maxime Ripard <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yamlDocumentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +79
-0@@ -0,0 +1,142 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-mipi-csi2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 MIPI CSI-2 Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + oneOf: + - const: allwinner,sun6i-a31-mipi-csi2 + - items: + - const: allwinner,sun8i-v3s-mipi-csi2 + - const: allwinner,sun6i-a31-mipi-csi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: bus + - const: mod + + phys: + maxItems: 1 + description: MIPI D-PHY + + phy-names: + items: + - const: dphy + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Input port, connect to a MIPI CSI-2 sensor + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - data-lanes + + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Output port, connect to a CSI controller + + properties: + reg: + const: 1
Quoted 8 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml line 71
Quoted 6 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +6
-0+ + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: falseThe two ports should be required.
Agreed.
Quoted 11 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml line 94
Quoted 9 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +9
-0+ +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - phys + - phy-namesAnd ports should be required here.
Sure!
Thanks,
Paul
Quoted 55 lines
Reviewed-by Laurent Pinchart <[email protected]>Quoted 48 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml new file +48
-0+ - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-v3s-ccu.h> + #include <dt-bindings/reset/sun8i-v3s-ccu.h> + + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-v3s-mipi-csi2", + "allwinner,sun6i-a31-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_CSI>; + + phys = <&dphy>; + phy-names = "dphy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + + mipi_csi2_in_ov5648: endpoint { + data-lanes = <1 2 3 4>; + + remote-endpoint = <&ov5648_out_mipi_csi2>; + }; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + + mipi_csi2_out_csi0: endpoint { + remote-endpoint = <&csi0_in_mipi_csi2>; + }; + }; + }; + }; + +...Signature · 3 lines
Regards, Laurent Pinchart
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 9/66 media: sunxi: Add support for the A31 MIPI CSI-2 controller
In reply to Paul KocialkowskiThe A31 MIPI CSI-2 controller is a dedicated MIPI CSI-2 bridge found on Allwinner SoCs such as the A31 and V3/V3s.
It is a standalone block, connected to the CSI controller on one side and to the MIPI D-PHY block on the other. It has a dedicated address space, interrupt line and clock.
It is represented as a V4L2 subdev to the CSI controller and takes a MIPI CSI-2 sensor as its own subdev, all using the fwnode graph and media controller API.
Only 8-bit and 10-bit Bayer formats are currently supported. While up to 4 internal channels to the CSI controller exist, only one is currently supported by this implementation.
--- drivers/media/platform/sunxi/Kconfig | 1 + drivers/media/platform/sunxi/Makefile | 1 + .../platform/sunxi/sun6i-mipi-csi2/Kconfig | 12 + .../platform/sunxi/sun6i-mipi-csi2/Makefile | 4 + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 746 ++++++++++++++++++ .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h | 52 ++ .../sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h | 82 ++ 7 files changed, 898 insertions(+) create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h
drivers/media/platform/sunxi/Kconfig +1 -0
@@ -2,3 +2,4 @@ source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" +source "drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig"
drivers/media/platform/sunxi/Makefile +1 -0
@@ -2,5 +2,6 @@ obj-y += sun4i-csi/ obj-y += sun6i-csi/ +obj-y += sun6i-mipi-csi2/ obj-y += sun8i-di/ obj-y += sun8i-rotate/
drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SUN6I_MIPI_CSI2 + tristate "Allwinner A31 MIPI CSI-2 Controller Driver" + depends on ARCH_SUNXI || COMPILE_TEST + depends on PM && COMMON_CLK && VIDEO_V4L2 + select REGMAP_MMIO + select PHY_SUN6I_MIPI_DPHY + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Allwinner A31 MIPI CSI-2 Controller.
drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only +sun6i-mipi-csi2-y += sun6i_mipi_csi2.o + +obj-$(CONFIG_VIDEO_SUN6I_MIPI_CSI2) += sun6i-mipi-csi2.o
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c new file +746 -0
746 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h new file +52 -0
52 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 10/66 MAINTAINERS: Add entry for the Allwinner A31 MIPI CSI-2 bridge driver
In reply to Paul KocialkowskiAdd myself as maintainer of the Allwinner A31 MIPI CSI-2 bridge media driver.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -751,6 +751,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml F: drivers/media/platform/sunxi/sun4i-csi/ +ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVER +M: Paul Kocialkowski <[email protected]> +L: [email protected] +S: Maintained +T: git git://linuxtv.org/media_tree.git +F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml +F: drivers/media/platform/sunxi/sun6i-mipi-csi2/ + ALLWINNER CPUFREQ DRIVER M: Yangtao Li <[email protected]> L: [email protected]
Signature · 1 line
2.34.1
PATCH v2 11/66 ARM: dts: sun8i: v3s: Add nodes for MIPI CSI-2 support
In reply to Paul KocialkowskiMIPI CSI-2 is supported on the V3s with an A31-based MIPI CSI-2 bridge controller. The controller uses a separate D-PHY, which is the same that is otherwise used for MIPI DSI, but used in Rx mode.
On the V3s, the CSI0 controller is dedicated to MIPI CSI-2 as it does not have access to any parallel interface pins.
Add all the necessary nodes (CSI0, MIPI CSI-2 bridge and D-PHY) to support the MIPI CSI-2 interface.
Note that a fwnode graph link is created between CSI0 and MIPI CSI-2 even when no sensor is connected. This will result in a probe failure for the controller as long as no sensor is connected but this is fine since no other interface is available.
While the interconnects property is used to inherit the proper dma ranges, the associated index for the cell is set to 0 since no particular meaning is attached to it. This might need to be changed later on (when identifying a proper mbus channel becomes relevant, e.g. for things like QoS).
--- arch/arm/boot/dts/sun8i-v3s.dtsi | 71 ++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
arch/arm/boot/dts/sun8i-v3s.dtsi +71 -0
@@ -614,6 +614,77 @@ gic: interrupt-controller@1c81000 { interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + csi0: camera@1cb0000 { + compatible = "allwinner,sun8i-v3s-csi"; + reg = <0x01cb0000 0x1000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>, + <&ccu CLK_DRAM_CSI>; + clock-names = "bus", "mod", "ram"; + resets = <&ccu RST_BUS_CSI>; + interconnects = <&mbus 0>; + interconnect-names = "dma-mem"; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + + csi0_in_mipi_csi2: endpoint { + remote-endpoint = <&mipi_csi2_out_csi0>; + }; + }; + }; + }; + + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-v3s-mipi-csi2", + "allwinner,sun6i-a31-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_CSI>; + status = "disabled"; + + phys = <&dphy>; + phy-names = "dphy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + + mipi_csi2_out_csi0: endpoint { + remote-endpoint = <&csi0_in_mipi_csi2>; + }; + }; + }; + }; + + dphy: d-phy@1cb2000 { + compatible = "allwinner,sun6i-a31-mipi-dphy"; + reg = <0x01cb2000 0x1000>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_MIPI_CSI>; + clock-names = "bus", "mod"; + resets = <&ccu RST_BUS_CSI>; + allwinner,direction = "rx"; + status = "disabled"; + #phy-cells = <0>; + }; + csi1: camera@1cb4000 { compatible = "allwinner,sun8i-v3s-csi"; reg = <0x01cb4000 0x3000>;
Signature · 1 line
2.34.1
PATCH v2 12/66 dt-bindings: media: Add Allwinner A83T MIPI CSI-2 bindings documentation
In reply to Paul KocialkowskiThis introduces YAML bindings documentation for the Allwinner A83T MIPI CSI-2 controller.
--- .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml
Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml new file +133 -0
@@ -0,0 +1,133 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun8i-a83t-mipi-csi2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A83T MIPI CSI-2 Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + const: allwinner,sun8i-a83t-mipi-csi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + - description: MIPI-specific Clock + - description: Misc CSI Clock + + clock-names: + items: + - const: bus + - const: mod + - const: mipi + - const: misc + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Input port, connect to a MIPI CSI-2 sensor + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + properties: + clock-lanes: + maxItems: 1 + + data-lanes: + minItems: 1 + maxItems: 4 + + required: + - data-lanes + + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: Output port, connect to a CSI controller + + properties: + reg: + const: 1 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-a83t-ccu.h> + #include <dt-bindings/reset/sun8i-a83t-ccu.h> + + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-a83t-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI_SCLK>, + <&ccu CLK_MIPI_CSI>, + <&ccu CLK_CSI_MISC>; + clock-names = "bus", "mod", "mipi", "misc"; + resets = <&ccu RST_BUS_CSI>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + + mipi_csi2_in_ov8865: endpoint { + data-lanes = <1 2 3 4>; + + remote-endpoint = <&ov8865_out_mipi_csi2>; + }; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + + mipi_csi2_out_csi: endpoint { + remote-endpoint = <&csi_in_mipi_csi2>; + }; + }; + }; + }; + +...
Signature · 1 line
2.34.1
PATCH v2 13/66 media: sunxi: Add support for the A83T MIPI CSI-2 controller
In reply to Paul KocialkowskiThe A83T supports MIPI CSI-2 with a composite controller, covering both the protocol logic and the D-PHY implementation. This controller seems to be found on the A83T only and probably was abandoned since.
This implementation splits the protocol and D-PHY registers and uses the PHY framework internally. The D-PHY is not registered as a standalone PHY driver since it cannot be used with any other controller.
There are a few notable points about the controller:
- The initialisation sequence involes writing specific magic init values that do not seem to make any particular sense given the concerned register fields;
- Interrupts appear to be hitting regardless of the interrupt mask registers, which can cause a serious flood when transmission errors occur.
Only 8-bit and 10-bit Bayer formats are currently supported. While up to 4 internal channels to the CSI controller exist, only one is currently supported by this implementation.
This work is based on the first version of the driver submitted by Kévin L'hôpital, which was adapted to mainline from the Allwinner BSP. This version integrates MIPI CSI-2 support as a standalone V4L2 subdev instead of merging it in the sun6i-csi driver.
It was tested on a Banana Pi M3 board with an OV8865 sensor in a 4-lane configuration.
--- drivers/media/platform/sunxi/Kconfig | 1 + drivers/media/platform/sunxi/Makefile | 1 + .../sunxi/sun8i-a83t-mipi-csi2/Kconfig | 11 + .../sunxi/sun8i-a83t-mipi-csi2/Makefile | 4 + .../sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c | 72 ++ .../sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h | 39 + .../sun8i_a83t_mipi_csi2.c | 812 ++++++++++++++++++ .../sun8i_a83t_mipi_csi2.h | 55 ++ .../sun8i_a83t_mipi_csi2_reg.h | 157 ++++ 9 files changed, 1152 insertions(+) create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Makefile create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2_reg.h
drivers/media/platform/sunxi/Kconfig +1 -0
@@ -3,3 +3,4 @@ source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig" +source "drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig"
drivers/media/platform/sunxi/Makefile +1 -0
@@ -3,5 +3,6 @@ obj-y += sun4i-csi/ obj-y += sun6i-csi/ obj-y += sun6i-mipi-csi2/ +obj-y += sun8i-a83t-mipi-csi2/ obj-y += sun8i-di/ obj-y += sun8i-rotate/
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_SUN8I_A83T_MIPI_CSI2 + tristate "Allwinner A83T MIPI CSI-2 Controller and D-PHY Driver" + depends on ARCH_SUNXI || COMPILE_TEST + depends on PM && COMMON_CLK && VIDEO_V4L2 + select REGMAP_MMIO + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + select V4L2_FWNODE + help + Support for the Allwinner A83T MIPI CSI-2 Controller and D-PHY.
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only +sun8i-a83t-mipi-csi2-y += sun8i_a83t_mipi_csi2.o sun8i_a83t_dphy.o + +obj-$(CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2) += sun8i-a83t-mipi-csi2.o
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c new file +72 -0
72 lines not on this page · raw message
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2020 Kévin L'hôpital <[email protected]> +* Copyright 2020-2021 Bootlin +* Author: Paul Kocialkowski <[email protected]> +*/ + +#ifndef _SUN8I_A83T_DPHY_H_ +#define _SUN8I_A83T_DPHY_H_ + +#include "sun8i_a83t_mipi_csi2.h" + +#define SUN8I_A83T_DPHY_CTRL_REG 0x10 +#define SUN8I_A83T_DPHY_CTRL_INIT_VALUE 0xb8df698e +#define SUN8I_A83T_DPHY_CTRL_RESET_N BIT(31) +#define SUN8I_A83T_DPHY_CTRL_SHUTDOWN_N BIT(15) +#define SUN8I_A83T_DPHY_CTRL_DEBUG BIT(8) +#define SUN8I_A83T_DPHY_STATUS_REG 0x14 +#define SUN8I_A83T_DPHY_STATUS_CLK_STOP BIT(10) +#define SUN8I_A83T_DPHY_STATUS_CLK_ULPS BIT(9) +#define SUN8I_A83T_DPHY_STATUS_HSCLK BIT(8) +#define SUN8I_A83T_DPHY_STATUS_D3_STOP BIT(7) +#define SUN8I_A83T_DPHY_STATUS_D2_STOP BIT(6) +#define SUN8I_A83T_DPHY_STATUS_D1_STOP BIT(5) +#define SUN8I_A83T_DPHY_STATUS_D0_STOP BIT(4) +#define SUN8I_A83T_DPHY_STATUS_D3_ULPS BIT(3) +#define SUN8I_A83T_DPHY_STATUS_D2_ULPS BIT(2) +#define SUN8I_A83T_DPHY_STATUS_D1_ULPS BIT(1) +#define SUN8I_A83T_DPHY_STATUS_D0_ULPS BIT(0) + +#define SUN8I_A83T_DPHY_ANA0_REG 0x30 +#define SUN8I_A83T_DPHY_ANA0_REXT_EN BIT(31) +#define SUN8I_A83T_DPHY_ANA0_REXT BIT(30) +#define SUN8I_A83T_DPHY_ANA0_RINT (v) (((v) << 28) & GENMASK(29, 28)) +#define SUN8I_A83T_DPHY_ANA0_SNK (v) (((v) << 20) & GENMASK(22, 20)) + +int sun8i_a83t_dphy_register (struct sun8i_a83t_mipi_csi2_device *csi2_dev); + +#endif
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c new file +812 -0
812 lines not on this page · raw message
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h new file +55 -0
55 lines not on this page · raw message
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2_reg.h new file +157 -0
157 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 14/66 MAINTAINERS: Add entry for the Allwinner A83T MIPI CSI-2 bridge
In reply to Paul KocialkowskiAdd myself as maintainer of the Allwinner A83T MIPI CSI-2 bridge media driver.
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -759,6 +759,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml F: drivers/media/platform/sunxi/sun6i-mipi-csi2/ +ALLWINNER A83T MIPI CSI-2 BRIDGE DRIVER +M: Paul Kocialkowski <[email protected]> +L: [email protected] +S: Maintained +T: git git://linuxtv.org/media_tree.git +F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml +F: drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/ + ALLWINNER CPUFREQ DRIVER M: Yangtao Li <[email protected]> L: [email protected]
Signature · 1 line
2.34.1
PATCH v2 15/66 ARM: dts: sun8i: a83t: Add MIPI CSI-2 controller node
In reply to Paul KocialkowskiMIPI CSI-2 is supported on the A83T with a dedicated controller that covers both the protocol and D-PHY. It can be connected to the CSI interface as a V4L2 subdev through the fwnode graph.
This is not done by default since connecting the bridge without a subdev attached to it will cause a failure on the CSI driver.
--- arch/arm/boot/dts/sun8i-a83t.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/arm/boot/dts/sun8i-a83t.dtsi +26 -0
@@ -1064,6 +1064,32 @@ csi: camera@1cb0000 { status = "disabled"; }; + mipi_csi2: csi@1cb1000 { + compatible = "allwinner,sun8i-a83t-mipi-csi2"; + reg = <0x01cb1000 0x1000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI_SCLK>, + <&ccu CLK_MIPI_CSI>, + <&ccu CLK_CSI_MISC>; + clock-names = "bus", "mod", "mipi", "misc"; + resets = <&ccu RST_BUS_CSI>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + mipi_csi2_in: port@0 { + reg = <0>; + }; + + mipi_csi2_out: port@1 { + reg = <1>; + }; + }; + }; + hdmi: hdmi@1ee0000 { compatible = "allwinner,sun8i-a83t-dw-hdmi"; reg = <0x01ee0000 0x10000>;
Signature · 1 line
2.34.1
PATCH v2 16/66 ARM: dts: sun8i: a83t: bananapi-m3: Enable MIPI CSI-2 with OV8865
In reply to Paul KocialkowskiFrom: Kévin L'hôpital <[email protected]>
The Bananapi M3 supports a camera module which includes an OV8865 sensor connected via the parallel CSI interface and an OV8865 sensor connected via MIPI CSI-2.
The I2C2 bus is shared by the two sensors as well as the (active-low) reset signal, but each sensor has it own shutdown line.
--- arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 102 +++++++++++++++++++ 1 file changed, 102 insertions(+)
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts +102 -0
@@ -85,6 +85,30 @@ led-1 { }; }; + reg_ov8865_avdd: ov8865-avdd { + compatible = "regulator-fixed"; + regulator-name = "ov8865-avdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <®_dldo4>; + }; + + reg_ov8865_dovdd: ov8865-dovdd { + compatible = "regulator-fixed"; + regulator-name = "ov8865-dovdd"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <®_dldo4>; + }; + + reg_ov8865_dvdd: ov8865-dvdd { + compatible = "regulator-fixed"; + regulator-name = "ov8865-dvdd"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + vin-supply = <®_eldo1>; + }; + reg_usb1_vbus: reg-usb1-vbus { compatible = "regulator-fixed"; regulator-name = "usb1-vbus";
@@ -115,6 +139,23 @@ &cpu100 { cpu-supply = <®_dcdc3>; }; +&csi { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + + csi_in_mipi_csi2: endpoint { + remote-endpoint = <&mipi_csi2_out_csi>; + }; + }; + }; +}; + &de { status = "okay"; };
@@ -147,6 +188,36 @@ hdmi_out_con: endpoint { }; }; +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pe_pins>; + status = "okay"; + + ov8865: camera@36 { + compatible = "ovti,ov8865"; + reg = <0x36>; + pinctrl-names = "default"; + pinctrl-0 = <&csi_mclk_pin>; + clocks = <&ccu CLK_CSI_MCLK>; + assigned-clocks = <&ccu CLK_CSI_MCLK>; + assigned-clock-rates = <24000000>; + avdd-supply = <®_ov8865_avdd>; + dovdd-supply = <®_ov8865_dovdd>; + dvdd-supply = <®_ov8865_dvdd>; + powerdown-gpios = <&pio 4 17 GPIO_ACTIVE_LOW>; /* PE17 */ + reset-gpios = <&pio 4 16 GPIO_ACTIVE_LOW>; /* PE16 */ + + port { + ov8865_out_mipi_csi2: endpoint { + data-lanes = <1 2 3 4>; + link-frequencies = /bits/ 64 <360000000>; + + remote-endpoint = <&mipi_csi2_in_ov8865>; + }; + }; + }; +}; + &mdio { rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22";
@@ -154,6 +225,24 @@ rgmii_phy: ethernet-phy@1 { }; }; +&mipi_csi2 { + status = "okay"; +}; + +&mipi_csi2_in { + mipi_csi2_in_ov8865: endpoint { + data-lanes = <1 2 3 4>; + + remote-endpoint = <&ov8865_out_mipi_csi2>; + }; +}; + +&mipi_csi2_out { + mipi_csi2_out_csi: endpoint { + remote-endpoint = <&csi_in_mipi_csi2>; + }; +}; + &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>;
@@ -327,11 +416,24 @@ ®_dldo3 { regulator-name = "vcc-pd"; }; +®_dldo4 { + regulator-always-on; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "avdd-csi"; +}; + ®_drivevbus { regulator-name = "usb0-vbus"; status = "okay"; }; +®_eldo1 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "dvdd-csi-r"; +}; + ®_fldo1 { regulator-min-microvolt = <1080000>; regulator-max-microvolt = <1320000>;
Signature · 1 line
2.34.1
PATCH v2 17/66 media: sun6i-csi: Define and use driver name and (reworked) description
In reply to Paul KocialkowskiAdd proper defines for driver name and description instead of MODULE_NAME and hardcoding (cosmetics).
Also rework the description while at it to mention the hardware generation that the driver supports and remove the video capture mentions since it applies to the whole media device.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 14 ++++++-------- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 3 +++ 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +6 -8
@@ -27,8 +27,6 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -#define MODULE_NAME "sun6i-csi" -struct sun6i_csi_dev {struct sun6i_csi csi;struct device *dev;
@@ -730,7 +728,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)int ret; csi->media_dev.dev = csi->dev; -strscpy (csi->media_dev.model,"Allwinner Video Capture Device" , +strscpy (csi->media_dev.model,SUN6I_CSI_DESCRIPTION ,sizeof (csi->media_dev.model)); csi->media_dev.hw_revision =0 ; snprintf(csi->media_dev.bus_info, sizeof(csi->media_dev.bus_info),
@@ -755,7 +753,7 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi) goto free_ctrl; } - ret =sun6i_video_init (&csi->video, csi,"sun6i-csi" ); + ret =sun6i_video_init (&csi->video, csi,SUN6I_CSI_NAME );if (ret) goto unreg_v4l2;
@@ -870,8 +868,8 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,if (irq <0 )return -ENXIO ; - ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 ,MODULE_NAME , - sdev); + ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , +SUN6I_CSI_NAME , sdev);if (ret) {dev_err (&pdev->dev,"Cannot request csi IRQ\n" );return ret;
@@ -924,12 +922,12 @@ static struct platform_driver sun6i_csi_platform_driver = { .probe = sun6i_csi_probe, .remove = sun6i_csi_remove, .driver = { - .name = MODULE_NAME, + .name = SUN6I_CSI_NAME, .of_match_table = of_match_ptr(sun6i_csi_of_match), }, };module_platform_driver (sun6i_csi_platform_driver); -MODULE_DESCRIPTION ("Allwinner V3s Camera Sensor Interface driver" ); +MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );MODULE_AUTHOR ("Yong Deng <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +3 -0
@@ -14,6 +14,9 @@#include "sun6i_video.h" +#define SUN6I_CSI_NAME "sun6i-csi" +#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +struct sun6i_csi ;/**
Signature · 1 line
2.34.1
Re: [PATCH v2 17/66] media: sun6i-csi: Define and use driver name and (reworked) description
Quoted 8 lines · Paul Kocialkowski
Add proper defines for driver name and description instead of
MODULE_NAMEand hardcoding (cosmetics).Also rework the description while at it to mention the hardware generation that the driver supports and remove the video capture mentions since it applies to the whole media device.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 18/66 media: sun6i-csi: Refactor main driver data structures
In reply to Paul KocialkowskiMerge contents of structs sun6i_csi and sun6i_csi_dev into a main sun6i_csi_device structure holding a sun6i_csi_v4l2 struct for things related to v4l2, as well as the already-existing sun6i_csi_video and sun6i_csi_config which are left unchanged.
This mostly simplifies accessing stuff by having a single main structure accessible to every part of the code instead of a private definition.
No functional change is intended in this commit, variables are just moved around (cosmetics).
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 351 +++++++++--------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 34 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 52 +-- .../platform/sunxi/sun6i-csi/sun6i_video.h | 8 +- 4 files changed, 221 insertions(+), 224 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +169 -182
@@ -27,37 +27,20 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -struct sun6i_csi_dev { -struct sun6i_csi csi; -struct device *dev; - -struct regmap *regmap; -struct clk *clk_mod; -struct clk *clk_ram; -struct reset_control *rstc_bus; - -int planar_offset[3 ]; -}; - -static inline struct sun6i_csi_dev *sun6i_csi_to_dev (struct sun6i_csi *csi) -{ - return container_of(csi, struct sun6i_csi_dev, csi); -} -/* TODO add 10&12 bit YUV, RGB support */ -bool sun6i_csi_is_format_supported (struct sun6i_csi *csi, +bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;/* * Some video receivers have the ability to be compatible with * 8bit and 16bit bus width. * Identify the media bus format from device tree. */ -if ((sdev->csi.v4l2_ep.bus_type ==V4L2_MBUS_PARALLEL - || sdev->csi.v4l2_ep.bus_type ==V4L2_MBUS_BT656 ) - && sdev->csi.v4l2_ep.bus.parallel.bus_width ==16 ) { +if ((v4l2->v4l2_ep.bus_type ==V4L2_MBUS_PARALLEL + || v4l2->v4l2_ep.bus_type ==V4L2_MBUS_BT656 ) + && v4l2->v4l2_ep.bus.parallel.bus_width ==16 ) {switch (pixformat) {case V4L2_PIX_FMT_NV12_16L16 :case V4L2_PIX_FMT_NV12 :
@@ -74,13 +57,14 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,case MEDIA_BUS_FMT_YVYU8_1X16 :return true;default : -dev_dbg (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_dbg (csi_dev->dev, +"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }break ;default : -dev_dbg (sdev->dev,"Unsupported pixformat: 0x%x\n" , +dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat);break ; }
@@ -137,7 +121,7 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,case MEDIA_BUS_FMT_YVYU8_2X8 :return true;default : -dev_dbg (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_dbg (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -152,50 +136,50 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi *csi,return (mbus_code ==MEDIA_BUS_FMT_JPEG_1X8 );default : -dev_dbg (sdev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); +dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , + pixformat);break ; }return false; } -int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable) +int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -struct device *dev = sdev->dev; -struct regmap *regmap = sdev->regmap; +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap;int ret;if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); -clk_disable_unprepare (sdev->clk_ram); +clk_disable_unprepare (csi_dev->clk_ram);if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (sdev->clk_mod); -clk_disable_unprepare (sdev->clk_mod); -reset_control_assert (sdev->rstc_bus); +clk_rate_exclusive_put (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_mod); +reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (sdev->clk_mod); + ret =clk_prepare_enable (csi_dev->clk_mod);if (ret) { -dev_err (sdev->dev,"Enable csi clk err %d\n" , ret); +dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret);return ret; }if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (sdev->clk_mod,300000000 ); +clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); - ret =clk_prepare_enable (sdev->clk_ram); + ret =clk_prepare_enable (csi_dev->clk_ram);if (ret) { -dev_err (sdev->dev,"Enable clk_dram_csi clk err %d\n" , ret); +dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); goto clk_mod_disable; } - ret =reset_control_deassert (sdev->rstc_bus); + ret =reset_control_deassert (csi_dev->reset);if (ret) { -dev_err (sdev->dev,"reset err %d\n" , ret); +dev_err (csi_dev->dev,"reset err %d\n" , ret); goto clk_ram_disable; }
@@ -204,15 +188,15 @@ int sun6i_csi_set_power(struct sun6i_csi *csi, bool enable)return 0 ; clk_ram_disable: -clk_disable_unprepare (sdev->clk_ram); +clk_disable_unprepare (csi_dev->clk_ram); clk_mod_disable:if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (sdev->clk_mod); -clk_disable_unprepare (sdev->clk_mod); +clk_rate_exclusive_put (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_mod);return ret; } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_dev *sdev, +static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {/* non-YUV */
@@ -230,12 +214,13 @@ static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_dev *sdev, }/* not support YUV420 input format yet */ -dev_dbg (sdev->dev,"Select YUV422 as default input format of CSI.\n" ); +dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" );return CSI_INPUT_FORMAT_YUV422 ; } -static enum csi_output_fmt get_csi_output_format (struct sun6i_csi_dev *sdev, -u32 pixformat,u32 field) +static enum csi_output_fmt +get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, +u32 field) {bool buf_interlaced = false;
@@ -294,14 +279,14 @@ static enum csi_output_fmt get_csi_output_format(struct sun6i_csi_dev *sdev,return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ;default : -dev_warn (sdev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); +dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat);break ; }return CSI_FIELD_RAW_8 ; } -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_dev *sdev, +static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {/* Input sequence does not apply to non-YUV formats */
@@ -328,7 +313,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,case MEDIA_BUS_FMT_YVYU8_2X8 :return CSI_INPUT_SEQ_YVYU ;default : -dev_warn (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -350,7 +335,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,case MEDIA_BUS_FMT_YVYU8_2X8 :return CSI_INPUT_SEQ_YUYV ;default : -dev_warn (sdev->dev,"Unsupported mbus code: 0x%x\n" , +dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , mbus_code);break ; }
@@ -360,7 +345,7 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,return CSI_INPUT_SEQ_YUYV ;default : -dev_warn (sdev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , +dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , pixformat);break ; }
@@ -368,23 +353,23 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_dev *sdev,return CSI_INPUT_SEQ_YUYV ; } -static void sun6i_csi_setup_bus (struct sun6i_csi_dev *sdev) +static void sun6i_csi_setup_bus (struct sun6i_csi_device *csi_dev) { -struct v4l2_fwnode_endpoint *endpoint = &sdev->csi.v4l2_ep; -struct sun6i_csi *csi = &sdev->csi; +struct v4l2_fwnode_endpoint *endpoint = &csi_dev->v4l2.v4l2_ep; +struct sun6i_csi_config *config = &csi_dev->config;unsigned char bus_width;u32 flags;u32 cfg;bool input_interlaced = false; -if (csi->config.field ==V4L2_FIELD_INTERLACED - || csi->config.field ==V4L2_FIELD_INTERLACED_TB - || csi->config.field ==V4L2_FIELD_INTERLACED_BT ) +if (config->field ==V4L2_FIELD_INTERLACED + || config->field ==V4L2_FIELD_INTERLACED_TB + || config->field ==V4L2_FIELD_INTERLACED_BT ) input_interlaced = true; bus_width = endpoint->bus.parallel.bus_width; -regmap_read (sdev->regmap,CSI_IF_CFG_REG , &cfg); +regmap_read (csi_dev->regmap,CSI_IF_CFG_REG , &cfg); cfg &= ~(CSI_IF_CFG_CSI_IF_MASK | CSI_IF_CFG_MIPI_IF_MASK | CSI_IF_CFG_IF_DATA_WIDTH_MASK |
@@ -432,7 +417,7 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_dev *sdev) cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ;break ;default : -dev_warn (sdev->dev,"Unsupported bus type: %d\n" , +dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , endpoint->bus_type);break ; }
@@ -450,54 +435,54 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_dev *sdev)case 16 :/* No need to configure DATA_WIDTH for 16bit */ break ;default : -dev_warn (sdev->dev,"Unsupported bus width: %u\n" , bus_width); +dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width);break ; } -regmap_write (sdev->regmap,CSI_IF_CFG_REG , cfg); +regmap_write (csi_dev->regmap,CSI_IF_CFG_REG , cfg); } -static void sun6i_csi_set_format (struct sun6i_csi_dev *sdev) +static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi *csi = &sdev->csi; +struct sun6i_csi_config *config = &csi_dev->config;u32 cfg;u32 val; -regmap_read (sdev->regmap,CSI_CH_CFG_REG , &cfg); +regmap_read (csi_dev->regmap,CSI_CH_CFG_REG , &cfg); cfg &= ~(CSI_CH_CFG_INPUT_FMT_MASK |CSI_CH_CFG_OUTPUT_FMT_MASK |CSI_CH_CFG_VFLIP_EN |CSI_CH_CFG_HFLIP_EN |CSI_CH_CFG_FIELD_SEL_MASK |CSI_CH_CFG_INPUT_SEQ_MASK ); - val =get_csi_input_format (sdev, csi->config.code, - csi->config.pixelformat); + val =get_csi_input_format (csi_dev, config->code, + config->pixelformat); cfg |=CSI_CH_CFG_INPUT_FMT (val); - val =get_csi_output_format (sdev, csi->config.pixelformat, - csi->config.field); + val =get_csi_output_format (csi_dev, config->pixelformat, + config->field); cfg |=CSI_CH_CFG_OUTPUT_FMT (val); - val =get_csi_input_seq (sdev, csi->config.code, - csi->config.pixelformat); + val =get_csi_input_seq (csi_dev, config->code, + config->pixelformat); cfg |=CSI_CH_CFG_INPUT_SEQ (val); -if (csi->config.field ==V4L2_FIELD_TOP ) +if (config->field ==V4L2_FIELD_TOP ) cfg |=CSI_CH_CFG_FIELD_SEL_FIELD0 ; -else if (csi->config.field ==V4L2_FIELD_BOTTOM ) +else if (config->field ==V4L2_FIELD_BOTTOM ) cfg |=CSI_CH_CFG_FIELD_SEL_FIELD1 ;else cfg |=CSI_CH_CFG_FIELD_SEL_BOTH ; -regmap_write (sdev->regmap,CSI_CH_CFG_REG , cfg); +regmap_write (csi_dev->regmap,CSI_CH_CFG_REG , cfg); } -static void sun6i_csi_set_window (struct sun6i_csi_dev *sdev) +static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi_config *config = &sdev->csi.config; +struct sun6i_csi_config *config = &csi_dev->config;u32 bytesperline_y;u32 bytesperline_c; -int *planar_offset = sdev->planar_offset; +int *planar_offset = csi_dev->planar_offset;u32 width = config->width;u32 height = config->height;u32 hor_len = width;
@@ -507,7 +492,7 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)case V4L2_PIX_FMT_YVYU :case V4L2_PIX_FMT_UYVY :case V4L2_PIX_FMT_VYUY : -dev_dbg (sdev->dev, +dev_dbg (csi_dev->dev,"Horizontal length should be 2 times of width for packed YUV formats!\n" ); hor_len = width *2 ;break ;
@@ -515,10 +500,10 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)break ; } -regmap_write (sdev->regmap,CSI_CH_HSIZE_REG , +regmap_write (csi_dev->regmap,CSI_CH_HSIZE_REG ,CSI_CH_HSIZE_HOR_LEN (hor_len) |CSI_CH_HSIZE_HOR_START (0 )); -regmap_write (sdev->regmap,CSI_CH_VSIZE_REG , +regmap_write (csi_dev->regmap,CSI_CH_VSIZE_REG ,CSI_CH_VSIZE_VER_LEN (height) |CSI_CH_VSIZE_VER_START (0 ));
@@ -550,7 +535,7 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)bytesperline_c * height;break ;default :/* raw */ -dev_dbg (sdev->dev, +dev_dbg (csi_dev->dev,"Calculating pixelformat(0x%x)'s bytesperline as a packed format\n" , config->pixelformat); bytesperline_y = (sun6i_csi_get_bpp(config->pixelformat) *
@@ -561,46 +546,42 @@ static void sun6i_csi_set_window(struct sun6i_csi_dev *sdev)break ; } -regmap_write (sdev->regmap,CSI_CH_BUF_LEN_REG , +regmap_write (csi_dev->regmap,CSI_CH_BUF_LEN_REG ,CSI_CH_BUF_LEN_BUF_LEN_C (bytesperline_c) |CSI_CH_BUF_LEN_BUF_LEN_Y (bytesperline_y)); } -int sun6i_csi_update_config (struct sun6i_csi *csi, +int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -if (!config)return -EINVAL ; -memcpy (&csi->config, config,sizeof (csi->config)); +memcpy (&csi_dev->config, config,sizeof (csi_dev->config)); -sun6i_csi_setup_bus (sdev); -sun6i_csi_set_format (sdev); -sun6i_csi_set_window (sdev); +sun6i_csi_setup_bus (csi_dev); +sun6i_csi_set_format (csi_dev); +sun6i_csi_set_window (csi_dev);return 0 ; } -void sun6i_csi_update_buf_addr (struct sun6i_csi *csi,dma_addr_t addr) +void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, +dma_addr_t addr) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); - -regmap_write (sdev->regmap,CSI_CH_F0_BUFA_REG , - (addr + sdev->planar_offset[0 ]) >>2 ); -if (sdev->planar_offset[1 ] !=-1 ) -regmap_write (sdev->regmap,CSI_CH_F1_BUFA_REG , - (addr + sdev->planar_offset[1 ]) >>2 ); -if (sdev->planar_offset[2 ] !=-1 ) -regmap_write (sdev->regmap,CSI_CH_F2_BUFA_REG , - (addr + sdev->planar_offset[2 ]) >>2 ); +regmap_write (csi_dev->regmap,CSI_CH_F0_BUFA_REG , + (addr + csi_dev->planar_offset[0 ]) >>2 ); +if (csi_dev->planar_offset[1 ] !=-1 ) +regmap_write (csi_dev->regmap,CSI_CH_F1_BUFA_REG , + (addr + csi_dev->planar_offset[1 ]) >>2 ); +if (csi_dev->planar_offset[2 ] !=-1 ) +regmap_write (csi_dev->regmap,CSI_CH_F2_BUFA_REG , + (addr + csi_dev->planar_offset[2 ]) >>2 ); } -void sun6i_csi_set_stream (struct sun6i_csi *csi,bool enable) +void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) { -struct sun6i_csi_dev *sdev =sun6i_csi_to_dev (csi); -struct regmap *regmap = sdev->regmap; +struct regmap *regmap = csi_dev->regmap;if (!enable) {regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON ,0 );
@@ -624,7 +605,7 @@ void sun6i_csi_set_stream(struct sun6i_csi *csi, bool enable)/* ----------------------------------------------------------------------------- * Media Controller and V4L2 */ -static int sun6i_csi_link_entity (struct sun6i_csi *csi, +static int sun6i_csi_link_entity (struct sun6i_csi_device *csi_dev,struct media_entity *entity,struct fwnode_handle *fwnode) {
@@ -635,24 +616,25 @@ static int sun6i_csi_link_entity(struct sun6i_csi *csi, ret =media_entity_get_fwnode_pad (entity, fwnode,MEDIA_PAD_FL_SOURCE );if (ret <0 ) { -dev_err (csi->dev,"%s: no source pad in external entity %s\n" , - __func__, entity->name); +dev_err (csi_dev->dev, +"%s: no source pad in external entity %s\n" , __func__, + entity->name);return -EINVAL ; } src_pad_index = ret; - sink = &csi->video.vdev.entity; - sink_pad = &csi->video.pad; + sink = &csi_dev->video.vdev.entity; + sink_pad = &csi_dev->video.pad; -dev_dbg (csi->dev,"creating %s:%u -> %s:%u link\n" , +dev_dbg (csi_dev->dev,"creating %s:%u -> %s:%u link\n" , entity->name, src_pad_index, sink->name, sink_pad->index); ret =media_create_pad_link (entity, src_pad_index, sink, sink_pad->index,MEDIA_LNK_FL_ENABLED |MEDIA_LNK_FL_IMMUTABLE );if (ret <0 ) { -dev_err (csi->dev,"failed to create %s:%u -> %s:%u link\n" , +dev_err (csi_dev->dev,"failed to create %s:%u -> %s:%u link\n" , entity->name, src_pad_index, sink->name, sink_pad->index);return ret;
@@ -663,27 +645,29 @@ static int sun6i_csi_link_entity(struct sun6i_csi *csi,static int sun6i_subdev_notify_complete (struct v4l2_async_notifier *notifier) { - struct sun6i_csi *csi = container_of(notifier, struct sun6i_csi, - notifier); -struct v4l2_device *v4l2_dev = &csi->v4l2_dev; +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + v4l2.notifier); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; +struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev;struct v4l2_subdev *sd;int ret; -dev_dbg (csi->dev,"notify complete, all subdevs registered\n" ); +dev_dbg (csi_dev->dev,"notify complete, all subdevs registered\n" ); sd = list_first_entry(&v4l2_dev->subdevs, struct v4l2_subdev, list);if (!sd)return -EINVAL ; - ret =sun6i_csi_link_entity (csi, &sd->entity, sd->fwnode); + ret =sun6i_csi_link_entity (csi_dev, &sd->entity, sd->fwnode);if (ret <0 )return ret; - ret =v4l2_device_register_subdev_nodes (&csi->v4l2_dev); + ret =v4l2_device_register_subdev_nodes (v4l2_dev);if (ret <0 )return ret; -return media_device_register (&csi->media_dev); +return media_device_register (&v4l2->media_dev); }static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = {
@@ -694,7 +678,7 @@ static int sun6i_csi_fwnode_parse(struct device *dev,struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd) { - struct sun6i_csi *csi = dev_get_drvdata(dev); + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev);if (vep->base.port || vep->base.id) {dev_warn (dev,"Only support a single port with one endpoint\n" );
@@ -704,7 +688,7 @@ static int sun6i_csi_fwnode_parse(struct device *dev,switch (vep->bus_type) {case V4L2_MBUS_PARALLEL :case V4L2_MBUS_BT656 : - csi->v4l2_ep = *vep; + csi_dev->v4l2.v4l2_ep = *vep;return 0 ;default :dev_err (dev,"Unsupported media bus type\n" );
@@ -712,78 +696,82 @@ static int sun6i_csi_fwnode_parse(struct device *dev, } } -static void sun6i_csi_v4l2_cleanup (struct sun6i_csi *csi) +static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) { -media_device_unregister (&csi->media_dev); -v4l2_async_nf_unregister (&csi->notifier); -v4l2_async_nf_cleanup (&csi->notifier); -sun6i_video_cleanup (&csi->video); -v4l2_device_unregister (&csi->v4l2_dev); -v4l2_ctrl_handler_free (&csi->ctrl_handler); -media_device_cleanup (&csi->media_dev); +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; + +media_device_unregister (&v4l2->media_dev); +v4l2_async_nf_unregister (&v4l2->notifier); +v4l2_async_nf_cleanup (&v4l2->notifier); +sun6i_video_cleanup (&csi_dev->video); +v4l2_device_unregister (&v4l2->v4l2_dev); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); +media_device_cleanup (&v4l2->media_dev); } -static int sun6i_csi_v4l2_init (struct sun6i_csi *csi) +static int sun6i_csi_v4l2_init (struct sun6i_csi_device *csi_dev) { +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;int ret; - csi->media_dev.dev = csi->dev; -strscpy (csi->media_dev.model,SUN6I_CSI_DESCRIPTION , -sizeof (csi->media_dev.model)); - csi->media_dev.hw_revision =0 ; -snprintf (csi->media_dev.bus_info,sizeof (csi->media_dev.bus_info), -"platform:%s" ,dev_name (csi->dev)); + v4l2->media_dev.dev = csi_dev->dev; +strscpy (v4l2->media_dev.model,SUN6I_CSI_DESCRIPTION , +sizeof (v4l2->media_dev.model)); + v4l2->media_dev.hw_revision =0 ; +snprintf (v4l2->media_dev.bus_info, +sizeof (v4l2->media_dev.bus_info),"platform:%s" , +dev_name (csi_dev->dev)); -media_device_init (&csi->media_dev); -v4l2_async_nf_init (&csi->notifier); +media_device_init (&v4l2->media_dev); +v4l2_async_nf_init (&v4l2->notifier); - ret =v4l2_ctrl_handler_init (&csi->ctrl_handler,0 ); + ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );if (ret) { -dev_err (csi->dev,"V4L2 controls handler init failed (%d)\n" , +dev_err (csi_dev->dev,"V4L2 controls handler init failed (%d)\n" , ret); goto clean_media; } - csi->v4l2_dev.mdev = &csi->media_dev; - csi->v4l2_dev.ctrl_handler = &csi->ctrl_handler; - ret =v4l2_device_register (csi->dev, &csi->v4l2_dev); + v4l2->v4l2_dev.mdev = &v4l2->media_dev; + v4l2->v4l2_dev.ctrl_handler = &v4l2->ctrl_handler; + ret =v4l2_device_register (csi_dev->dev, &v4l2->v4l2_dev);if (ret) { -dev_err (csi->dev,"V4L2 device registration failed (%d)\n" , +dev_err (csi_dev->dev,"V4L2 device registration failed (%d)\n" , ret); goto free_ctrl; } - ret =sun6i_video_init (&csi->video, csi,SUN6I_CSI_NAME ); + ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME );if (ret) goto unreg_v4l2; - ret =v4l2_async_nf_parse_fwnode_endpoints (csi->dev, - &csi->notifier, + ret =v4l2_async_nf_parse_fwnode_endpoints (csi_dev->dev, + &v4l2->notifier,sizeof (struct v4l2_async_subdev ), sun6i_csi_fwnode_parse);if (ret) goto clean_video; - csi->notifier.ops = &sun6i_csi_async_ops; + v4l2->notifier.ops = &sun6i_csi_async_ops; - ret =v4l2_async_nf_register (&csi->v4l2_dev, &csi->notifier); + ret =v4l2_async_nf_register (&v4l2->v4l2_dev, &v4l2->notifier);if (ret) { -dev_err (csi->dev,"notifier registration failed\n" ); +dev_err (csi_dev->dev,"notifier registration failed\n" ); goto clean_video; }return 0 ; clean_video: -sun6i_video_cleanup (&csi->video); +sun6i_video_cleanup (&csi_dev->video); unreg_v4l2: -v4l2_device_unregister (&csi->v4l2_dev); +v4l2_device_unregister (&v4l2->v4l2_dev); free_ctrl: -v4l2_ctrl_handler_free (&csi->ctrl_handler); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); clean_media: -v4l2_async_nf_cleanup (&csi->notifier); -media_device_cleanup (&csi->media_dev); +v4l2_async_nf_cleanup (&v4l2->notifier); +media_device_cleanup (&v4l2->media_dev);return ret; }
@@ -793,8 +781,8 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi *csi)*/ static irqreturn_t sun6i_csi_isr (int irq,void *dev_id) { -struct sun6i_csi_dev *sdev = (struct sun6i_csi_dev *)dev_id; -struct regmap *regmap = sdev->regmap; +struct sun6i_csi_device *csi_dev = (struct sun6i_csi_device *)dev_id; +struct regmap *regmap = csi_dev->regmap;u32 status;regmap_read (regmap,CSI_CH_INT_STA_REG , &status);
@@ -814,7 +802,7 @@ static irqreturn_t sun6i_csi_isr(int irq, void *dev_id) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (&sdev->csi.video); +sun6i_video_frame_done (&csi_dev->video);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
@@ -828,7 +816,7 @@ static const struct regmap_config sun6i_csi_regmap_config = { .max_register = 0x9c, }; -static int sun6i_csi_resource_request (struct sun6i_csi_dev *sdev, +static int sun6i_csi_resource_request (struct sun6i_csi_device *csi_dev,struct platform_device *pdev) {void __iomem *io_base;
@@ -839,29 +827,29 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,if (IS_ERR (io_base))return PTR_ERR (io_base); - sdev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, - &sun6i_csi_regmap_config); -if (IS_ERR (sdev->regmap)) { + csi_dev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, + &sun6i_csi_regmap_config); +if (IS_ERR (csi_dev->regmap)) {dev_err (&pdev->dev,"Failed to init register map\n" ); -return PTR_ERR (sdev->regmap); +return PTR_ERR (csi_dev->regmap); } - sdev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); -if (IS_ERR (sdev->clk_mod)) { + csi_dev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); +if (IS_ERR (csi_dev->clk_mod)) {dev_err (&pdev->dev,"Unable to acquire csi clock\n" ); -return PTR_ERR (sdev->clk_mod); +return PTR_ERR (csi_dev->clk_mod); } - sdev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); -if (IS_ERR (sdev->clk_ram)) { + csi_dev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); +if (IS_ERR (csi_dev->clk_ram)) {dev_err (&pdev->dev,"Unable to acquire dram-csi clock\n" ); -return PTR_ERR (sdev->clk_ram); +return PTR_ERR (csi_dev->clk_ram); } - sdev->rstc_bus =devm_reset_control_get_shared (&pdev->dev,NULL ); -if (IS_ERR (sdev->rstc_bus)) { + csi_dev->reset =devm_reset_control_get_shared (&pdev->dev,NULL ); +if (IS_ERR (csi_dev->reset)) {dev_err (&pdev->dev,"Cannot get reset controller\n" ); -return PTR_ERR (sdev->rstc_bus); +return PTR_ERR (csi_dev->reset); } irq =platform_get_irq (pdev,0 );
@@ -869,7 +857,7 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,return -ENXIO ; ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , -SUN6I_CSI_NAME , sdev); +SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (&pdev->dev,"Cannot request csi IRQ\n" );return ret;
@@ -880,30 +868,29 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,static int sun6i_csi_probe (struct platform_device *pdev) { -struct sun6i_csi_dev *sdev; +struct sun6i_csi_device *csi_dev;int ret; - sdev =devm_kzalloc (&pdev->dev,sizeof (*sdev),GFP_KERNEL ); -if (!sdev) + csi_dev =devm_kzalloc (&pdev->dev,sizeof (*csi_dev),GFP_KERNEL ); +if (!csi_dev)return -ENOMEM ; - sdev->dev = &pdev->dev; + csi_dev->dev = &pdev->dev; - ret =sun6i_csi_resource_request (sdev, pdev); + ret =sun6i_csi_resource_request (csi_dev, pdev);if (ret)return ret; -platform_set_drvdata (pdev, sdev); +platform_set_drvdata (pdev, csi_dev); - sdev->csi.dev = &pdev->dev; -return sun6i_csi_v4l2_init (&sdev->csi); +return sun6i_csi_v4l2_init (csi_dev); }static int sun6i_csi_remove (struct platform_device *pdev) { -struct sun6i_csi_dev *sdev =platform_get_drvdata (pdev); +struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev); -sun6i_csi_v4l2_cleanup (&sdev->csi); +sun6i_csi_v4l2_cleanup (csi_dev);return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +21 -13
@@ -17,8 +17,6 @@#define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" -struct sun6i_csi ; -/** * struct sun6i_csi_config - configs for sun6i csi * @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*)
@@ -35,20 +33,29 @@ struct sun6i_csi_config {u32 height; }; -struct sun6i_csi { -struct device *dev; -struct v4l2_ctrl_handler ctrl_handler; +struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev; +struct v4l2_ctrl_handler ctrl_handler;struct media_device media_dev;struct v4l2_async_notifier notifier; -/* video port settings */ struct v4l2_fwnode_endpoint v4l2_ep; +}; -struct sun6i_csi_config config; +struct sun6i_csi_device { +struct device *dev; +struct sun6i_csi_config config; +struct sun6i_csi_v4l2 v4l2;struct sun6i_video video; + +struct regmap *regmap; +struct clk *clk_mod; +struct clk *clk_ram; +struct reset_control *reset; + +int planar_offset[3 ]; };/**
@@ -57,22 +64,22 @@ struct sun6i_csi {* @pixformat: v4l2 pixel format (V4L2_PIX_FMT_*) * @mbus_code: media bus format code (MEDIA_BUS_FMT_*) */ -bool sun6i_csi_is_format_supported (struct sun6i_csi *csi,u32 pixformat, -u32 mbus_code); +bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, +u32 pixformat,u32 mbus_code);/** * sun6i_csi_set_power() - power on/off the csi * @csi: pointer to the csi * @enable: on/off */ -int sun6i_csi_set_power (struct sun6i_csi *csi,bool enable); +int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable);/** * sun6i_csi_update_config() - update the csi register settings * @csi: pointer to the csi * @config: see struct sun6i_csi_config */ -int sun6i_csi_update_config (struct sun6i_csi *csi, +int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config);/**
@@ -80,14 +87,15 @@ int sun6i_csi_update_config(struct sun6i_csi *csi,* @csi: pointer to the csi * @addr: frame buffer's physical address */ -void sun6i_csi_update_buf_addr (struct sun6i_csi *csi,dma_addr_t addr); +void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, +dma_addr_t addr);/** * sun6i_csi_set_stream() - start/stop csi streaming * @csi: pointer to the csi * @enable: start/stop */ -void sun6i_csi_set_stream (struct sun6i_csi *csi,bool enable); +void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable);/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +27 -25
173 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +4 -4
@@ -11,12 +11,12 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> -struct sun6i_csi ; +struct sun6i_csi_device ;struct sun6i_video { +struct sun6i_csi_device *csi_dev;struct video_device vdev;struct media_pad pad; -struct sun6i_csi *csi;struct mutex lock;
@@ -29,8 +29,8 @@ struct sun6i_video {u32 mbus_code; }; -int sun6i_video_init (struct sun6i_video *video,struct sun6i_csi *csi, -const char *name); +int sun6i_video_init (struct sun6i_video *video, +struct sun6i_csi_device *csi_dev,const char *name);void sun6i_video_cleanup (struct sun6i_video *video);void sun6i_video_frame_done (struct sun6i_video *video);
Signature · 1 line
2.34.1
Re: [PATCH v2 18/66] media: sun6i-csi: Refactor main driver data structures
Quoted 5 lines · Paul Kocialkowski
Merge contents of structs
sun6i_csiandsun6i_csi_devinto a mainsun6i_csi_devicestructure holding asun6i_csi_v4l2struct for things related to v4l2, as well as the already-existingsun6i_csi_videoandsun6i_csi_configwhich are left unchanged.
Quoted 8 lines
This mostly simplifies accessing stuff by having a single main structure accessible to every part of the code instead of a private definition.
No functional change is intended in this commit, variables are just moved around (cosmetics).
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 19/66 media: sun6i-csi: Grab bus clock instead of passing it to regmap
In reply to Paul KocialkowskiSince the bus clock alone is not enough to get access to the registers, don't pass it to regmap and manage it instead just like the other clocks.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 10 ++++++++-- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8 -2
@@ -827,13 +827,19 @@ static int sun6i_csi_resource_request(struct sun6i_csi_device *csi_dev,if (IS_ERR (io_base))return PTR_ERR (io_base); - csi_dev->regmap =devm_regmap_init_mmio_clk (&pdev->dev,"bus" , io_base, - &sun6i_csi_regmap_config); + csi_dev->regmap =devm_regmap_init_mmio (&pdev->dev, io_base, + &sun6i_csi_regmap_config);if (IS_ERR (csi_dev->regmap)) {dev_err (&pdev->dev,"Failed to init register map\n" );return PTR_ERR (csi_dev->regmap); } + csi_dev->clk_bus =devm_clk_get (&pdev->dev,"bus" ); +if (IS_ERR (csi_dev->clk_bus)) { +dev_err (&pdev->dev,"Unable to acquire bus clock\n" ); +return PTR_ERR (csi_dev->clk_bus); + } + csi_dev->clk_mod =devm_clk_get (&pdev->dev,"mod" );if (IS_ERR (csi_dev->clk_mod)) {dev_err (&pdev->dev,"Unable to acquire csi clock\n" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +1 -0
@@ -51,6 +51,7 @@ struct sun6i_csi_device {struct sun6i_video video;struct regmap *regmap; +struct clk *clk_bus;struct clk *clk_mod;struct clk *clk_ram;struct reset_control *reset;
Signature · 1 line
2.34.1
Re: [PATCH v2 19/66] media: sun6i-csi: Grab bus clock instead of passing it to regmap
Hi,
Quoted 5 lines · Paul Kocialkowski
Since the bus clock alone is not enough to get access to the registers, don't pass it to regmap and manage it instead just like the other clocks.
Signed-off-by Paul Kocialkowski <[email protected]>
I'm not really sure about this one.
Sure, there's more resources involved than the clock to get access to the registers (like reset), but you can't have a functional device without the reset line deasserted.
You can however have a functional device without the bus clock enabled, so it just seems much better to let regmap manage it.
Unless there's a drawback to it of course, but it should be in your commit log if so.
Maxime
PATCH v2 20/66 media: sun6i-csi: Tidy up platform code
In reply to Paul KocialkowskiVarious renames, variables lowering and other cosmetic changes in the platform-support code. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +43 -33
@@ -776,12 +776,11 @@ static int sun6i_csi_v4l2_init(struct sun6i_csi_device *csi_dev)return ret; } -/* ----------------------------------------------------------------------------- -* Resources and IRQ -*/ -static irqreturn_t sun6i_csi_isr (int irq,void *dev_id) +/* Platform */ + +static irqreturn_t sun6i_csi_isr (int irq,void *private) { -struct sun6i_csi_device *csi_dev = (struct sun6i_csi_device *)dev_id; +struct sun6i_csi_device *csi_dev = private;struct regmap *regmap = csi_dev->regmap;u32 status;
@@ -816,79 +815,88 @@ static const struct regmap_config sun6i_csi_regmap_config = { .max_register = 0x9c, }; -static int sun6i_csi_resource_request (struct sun6i_csi_device *csi_dev, -struct platform_device *pdev) +static int sun6i_csi_resources_setup (struct sun6i_csi_device *csi_dev, +struct platform_device *platform_dev) { +struct device *dev = csi_dev->dev;void __iomem *io_base;int ret;int irq; - io_base =devm_platform_ioremap_resource (pdev,0 ); +/* Registers */ + + io_base =devm_platform_ioremap_resource (platform_dev,0 );if (IS_ERR (io_base))return PTR_ERR (io_base); - csi_dev->regmap =devm_regmap_init_mmio (&pdev->dev, io_base, + csi_dev->regmap =devm_regmap_init_mmio (dev, io_base, &sun6i_csi_regmap_config);if (IS_ERR (csi_dev->regmap)) { -dev_err (&pdev->dev,"Failed to init register map\n" ); +dev_err (dev,"failed to init register map\n" );return PTR_ERR (csi_dev->regmap); } - csi_dev->clk_bus =devm_clk_get (&pdev->dev,"bus" ); +/* Clocks */ + + csi_dev->clk_bus =devm_clk_get (dev,"bus" );if (IS_ERR (csi_dev->clk_bus)) { -dev_err (&pdev->dev,"Unable to acquire bus clock\n" ); +dev_err (dev,"failed to acquire bus clock\n" );return PTR_ERR (csi_dev->clk_bus); } - csi_dev->clk_mod =devm_clk_get (&pdev->dev,"mod" ); + csi_dev->clk_mod =devm_clk_get (dev,"mod" );if (IS_ERR (csi_dev->clk_mod)) { -dev_err (&pdev->dev,"Unable to acquire csi clock\n" ); +dev_err (dev,"failed to acquire module clock\n" );return PTR_ERR (csi_dev->clk_mod); } - csi_dev->clk_ram =devm_clk_get (&pdev->dev,"ram" ); + csi_dev->clk_ram =devm_clk_get (dev,"ram" );if (IS_ERR (csi_dev->clk_ram)) { -dev_err (&pdev->dev,"Unable to acquire dram-csi clock\n" ); +dev_err (dev,"failed to acquire ram clock\n" );return PTR_ERR (csi_dev->clk_ram); } - csi_dev->reset =devm_reset_control_get_shared (&pdev->dev,NULL ); +/* Reset */ + + csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) { -dev_err (&pdev->dev,"Cannot get reset controller\n" ); +dev_err (dev,"failed to acquire reset\n" );return PTR_ERR (csi_dev->reset); } - irq =platform_get_irq (pdev,0 ); +/* Interrupt */ + + irq =platform_get_irq (platform_dev,0 );if (irq <0 )return -ENXIO ; - ret =devm_request_irq (&pdev->dev, irq, sun6i_csi_isr,0 , -SUN6I_CSI_NAME , csi_dev); + ret =devm_request_irq (dev, irq, sun6i_csi_isr,0 ,SUN6I_CSI_NAME , + csi_dev);if (ret) { -dev_err (&pdev->dev,"Cannot request csi IRQ\n" ); +dev_err (dev,"failed to request interrupt\n" );return ret; }return 0 ; } -static int sun6i_csi_probe (struct platform_device *pdev) +static int sun6i_csi_probe (struct platform_device *platform_dev) {struct sun6i_csi_device *csi_dev; +struct device *dev = &platform_dev->dev;int ret; - csi_dev =devm_kzalloc (&pdev->dev,sizeof (*csi_dev),GFP_KERNEL ); + csi_dev =devm_kzalloc (dev,sizeof (*csi_dev),GFP_KERNEL );if (!csi_dev)return -ENOMEM ; - csi_dev->dev = &pdev->dev; + csi_dev->dev = &platform_dev->dev; +platform_set_drvdata (platform_dev, csi_dev); - ret =sun6i_csi_resource_request (csi_dev, pdev); + ret =sun6i_csi_resources_setup (csi_dev, platform_dev);if (ret)return ret; -platform_set_drvdata (pdev, csi_dev); -return sun6i_csi_v4l2_init (csi_dev); }
@@ -909,16 +917,18 @@ static const struct of_device_id sun6i_csi_of_match[] = { { .compatible = "allwinner,sun50i-a64-csi", }, {}, }; +MODULE_DEVICE_TABLE (of, sun6i_csi_of_match);static struct platform_driver sun6i_csi_platform_driver = { - .probe = sun6i_csi_probe, - .remove = sun6i_csi_remove, - .driver = { - .name =SUN6I_CSI_NAME , - .of_match_table =of_match_ptr (sun6i_csi_of_match), + .probe = sun6i_csi_probe, + .remove = sun6i_csi_remove, + .driver = { + .name =SUN6I_CSI_NAME , + .of_match_table =of_match_ptr (sun6i_csi_of_match), }, }; +module_platform_driver (sun6i_csi_platform_driver);MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );
Signature · 1 line
2.34.1
Re: [PATCH v2 20/66] media: sun6i-csi: Tidy up platform code
Quoted 4 lines · Paul Kocialkowski
Various renames, variables lowering and other cosmetic changes in the platform-support code. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 21/66 media: sun6i-csi: Always set exclusive module clock rate
In reply to Paul KocialkowskiIn some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +41 -13
@@ -154,9 +154,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (csi_dev->clk_ram); -if (of_device_is_compatible (dev->of_node, -"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);reset_control_assert (csi_dev->reset);return 0 ;
@@ -168,9 +165,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)return ret; } -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); - ret =clk_prepare_enable (csi_dev->clk_ram);if (ret) {dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret);
@@ -190,8 +184,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) clk_ram_disable:clk_disable_unprepare (csi_dev->clk_ram); clk_mod_disable: -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);return ret; }
@@ -819,6 +811,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, struct platform_device *platform_dev) {struct device *dev = csi_dev->dev; +unsigned long clk_mod_rate;void __iomem *io_base;int ret;int irq;
@@ -856,28 +849,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clk_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clk_mod_rate =300000000 ; +else + clk_mod_rate =297000000 ; + + ret =clk_set_rate_exclusive (csi_dev->clk_mod, clk_mod_rate); +if (ret) { +dev_err (dev,"failed to set mod clock rate\n" ); +return ret; + } +/* Reset */ csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) {dev_err (dev,"failed to acquire reset\n" ); -return PTR_ERR (csi_dev->reset); + ret =PTR_ERR (csi_dev->reset); + goto error_clk_rate_exclusive; }/* Interrupt */ irq =platform_get_irq (platform_dev,0 ); -if (irq <0 ) -return -ENXIO ; +if (irq <0 ) { +dev_err (dev,"failed to get interrupt\n" ); + ret = -ENXIO ; + goto error_clk_rate_exclusive; + } ret =devm_request_irq (dev, irq, sun6i_csi_isr,0 ,SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); -return ret; + goto error_clk_rate_exclusive; }return 0 ; + +error_clk_rate_exclusive: +clk_rate_exclusive_put (csi_dev->clk_mod); + +return ret; +} + +static void sun6i_csi_resources_cleanup (struct sun6i_csi_device *csi_dev) +{ +clk_rate_exclusive_put (csi_dev->clk_mod); }static int sun6i_csi_probe (struct platform_device *platform_dev)
@@ -897,7 +915,16 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret)return ret; -return sun6i_csi_v4l2_init (csi_dev); + ret =sun6i_csi_v4l2_init (csi_dev); +if (ret) + goto error_resources; + +return 0 ; + +error_resources: +sun6i_csi_resources_cleanup (csi_dev); + +return ret; }static int sun6i_csi_remove (struct platform_device *pdev)
@@ -905,6 +932,7 @@ static int sun6i_csi_remove(struct platform_device *pdev)struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev);sun6i_csi_v4l2_cleanup (csi_dev); +sun6i_csi_resources_cleanup (csi_dev);return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH v2 21/66] media: sun6i-csi: Always set exclusive module clock rate
Quoted 97 lines · Paul Kocialkowski
In some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +21
-12@@ -154,9 +154,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (csi_dev->clk_ram); -if (of_device_is_compatible (dev->of_node, -"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);reset_control_assert (csi_dev->reset);return 0 ;@@ -168,9 +165,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)return ret; } -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); - ret =clk_prepare_enable (csi_dev->clk_ram);if (ret) {dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret);@@ -190,8 +184,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) clk_ram_disable:clk_disable_unprepare (csi_dev->clk_ram); clk_mod_disable: -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);return ret; }@@ -819,6 +811,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, struct platform_device *platform_dev) {struct device *dev = csi_dev->dev; +unsigned long clk_mod_rate;void __iomem *io_base;int ret;int irq;@@ -856,28 +849,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clk_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clk_mod_rate =300000000 ; +else + clk_mod_rate =297000000 ; + + ret =clk_set_rate_exclusive (csi_dev->clk_mod, clk_mod_rate); +if (ret) { +dev_err (dev,"failed to set mod clock rate\n" ); +return ret; + } +/* Reset */ csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) {dev_err (dev,"failed to acquire reset\n" ); -return PTR_ERR (csi_dev->reset); + ret =PTR_ERR (csi_dev->reset); + goto error_clk_rate_exclusive; }/* Interrupt */ irq =platform_get_irq (platform_dev,0 ); -if (irq <0 ) -return -ENXIO ; +if (irq <0 ) { +dev_err (dev,"failed to get interrupt\n" ); + ret = -ENXIO ; + goto error_clk_rate_exclusive; + } ret =devm_request_irq (dev, irq, sun6i_csi_isr,0 ,SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); -return ret; + goto error_clk_rate_exclusive; }return 0 ; +
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, · line 899
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +9
-0+error_clk_rate_exclusive: +clk_rate_exclusive_put (csi_dev->clk_mod); + +return ret; +} + +static void sun6i_csi_resources_cleanup (struct sun6i_csi_device *csi_dev) +{ +clk_rate_exclusive_put (csi_dev->clk_mod); }
If you're going to have that function anyway, let's use devm_add_action_or_reset, it'll simplify the rest of the patch.
Maxime
Re: [PATCH v2 21/66] media: sun6i-csi: Always set exclusive module clock rate
Hi,
Thanks for the review,
Quoted 96 lines · Maxime Ripard
Quoted 95 lines · Paul Kocialkowski
In some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +20
-12@@ -154,9 +154,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 );clk_disable_unprepare (csi_dev->clk_ram); -if (of_device_is_compatible (dev->of_node, -"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);reset_control_assert (csi_dev->reset);return 0 ;@@ -168,9 +165,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)return ret; } -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_set_rate_exclusive (csi_dev->clk_mod,300000000 ); - ret =clk_prepare_enable (csi_dev->clk_ram);if (ret) {dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret);@@ -190,8 +184,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) clk_ram_disable:clk_disable_unprepare (csi_dev->clk_ram); clk_mod_disable: -if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) -clk_rate_exclusive_put (csi_dev->clk_mod);clk_disable_unprepare (csi_dev->clk_mod);return ret; }@@ -819,6 +811,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, struct platform_device *platform_dev) {struct device *dev = csi_dev->dev; +unsigned long clk_mod_rate;void __iomem *io_base;int ret;int irq;@@ -856,28 +849,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clk_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clk_mod_rate =300000000 ; +else + clk_mod_rate =297000000 ; + + ret =clk_set_rate_exclusive (csi_dev->clk_mod, clk_mod_rate); +if (ret) { +dev_err (dev,"failed to set mod clock rate\n" ); +return ret; + } +/* Reset */ csi_dev->reset =devm_reset_control_get_shared (dev,NULL );if (IS_ERR (csi_dev->reset)) {dev_err (dev,"failed to acquire reset\n" ); -return PTR_ERR (csi_dev->reset); + ret =PTR_ERR (csi_dev->reset); + goto error_clk_rate_exclusive; }/* Interrupt */ irq =platform_get_irq (platform_dev,0 ); -if (irq <0 ) -return -ENXIO ; +if (irq <0 ) { +dev_err (dev,"failed to get interrupt\n" ); + ret = -ENXIO ; + goto error_clk_rate_exclusive; + } ret =devm_request_irq (dev, irq, sun6i_csi_isr,0 ,SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); -return ret; + goto error_clk_rate_exclusive; }
Quoted 15 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, · line 899
Quoted 12 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +10
-0return 0 ; + +error_clk_rate_exclusive: +clk_rate_exclusive_put (csi_dev->clk_mod); + +return ret; +} + +static void sun6i_csi_resources_cleanup (struct sun6i_csi_device *csi_dev) +{ +clk_rate_exclusive_put (csi_dev->clk_mod); }If you're going to have that function anyway, let's use
devm_add_action_or_reset, it'll simplify the rest of the patch.
Well, this will cause issues later on when adding runtime pm support to sun6i_csi_resources_cleanup: then it will no longer be equivalent to the error case label.
Also I feel like making the resources_cleanup call a devm action would not help clarify the general flow of the driver, where the matching setup/cleanup calls are ordered in probe/remove. The driver is quite big with various parts and I'd rather have them behave in a coherent and similar way.
What do you think?
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 21/66] media: sun6i-csi: Always set exclusive module clock rate
In reply to Paul KocialkowskiHi Paul,
Thanks for the patchbomb.
Quoted 15 lines · Paul Kocialkowski
In some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0
-0
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, · line 855
Quoted 7 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4
-0@@ -856,28 +849,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clk_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clk_mod_rate =300000000 ; +else + clk_mod_rate =297000000 ;
This would be nice to put in OF match data.
Of course the driver did this already before the patch. The approach still scales badly.
Signature · 3 lines
Regards, Sakari Ailus
Re: [PATCH v2 21/66] media: sun6i-csi: Always set exclusive module clock rate
Hi Sakari,
Quoted 3 lines · Sakari Ailus
Hi Paul,
Thanks for the patchbomb.
I'll split it in the next revision.
Quoted 26 lines · Paul Kocialkowski
Quoted 15 lines
In some situations the default rate of the module clock is not the required one for operation (for example when reconfiguring the clock tree to use a different parent). As a result, always set the correct rate for the clock (and take care of cleanup).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0
-0drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, · line 855
Quoted 7 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4
-0@@ -856,28 +849,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,return PTR_ERR (csi_dev->clk_ram); } +if (of_device_is_compatible (dev->of_node,"allwinner,sun50i-a64-csi" )) + clk_mod_rate =300000000 ; +else + clk_mod_rate =297000000 ;This would be nice to put in OF match data.
Quoted 2 lines
Of course the driver did this already before the patch. The approach still scales badly.
Agreed, that could be another follow-up patch in the sun6i-csi rework series.
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 22/66 media: sun6i-csi: Use runtime pm for clocks and reset
In reply to Paul KocialkowskiWrap the clock and reset preparation into runtime pm functions for better organization of the code.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 94 ++++++++++++++----- 1 file changed, 69 insertions(+), 25 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +69 -25
@@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +pm_runtime_put (dev); -clk_disable_unprepare (csi_dev->clk_ram); -clk_disable_unprepare (csi_dev->clk_mod); -reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (csi_dev->clk_mod); -if (ret) { -dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret); + ret =pm_runtime_resume_and_get (dev); +if (ret <0 )return ret; - } - - ret =clk_prepare_enable (csi_dev->clk_ram); -if (ret) { -dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); - goto clk_mod_disable; - } - - ret =reset_control_deassert (csi_dev->reset); -if (ret) { -dev_err (csi_dev->dev,"reset err %d\n" , ret); - goto clk_ram_disable; - }regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN );return 0 ; - -clk_ram_disable: -clk_disable_unprepare (csi_dev->clk_ram); -clk_mod_disable: -clk_disable_unprepare (csi_dev->clk_mod); -return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev,
@@ -800,6 +778,65 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)return IRQ_HANDLED ; } +static int sun6i_csi_suspend (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); + +reset_control_assert (csi_dev->reset); +clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_bus); + +return 0 ; +} + +static int sun6i_csi_resume (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); +int ret; + + ret =reset_control_deassert (csi_dev->reset); +if (ret) { +dev_err (dev,"failed to deassert reset\n" ); +return ret; + } + + ret =clk_prepare_enable (csi_dev->clk_bus); +if (ret) { +dev_err (dev,"failed to enable bus clock\n" ); + goto error_reset; + } + + ret =clk_prepare_enable (csi_dev->clk_mod); +if (ret) { +dev_err (dev,"failed to enable module clock\n" ); + goto error_clk_bus; + } + + ret =clk_prepare_enable (csi_dev->clk_ram); +if (ret) { +dev_err (dev,"failed to enable ram clock\n" ); + goto error_clk_mod; + } + +return 0 ; + +error_clk_mod: +clk_disable_unprepare (csi_dev->clk_mod); + +error_clk_bus: +clk_disable_unprepare (csi_dev->clk_bus); + +error_reset: +reset_control_assert (csi_dev->reset); + +return ret; +} + +static const struct dev_pm_ops sun6i_csi_pm_ops = { +SET_RUNTIME_PM_OPS (sun6i_csi_suspend, sun6i_csi_resume,NULL ) +}; +static const struct regmap_config sun6i_csi_regmap_config = { .reg_bits =32 , .reg_stride =4 ,
@@ -885,6 +922,11 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, goto error_clk_rate_exclusive; } +/* Runtime PM */ + +pm_runtime_enable (dev); +pm_runtime_set_suspended (dev); +return 0 ; error_clk_rate_exclusive:
@@ -895,6 +937,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,static void sun6i_csi_resources_cleanup (struct sun6i_csi_device *csi_dev) { +pm_runtime_disable (csi_dev->dev);clk_rate_exclusive_put (csi_dev->clk_mod); }
@@ -954,6 +997,7 @@ static struct platform_driver sun6i_csi_platform_driver = { .driver = { .name = SUN6I_CSI_NAME, .of_match_table = of_match_ptr(sun6i_csi_of_match), + .pm = &sun6i_csi_pm_ops, }, };
Signature · 1 line
2.34.1
Re: [PATCH v2 22/66] media: sun6i-csi: Use runtime pm for clocks and reset
Quoted 92 lines · Paul Kocialkowski
Wrap the clock and reset preparation into runtime pm functions for better organization of the code.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 94 ++++++++++++++----- 1 file changed, 69 insertions(+), 25 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +35
-25@@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +pm_runtime_put (dev); -clk_disable_unprepare (csi_dev->clk_ram); -clk_disable_unprepare (csi_dev->clk_mod); -reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (csi_dev->clk_mod); -if (ret) { -dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret); + ret =pm_runtime_resume_and_get (dev); +if (ret <0 )return ret; - } - - ret =clk_prepare_enable (csi_dev->clk_ram); -if (ret) { -dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); - goto clk_mod_disable; - } - - ret =reset_control_deassert (csi_dev->reset); -if (ret) { -dev_err (csi_dev->dev,"reset err %d\n" , ret); - goto clk_ram_disable; - }regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN );return 0 ; - -clk_ram_disable: -clk_disable_unprepare (csi_dev->clk_ram); -clk_mod_disable: -clk_disable_unprepare (csi_dev->clk_mod); -return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev,@@ -800,6 +778,65 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)return IRQ_HANDLED ; } +static int sun6i_csi_suspend (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); + +reset_control_assert (csi_dev->reset); +clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_bus); + +return 0 ; +} + +static int sun6i_csi_resume (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); +int ret; + + ret =reset_control_deassert (csi_dev->reset); +if (ret) { +dev_err (dev,"failed to deassert reset\n" ); +return ret; + } + + ret =clk_prepare_enable (csi_dev->clk_bus); +if (ret) { +dev_err (dev,"failed to enable bus clock\n" ); + goto error_reset; + } + + ret =clk_prepare_enable (csi_dev->clk_mod); +if (ret) { +dev_err (dev,"failed to enable module clock\n" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static irqreturn_t sun6i_csi_isr(int irq, void *private) · line 822
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +10
-0+ goto error_clk_bus; + } + + ret =clk_prepare_enable (csi_dev->clk_ram); +if (ret) { +dev_err (dev,"failed to enable ram clock\n" ); + goto error_clk_mod; + } + +return 0 ;
You've change the order of the reset vs clock initialization. Also, does that work with CONFIG_PM disabled?
Maxime
Re: [PATCH v2 22/66] media: sun6i-csi: Use runtime pm for clocks and reset
Hi,
Quoted 97 lines · Maxime Ripard
Quoted 96 lines · Paul Kocialkowski
Wrap the clock and reset preparation into runtime pm functions for better organization of the code.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 94 ++++++++++++++----- 1 file changed, 69 insertions(+), 25 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +39
-25@@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +pm_runtime_put (dev); -clk_disable_unprepare (csi_dev->clk_ram); -clk_disable_unprepare (csi_dev->clk_mod); -reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (csi_dev->clk_mod); -if (ret) { -dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret); + ret =pm_runtime_resume_and_get (dev); +if (ret <0 )return ret; - } - - ret =clk_prepare_enable (csi_dev->clk_ram); -if (ret) { -dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); - goto clk_mod_disable; - } - - ret =reset_control_deassert (csi_dev->reset); -if (ret) { -dev_err (csi_dev->dev,"reset err %d\n" , ret); - goto clk_ram_disable; - }regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN );return 0 ; - -clk_ram_disable: -clk_disable_unprepare (csi_dev->clk_ram); -clk_mod_disable: -clk_disable_unprepare (csi_dev->clk_mod); -return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev,@@ -800,6 +778,65 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)return IRQ_HANDLED ; } +static int sun6i_csi_suspend (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); + +reset_control_assert (csi_dev->reset); +clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_bus); + +return 0 ; +} + +static int sun6i_csi_resume (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); +int ret; + + ret =reset_control_deassert (csi_dev->reset); +if (ret) { +dev_err (dev,"failed to deassert reset\n" ); +return ret; + } + + ret =clk_prepare_enable (csi_dev->clk_bus); +if (ret) { +dev_err (dev,"failed to enable bus clock\n" ); + goto error_reset; + } + + ret =clk_prepare_enable (csi_dev->clk_mod); +if (ret) { +dev_err (dev,"failed to enable module clock\n" ); + goto error_clk_bus; + } + + ret =clk_prepare_enable (csi_dev->clk_ram);
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static irqreturn_t sun6i_csi_isr(int irq, void *private) · line 822
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +6
-0+if (ret) { +dev_err (dev,"failed to enable ram clock\n" ); + goto error_clk_mod; + } + +return 0 ;You've change the order of the reset vs clock initialization.
Oh right. Is there a preference regarding the order?
It probably makes more sense to release reset once all the clocks are ready rather than the opposite (so that would match the previous order).
Quoted 1 line
Also, does that work with
CONFIG_PMdisabled?
It doesn't, but the driver should really depend on PM anyway (it doesn't yet). That makes me realize that I didn't cleanup the Kconfig entry, which should have been updated along the way.
Will fix both next time.
Thanks for the review!
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 22/66] media: sun6i-csi: Use runtime pm for clocks and reset
Quoted 107 lines · Paul Kocialkowski
Quoted 97 lines · Maxime Ripard
Quoted 96 lines · Paul Kocialkowski
Wrap the clock and reset preparation into runtime pm functions for better organization of the code.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 94 ++++++++++++++----- 1 file changed, 69 insertions(+), 25 deletions(-)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +39
-25@@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (!enable) {regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +pm_runtime_put (dev); -clk_disable_unprepare (csi_dev->clk_ram); -clk_disable_unprepare (csi_dev->clk_mod); -reset_control_assert (csi_dev->reset);return 0 ; } - ret =clk_prepare_enable (csi_dev->clk_mod); -if (ret) { -dev_err (csi_dev->dev,"Enable csi clk err %d\n" , ret); + ret =pm_runtime_resume_and_get (dev); +if (ret <0 )return ret; - } - - ret =clk_prepare_enable (csi_dev->clk_ram); -if (ret) { -dev_err (csi_dev->dev,"Enable clk_dram_csi clk err %d\n" , ret); - goto clk_mod_disable; - } - - ret =reset_control_deassert (csi_dev->reset); -if (ret) { -dev_err (csi_dev->dev,"reset err %d\n" , ret); - goto clk_ram_disable; - }regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN );return 0 ; - -clk_ram_disable: -clk_disable_unprepare (csi_dev->clk_ram); -clk_mod_disable: -clk_disable_unprepare (csi_dev->clk_mod); -return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev,@@ -800,6 +778,65 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)return IRQ_HANDLED ; } +static int sun6i_csi_suspend (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); + +reset_control_assert (csi_dev->reset); +clk_disable_unprepare (csi_dev->clk_ram); +clk_disable_unprepare (csi_dev->clk_mod); +clk_disable_unprepare (csi_dev->clk_bus); + +return 0 ; +} + +static int sun6i_csi_resume (struct device *dev) +{ +struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); +int ret; + + ret =reset_control_deassert (csi_dev->reset); +if (ret) { +dev_err (dev,"failed to deassert reset\n" ); +return ret; + } + + ret =clk_prepare_enable (csi_dev->clk_bus); +if (ret) { +dev_err (dev,"failed to enable bus clock\n" ); + goto error_reset; + } + + ret =clk_prepare_enable (csi_dev->clk_mod); +if (ret) { +dev_err (dev,"failed to enable module clock\n" ); + goto error_clk_bus; + } + + ret =clk_prepare_enable (csi_dev->clk_ram);Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c static irqreturn_t sun6i_csi_isr(int irq, void *private) · line 822
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +6
-0+if (ret) { +dev_err (dev,"failed to enable ram clock\n" ); + goto error_clk_mod; + } + +return 0 ;You've change the order of the reset vs clock initialization.
Quoted 3 lines
Oh right. Is there a preference regarding the order?
It probably makes more sense to release reset once all the clocks are ready rather than the opposite (so that would match the previous order).
From the datasheet:
4.3.6.4. Gating and reset
Make sure that the reset signal has been released before the release of module clock gating;
So it looks like the right order. it should still be mentioned in the commit log.
Maxime
PATCH v2 23/66 media: sun6i-csi: Tidy up v4l2 code
In reply to Paul KocialkowskiVarious cosmetic improvements to the v4l2 registration code, with renames, lowerings, etc. The cleanup function is moved down after setup. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 118 ++++++++++-------- 1 file changed, 68 insertions(+), 50 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +68 -50
@@ -27,6 +27,8 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" +/* Helpers */ +/* TODO add 10&12 bit YUV, RGB support */ bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code)
@@ -572,9 +574,8 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } -/* ----------------------------------------------------------------------------- -* Media Controller and V4L2 -*/ +/* V4L2 */ +static int sun6i_csi_link_entity (struct sun6i_csi_device *csi_dev,struct media_entity *entity,struct fwnode_handle *fwnode)
@@ -666,86 +667,103 @@ static int sun6i_csi_fwnode_parse(struct device *dev, } } -static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) +static int sun6i_csi_v4l2_setup (struct sun6i_csi_device *csi_dev) {struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; +struct media_device *media_dev = &v4l2->media_dev; +struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev; +struct v4l2_async_notifier *notifier = &v4l2->notifier; +struct device *dev = csi_dev->dev; +int ret; -media_device_unregister (&v4l2->media_dev); -v4l2_async_nf_unregister (&v4l2->notifier); -v4l2_async_nf_cleanup (&v4l2->notifier); -sun6i_video_cleanup (&csi_dev->video); -v4l2_device_unregister (&v4l2->v4l2_dev); -v4l2_ctrl_handler_free (&v4l2->ctrl_handler); -media_device_cleanup (&v4l2->media_dev); -} +/* Media Device */ -static int sun6i_csi_v4l2_init (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; -int ret; +strscpy (media_dev->model,SUN6I_CSI_DESCRIPTION , +sizeof (media_dev->model)); +snprintf (media_dev->bus_info,sizeof (media_dev->bus_info), +"platform:%s" ,dev_name (dev)); + media_dev->hw_revision =0 ; + media_dev->dev = dev; - v4l2->media_dev.dev = csi_dev->dev; -strscpy (v4l2->media_dev.model,SUN6I_CSI_DESCRIPTION , -sizeof (v4l2->media_dev.model)); - v4l2->media_dev.hw_revision =0 ; -snprintf (v4l2->media_dev.bus_info, -sizeof (v4l2->media_dev.bus_info),"platform:%s" , -dev_name (csi_dev->dev)); +media_device_init (media_dev); -media_device_init (&v4l2->media_dev); -v4l2_async_nf_init (&v4l2->notifier); +/* V4L2 Control Handler */ ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );if (ret) { -dev_err (csi_dev->dev,"V4L2 controls handler init failed (%d)\n" , - ret); - goto clean_media; +dev_err (dev,"failed to init v4l2 control handler: %d\n" , ret); + goto error_media; } - v4l2->v4l2_dev.mdev = &v4l2->media_dev; - v4l2->v4l2_dev.ctrl_handler = &v4l2->ctrl_handler; - ret =v4l2_device_register (csi_dev->dev, &v4l2->v4l2_dev); +/* V4L2 Device */ + + v4l2_dev->mdev = media_dev; + v4l2_dev->ctrl_handler = &v4l2->ctrl_handler; + + ret =v4l2_device_register (dev, v4l2_dev);if (ret) { -dev_err (csi_dev->dev,"V4L2 device registration failed (%d)\n" , - ret); - goto free_ctrl; +dev_err (dev,"failed to register v4l2 device: %d\n" , ret); + goto error_v4l2_ctrl; } +/* Video */ + ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME );if (ret) - goto unreg_v4l2; + goto error_v4l2_device; - ret =v4l2_async_nf_parse_fwnode_endpoints (csi_dev->dev, - &v4l2->notifier, +/* V4L2 Async */ + +v4l2_async_nf_init (notifier); + notifier->ops = &sun6i_csi_async_ops; + + ret =v4l2_async_nf_parse_fwnode_endpoints (dev, notifier,sizeof (struct v4l2_async_subdev ), sun6i_csi_fwnode_parse);if (ret) - goto clean_video; - - v4l2->notifier.ops = &sun6i_csi_async_ops; + goto error_video; - ret =v4l2_async_nf_register (&v4l2->v4l2_dev, &v4l2->notifier); + ret =v4l2_async_nf_register (v4l2_dev, notifier);if (ret) { -dev_err (csi_dev->dev,"notifier registration failed\n" ); - goto clean_video; +dev_err (dev,"failed to register v4l2 async notifier: %d\n" , + ret); + goto error_v4l2_async_notifier; }return 0 ; -clean_video: +error_v4l2_async_notifier: +v4l2_async_nf_cleanup (notifier); + +error_video:sun6i_video_cleanup (&csi_dev->video); -unreg_v4l2: + +error_v4l2_device:v4l2_device_unregister (&v4l2->v4l2_dev); -free_ctrl: + +error_v4l2_ctrl:v4l2_ctrl_handler_free (&v4l2->ctrl_handler); -clean_media: -v4l2_async_nf_cleanup (&v4l2->notifier); -media_device_cleanup (&v4l2->media_dev); + +error_media: +media_device_cleanup (media_dev);return ret; } +static void sun6i_csi_v4l2_cleanup (struct sun6i_csi_device *csi_dev) +{ +struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; + +media_device_unregister (&v4l2->media_dev); +v4l2_async_nf_unregister (&v4l2->notifier); +v4l2_async_nf_cleanup (&v4l2->notifier); +sun6i_video_cleanup (&csi_dev->video); +v4l2_device_unregister (&v4l2->v4l2_dev); +v4l2_ctrl_handler_free (&v4l2->ctrl_handler); +media_device_cleanup (&v4l2->media_dev); +} +/* Platform */ static irqreturn_t sun6i_csi_isr (int irq,void *private)
@@ -958,7 +976,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret)return ret; - ret =sun6i_csi_v4l2_init (csi_dev); + ret =sun6i_csi_v4l2_setup (csi_dev);if (ret) goto error_resources;
Signature · 1 line
2.34.1
Re: [PATCH v2 23/66] media: sun6i-csi: Tidy up v4l2 code
Quoted 5 lines · Paul Kocialkowski
Various cosmetic improvements to the v4l2 registration code, with renames, lowerings, etc. The cleanup function is moved down after setup. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 24/66 media: sun6i-csi: Tidy up video code
In reply to Paul KocialkowskiSome code cleanups, renames, variable lowerings and moving things around for better organization. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 508 ++++++++++-------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 18 +- 3 files changed, 286 insertions(+), 244 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +2 -2
@@ -595,7 +595,7 @@ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev, src_pad_index = ret; - sink = &csi_dev->video.vdev.entity; + sink = &csi_dev->video.video_dev.entity; sink_pad = &csi_dev->video.pad; dev_dbg(csi_dev->dev, "creating %s:%u -> %s:%u link\n",
@@ -708,7 +708,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)/* Video */ - ret =sun6i_video_init (&csi_dev->video, csi_dev,SUN6I_CSI_NAME ); + ret =sun6i_video_setup (&csi_dev->video, csi_dev);if (ret) goto error_v4l2_device;
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +275 -233
812 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +9 -9
@@ -15,22 +15,22 @@ struct sun6i_csi_device;struct sun6i_video {struct sun6i_csi_device *csi_dev; -struct video_device vdev; -struct media_pad pad; -struct mutex lock; +struct video_device video_dev; +struct vb2_queue queue; +struct mutex lock;/* Queue lock. */ +struct media_pad pad; -struct vb2_queue vb2_vidq; -spinlock_t dma_queue_lock;struct list_head dma_queue; +spinlock_t dma_queue_lock;/* DMA queue lock. */ -unsigned int sequence; -struct v4l2_format fmt; +struct v4l2_format format;u32 mbus_code; +unsigned int sequence; }; -int sun6i_video_init (struct sun6i_video *video, -struct sun6i_csi_device *csi_dev,const char *name); +int sun6i_video_setup (struct sun6i_video *video, +struct sun6i_csi_device *csi_dev);void sun6i_video_cleanup (struct sun6i_video *video);void sun6i_video_frame_done (struct sun6i_video *video);
Signature · 1 line
2.34.1
Re: [PATCH v2 24/66] media: sun6i-csi: Tidy up video code
Quoted 4 lines · Paul Kocialkowski
Some code cleanups, renames, variable lowerings and moving things around for better organization. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 25/66 media: sun6i-csi: Pass and store csi device directly in video code
In reply to Paul KocialkowskiThe video structure is part of the main csi device structure, so pass pointers to that top-level structure directly. This makes it easier to navigate and access other elements. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 8 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 91 ++++++++++--------- .../platform/sunxi/sun6i-csi/sun6i_video.h | 9 +- 3 files changed, 57 insertions(+), 51 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4 -4
@@ -708,7 +708,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)/* Video */ - ret =sun6i_video_setup (&csi_dev->video, csi_dev); + ret =sun6i_video_setup (csi_dev);if (ret) goto error_v4l2_device;
@@ -737,7 +737,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)v4l2_async_nf_cleanup (notifier); error_video: -sun6i_video_cleanup (&csi_dev->video); +sun6i_video_cleanup (csi_dev); error_v4l2_device:v4l2_device_unregister (&v4l2->v4l2_dev);
@@ -758,7 +758,7 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)media_device_unregister (&v4l2->media_dev);v4l2_async_nf_unregister (&v4l2->notifier);v4l2_async_nf_cleanup (&v4l2->notifier); -sun6i_video_cleanup (&csi_dev->video); +sun6i_video_cleanup (csi_dev);v4l2_device_unregister (&v4l2->v4l2_dev);v4l2_ctrl_handler_free (&v4l2->ctrl_handler);media_device_cleanup (&v4l2->media_dev);
@@ -789,7 +789,7 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (&csi_dev->video); +sun6i_video_frame_done (csi_dev);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +50 -41
284 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +3 -6
@@ -14,8 +14,6 @@struct sun6i_csi_device ;struct sun6i_video { -struct sun6i_csi_device *csi_dev; -struct video_device video_dev;struct vb2_queue queue;struct mutex lock;/* Queue lock. */
@@ -29,10 +27,9 @@ struct sun6i_video { unsigned int sequence; }; -int sun6i_video_setup (struct sun6i_video *video, -struct sun6i_csi_device *csi_dev); -void sun6i_video_cleanup (struct sun6i_video *video); +int sun6i_video_setup (struct sun6i_csi_device *csi_dev); +void sun6i_video_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_video_frame_done (struct sun6i_video *video); +void sun6i_video_frame_done (struct sun6i_csi_device *csi_dev);#endif /* __SUN6I_VIDEO_H__ */
Signature · 1 line
2.34.1
Re: [PATCH v2 25/66] media: sun6i-csi: Pass and store csi device directly in video code
Quoted 5 lines · Paul Kocialkowski
The video structure is part of the main csi device structure, so pass pointers to that top-level structure directly. This makes it easier to navigate and access other elements. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 26/66 media: sun6i-csi: Register the media device after creation
In reply to Paul KocialkowskiThere is no particular need to register the media device in the subdev notify complete callback.
Register it in the v4l2 code instead where it's more in-context.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8 -1
@@ -638,7 +638,7 @@ static int sun6i_subdev_notify_complete(struct v4l2_async_notifier *notifier)if (ret <0 )return ret; -return media_device_register (&v4l2->media_dev); +return 0 ; }static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = {
@@ -687,6 +687,12 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)media_device_init (media_dev); + ret =media_device_register (media_dev); +if (ret) { +dev_err (dev,"failed to register media device: %d\n" , ret); + goto error_media; + } +/* V4L2 Control Handler */ ret =v4l2_ctrl_handler_init (&v4l2->ctrl_handler,0 );
@@ -746,6 +752,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)v4l2_ctrl_handler_free (&v4l2->ctrl_handler); error_media: +media_device_unregister (media_dev);media_device_cleanup (media_dev);return ret;
Signature · 1 line
2.34.1
PATCH v2 27/66 media: sun6i-csi: Add media ops with link notify callback
In reply to Paul KocialkowskiIn order to keep the power use count fields balanced when link changes happen between v4l2_pipeline_pm_get/set calls (in open/close), the link_notify media operation callback needs to be registered.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +8 -0
@@ -23,6 +23,7 @@#include <linux/sched.h> #include <linux/sizes.h> #include <linux/slab.h> +#include <media/v4l2-mc.h> #include "sun6i_csi.h" #include "sun6i_csi_reg.h"
@@ -574,6 +575,12 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } +/* Media */ + +static const struct media_device_ops sun6i_csi_media_ops = { + .link_notify = v4l2_pipeline_link_notify, +}; +/* V4L2 */ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev,
@@ -683,6 +690,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)snprintf (media_dev->bus_info,sizeof (media_dev->bus_info),"platform:%s" ,dev_name (dev)); media_dev->hw_revision =0 ; + media_dev->ops = &sun6i_csi_media_ops; media_dev->dev = dev;media_device_init (media_dev);
Signature · 1 line
2.34.1
Re: [PATCH v2 27/66] media: sun6i-csi: Add media ops with link notify callback
Hi Paul,
Thanks for the update.
Quoted 22 lines · Paul Kocialkowski
In order to keep the power use count fields balanced when link changes happen between v4l2_pipeline_pm_get/set calls (in open/close), the
link_notifymedia operation callback needs to be registered.Signed-off-by Paul Kocialkowski <[email protected]>--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +1
-0@@ -23,6 +23,7 @@#include <linux/sched.h> #include <linux/sizes.h> #include <linux/slab.h> +#include <media/v4l2-mc.h> #include "sun6i_csi.h" #include "sun6i_csi_reg.h"
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) · line 581
Quoted 7 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4
-0@@ -574,6 +575,12 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } +/* Media */ + +static const struct media_device_ops sun6i_csi_media_ops = { + .link_notify = v4l2_pipeline_link_notify,
Do you really need this?
Drivers should instead rely on runtime PM nowadays.
<URL:https://hverkuil.home.xs4all.nl/spec/driver-api/camera-sensor.html#power-management>
Quoted 13 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3
-0+}; +/* V4L2 */ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev,@@ -683,6 +690,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)snprintf (media_dev->bus_info,sizeof (media_dev->bus_info),"platform:%s" ,dev_name (dev)); media_dev->hw_revision =0 ; + media_dev->ops = &sun6i_csi_media_ops; media_dev->dev = dev;media_device_init (media_dev);
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v2 27/66] media: sun6i-csi: Add media ops with link notify callback
Hi Sakari,
Quoted 37 lines · Sakari Ailus
Hi Paul,
Thanks for the update.
Quoted 22 lines · Paul Kocialkowski
In order to keep the power use count fields balanced when link changes happen between v4l2_pipeline_pm_get/set calls (in open/close), the
link_notifymedia operation callback needs to be registered.Signed-off-by Paul Kocialkowski <[email protected]>--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +1
-0@@ -23,6 +23,7 @@#include <linux/sched.h> #include <linux/sizes.h> #include <linux/slab.h> +#include <media/v4l2-mc.h> #include "sun6i_csi.h" #include "sun6i_csi_reg.h" drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) · line 581
Quoted 7 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4
-0@@ -574,6 +575,12 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable) CSI_CAP_CH0_VCAP_ON); } +/* Media */ + +static const struct media_device_ops sun6i_csi_media_ops = { + .link_notify = v4l2_pipeline_link_notify,Do you really need this?
Quoted 3 lines
Drivers should instead rely on runtime PM nowadays.
<URL:https://hverkuil.home.xs4all.nl/spec/driver-api/camera-sensor.html#power-management>
See my remark on the patch adding support for runtime pm.
My understanding is that the callback is required when v4l2_pipeline_pm_get/set is used, to keep the use count balanced (as mentionned in this commit message):
<https://hverkuil.home.xs4all.nl/spec/driver-api/v4l2-mc.html#c.v4l2_pipeline_pm_get>
Cheers,
Paul
Quoted 18 lines
Quoted 13 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3
-0+}; +/* V4L2 */ static int sun6i_csi_link_entity(struct sun6i_csi_device *csi_dev,@@ -683,6 +690,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)snprintf (media_dev->bus_info,sizeof (media_dev->bus_info),"platform:%s" ,dev_name (dev)); media_dev->hw_revision =0 ; + media_dev->ops = &sun6i_csi_media_ops; media_dev->dev = dev;media_device_init (media_dev);Signature · 3 lines
Kind regards, Sakari Ailus
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 28/66 media: sun6i-csi: Introduce and use video helper functions
In reply to Paul KocialkowskiIntroduce some helpers for buffer and general video configuration.
--- .../platform/sunxi/sun6i-csi/sun6i_video.c | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +28 -18
@@ -92,6 +92,29 @@ static bool sun6i_video_format_check(u32 format)return false; } +/* Video */ + +static void sun6i_video_buffer_configure (struct sun6i_csi_device *csi_dev, +struct sun6i_csi_buffer *csi_buffer) +{ + csi_buffer->queued_to_csi = true; +sun6i_csi_update_buf_addr (csi_dev, csi_buffer->dma_addr); +} + +static void sun6i_video_configure (struct sun6i_csi_device *csi_dev) +{ +struct sun6i_video *video = &csi_dev->video; +struct sun6i_csi_config config = {0 }; + + config.pixelformat = video->format.fmt.pix.pixelformat; + config.code = video->mbus_code; + config.field = video->format.fmt.pix.field; + config.width = video->format.fmt.pix.width; + config.height = video->format.fmt.pix.height; + +sun6i_csi_update_config (csi_dev, &config); +} +/* Queue */ static int sun6i_video_queue_setup(struct vb2_queue *queue,
@@ -160,7 +183,6 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue,struct video_device *video_dev = &video->video_dev;struct sun6i_csi_buffer *buf;struct sun6i_csi_buffer *next_buf; -struct sun6i_csi_config config;struct v4l2_subdev *subdev;unsigned long flags;int ret;
@@ -182,22 +204,13 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue, goto error_media_pipeline; } - config.pixelformat = video->format.fmt.pix.pixelformat; - config.code = video->mbus_code; - config.field = video->format.fmt.pix.field; - config.width = video->format.fmt.pix.width; - config.height = video->format.fmt.pix.height; - - ret =sun6i_csi_update_config (csi_dev, &config); -if (ret <0 ) - goto error_media_pipeline; +sun6i_video_configure (csi_dev);spin_lock_irqsave (&video->dma_queue_lock, flags); buf =list_first_entry (&video->dma_queue, struct sun6i_csi_buffer, list); - buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, buf);sun6i_csi_set_stream (csi_dev, true);
@@ -219,8 +232,7 @@ static int sun6i_video_start_streaming(struct vb2_queue *queue,* would also drop frame when lacking of queued buffer. */ next_buf =list_next_entry (buf, list); - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf);spin_unlock_irqrestore (&video->dma_queue_lock, flags);
@@ -294,8 +306,7 @@ void sun6i_video_frame_done(struct sun6i_csi_device *csi_dev)* for next ISR call. */ if (!next_buf->queued_to_csi) { - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf);dev_dbg (csi_dev->dev,"Frame dropped!\n" ); goto complete; }
@@ -309,8 +320,7 @@ void sun6i_video_frame_done(struct sun6i_csi_device *csi_dev)/* Prepare buffer for next frame but one. */ if (!list_is_last (&next_buf->list, &video->dma_queue)) { next_buf =list_next_entry (next_buf, list); - next_buf->queued_to_csi = true; -sun6i_csi_update_buf_addr (csi_dev, next_buf->dma_addr); +sun6i_video_buffer_configure (csi_dev, next_buf); }else {dev_dbg (csi_dev->dev,"Next frame will be dropped!\n" ); }
Signature · 1 line
2.34.1
PATCH v2 29/66 media: sun6i-csi: Move csi buffer definition to main header file
In reply to Paul KocialkowskiThe buffer structure is a top-level definition, put it in the main header to keep things tidy. No functional change intended.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 9 +++++++++ drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +9 -0
@@ -11,12 +11,21 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fwnode.h> +#include <media/videobuf2-v4l2.h> #include "sun6i_video.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +struct sun6i_csi_buffer { +struct vb2_v4l2_buffer v4l2_buffer; +struct list_head list; + +dma_addr_t dma_addr; +bool queued_to_csi; +}; +/** * struct sun6i_csi_config - configs for sun6i csi * @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*)
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +0 -8
@@ -23,14 +23,6 @@#define MAX_WIDTH (4800)#define MAX_HEIGHT (4800) -struct sun6i_csi_buffer { -struct vb2_v4l2_buffer v4l2_buffer; -struct list_head list; - -dma_addr_t dma_addr; -bool queued_to_csi; -}; -/* Helpers */ static struct v4l2_subdev *
Signature · 1 line
2.34.1
Re: [PATCH v2 29/66] media: sun6i-csi: Move csi buffer definition to main header file
Quoted 4 lines · Paul Kocialkowski
The buffer structure is a top-level definition, put it in the main header to keep things tidy. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 30/66 media: sun6i-csi: Add bridge v4l2 subdev with port management
In reply to Paul KocialkowskiIntroduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The s_stream video op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).
The video capture device is now registered after the bridge and attaches to it with a media link.
--- .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 156 +----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 12 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 473 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 44 ++ .../platform/sunxi/sun6i-csi/sun6i_video.c | 19 + 6 files changed, 571 insertions(+), 135 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
drivers/media/platform/sunxi/sun6i-csi/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -sun6i-csi-y += sun6i_video.o sun6i_csi.o +sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +26 -130
216 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +8 -4
@@ -13,11 +13,16 @@#include <media/v4l2-fwnode.h> #include <media/videobuf2-v4l2.h> +#include "sun6i_csi_bridge.h" #include "sun6i_video.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +enum sun6i_csi_port { +SUN6I_CSI_PORT_PARALLEL =0 , +}; +struct sun6i_csi_buffer {struct vb2_v4l2_buffer v4l2_buffer;struct list_head list;
@@ -46,10 +51,6 @@ struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev;struct v4l2_ctrl_handler ctrl_handler;struct media_device media_dev; - -struct v4l2_async_notifier notifier; -/* video port settings */ -struct v4l2_fwnode_endpoint v4l2_ep; };struct sun6i_csi_device {
@@ -57,6 +58,7 @@ struct sun6i_csi_device {struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2; +struct sun6i_csi_bridge bridge;struct sun6i_video video;struct regmap *regmap;
@@ -156,4 +158,6 @@ static inline int sun6i_csi_get_bpp(unsigned int pixformat) return 0; } +int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev); +#endif /* __SUN6I_CSI_H__ */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +473 -0
473 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +44 -0
44 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +19 -0
@@ -632,6 +632,7 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev) {struct sun6i_video *video = &csi_dev->video;struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *bridge_subdev = &csi_dev->bridge.subdev;struct video_device *video_dev = &video->video_dev;struct vb2_queue *queue = &video->queue;struct media_pad *pad = &video->pad;
@@ -715,8 +716,26 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev)v4l2_info (v4l2_dev,"device %s registered as %s\n" , video_dev->name,video_device_node_name (video_dev)); +/* Media Pad Link */ + + ret =media_create_pad_link (&bridge_subdev->entity, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + &video_dev->entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +if (ret <0 ) { +v4l2_err (v4l2_dev,"failed to create %s:%u -> %s:%u link\n" , + bridge_subdev->entity.name, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + video_dev->entity.name,0 ); + goto error_video_device; + } +return 0 ; +error_video_device: +vb2_video_unregister_device (video_dev); + error_media_entity:media_entity_cleanup (&video_dev->entity);
Signature · 1 line
2.34.1
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Quoted 9 lines · Paul Kocialkowski
Introduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The
s_streamvideo op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).
Quoted 4 lines
The video capture device is now registered after the bridge and attaches to it with a media link.
Signed-off-by Paul Kocialkowski <[email protected]>
There's a bunch of checkpatch --strict warnings that need to be fixed
Maxime
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Hi,
Quoted 10 lines · Maxime Ripard
Quoted 9 lines · Paul Kocialkowski
Introduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The
s_streamvideo op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).
Quoted 6 lines
Quoted 4 lines
The video capture device is now registered after the bridge and attaches to it with a media link.
Signed-off-by Paul Kocialkowski <[email protected]>There's a bunch of checkpatch --strict warnings that need to be fixed
Yes so it turns out these are adaptations to the existing video code which has these warnings already merged. They are cleaned up later on in a dedicated commit, but since it's not the topic of this change (which is a logic change) I kept the code as it is.
What do you think?
Cheers,
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Quoted 18 lines · Paul Kocialkowski
Hi,
Quoted 15 lines · Maxime Ripard
Quoted 13 lines · Paul Kocialkowski
Introduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The
s_streamvideo op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).The video capture device is now registered after the bridge and attaches to it with a media link.
Signed-off-by Paul Kocialkowski <[email protected]>
Quoted 8 lines
Quoted 1 line
There's a bunch of checkpatch --strict warnings that need to be fixed
Yes so it turns out these are adaptations to the existing video code which has these warnings already merged. They are cleaned up later on in a dedicated commit, but since it's not the topic of this change (which is a logic change) I kept the code as it is.
What do you think?
+ async_subdev = v4l2_async_nf_add_fwnode_remote(notifier, handle,
+ struct v4l2_async_subdev);
CHECK: Alignment should match open parenthesis
This one at least is introduced by your patch
Maxime
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
In reply to Paul KocialkowskiHi Paul,
Quoted 472 lines · Paul Kocialkowski
Introduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The
s_streamvideo op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).The video capture device is now registered after the bridge and attaches to it with a media link.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 156 +----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 12 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 473 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 44 ++ .../platform/sunxi/sun6i-csi/sun6i_video.c | 19 + 6 files changed, 571 insertions(+), 135 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.hdrivers/media/platform/sunxi/sun6i-csi/Makefile +1
-1@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -sun6i-csi-y += sun6i_video.o sun6i_csi.o +sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.odrivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +26
-130@@ -34,16 +34,17 @@bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code) { -struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; +struct v4l2_fwnode_endpoint *endpoint = + &csi_dev->bridge.source->endpoint;/* * Some video receivers have the ability to be compatible with * 8bit and 16bit bus width. * Identify the media bus format from device tree. */ -if ((v4l2->v4l2_ep.bus_type ==V4L2_MBUS_PARALLEL - || v4l2->v4l2_ep.bus_type ==V4L2_MBUS_BT656 ) - && v4l2->v4l2_ep.bus.parallel.bus_width ==16 ) { +if ((endpoint->bus_type ==V4L2_MBUS_PARALLEL + || endpoint->bus_type ==V4L2_MBUS_BT656 ) + && endpoint->bus.parallel.bus_width ==16 ) {switch (pixformat) {case V4L2_PIX_FMT_NV12_16L16 :case V4L2_PIX_FMT_NV12 :@@ -328,7 +329,8 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_device *csi_dev,static void sun6i_csi_setup_bus (struct sun6i_csi_device *csi_dev) { -struct v4l2_fwnode_endpoint *endpoint = &csi_dev->v4l2.v4l2_ep; +struct v4l2_fwnode_endpoint *endpoint = + &csi_dev->bridge.source->endpoint;struct sun6i_csi_config *config = &csi_dev->config;unsigned char bus_width;u32 flags;@@ -583,95 +585,11 @@ static const struct media_device_ops sun6i_csi_media_ops = {/* V4L2 */ -static int sun6i_csi_link_entity (struct sun6i_csi_device *csi_dev, -struct media_entity *entity, -struct fwnode_handle *fwnode) +int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev) { -struct media_entity *sink; -struct media_pad *sink_pad; -int src_pad_index; -int ret; - - ret =media_entity_get_fwnode_pad (entity, fwnode,MEDIA_PAD_FL_SOURCE ); -if (ret <0 ) { -dev_err (csi_dev->dev, -"%s: no source pad in external entity %s\n" , __func__, - entity->name); -return -EINVAL ; - } - - src_pad_index = ret; - - sink = &csi_dev->video.video_dev.entity; - sink_pad = &csi_dev->video.pad; - -dev_dbg (csi_dev->dev,"creating %s:%u -> %s:%u link\n" , - entity->name, src_pad_index, sink->name, sink_pad->index); - ret =media_create_pad_link (entity, src_pad_index, sink, - sink_pad->index, -MEDIA_LNK_FL_ENABLED | -MEDIA_LNK_FL_IMMUTABLE ); -if (ret <0 ) { -dev_err (csi_dev->dev,"failed to create %s:%u -> %s:%u link\n" , - entity->name, src_pad_index, - sink->name, sink_pad->index); -return ret; - } - -return 0 ; -} - -static int sun6i_subdev_notify_complete (struct v4l2_async_notifier *notifier) -{ -struct sun6i_csi_device *csi_dev = - container_of(notifier, struct sun6i_csi_device, - v4l2.notifier); -struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2; -struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev; -struct v4l2_subdev *sd; -int ret; - -dev_dbg (csi_dev->dev,"notify complete, all subdevs registered\n" ); - - sd = list_first_entry(&v4l2_dev->subdevs, struct v4l2_subdev, list); -if (!sd) -return -EINVAL ; - - ret =sun6i_csi_link_entity (csi_dev, &sd->entity, sd->fwnode); -if (ret <0 ) -return ret; - - ret =v4l2_device_register_subdev_nodes (v4l2_dev); -if (ret <0 ) -return ret; - -return 0 ; -} - -static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = { - .complete = sun6i_subdev_notify_complete, -}; - -static int sun6i_csi_fwnode_parse (struct device *dev, -struct v4l2_fwnode_endpoint *vep, -struct v4l2_async_subdev *asd) -{ -struct sun6i_csi_device *csi_dev =dev_get_drvdata (dev); +struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; -if (vep->base.port || vep->base.id) { -dev_warn (dev,"Only support a single port with one endpoint\n" ); -return -ENOTCONN ; - } - -switch (vep->bus_type) { -case V4L2_MBUS_PARALLEL : -case V4L2_MBUS_BT656 : - csi_dev->v4l2.v4l2_ep = *vep; -return 0 ; -default : -dev_err (dev,"Unsupported media bus type\n" ); -return -ENOTCONN ; - } +return v4l2_device_register_subdev_nodes (v4l2_dev); }static int sun6i_csi_v4l2_setup (struct sun6i_csi_device *csi_dev)@@ -679,7 +597,6 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev)struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;struct media_device *media_dev = &v4l2->media_dev;struct v4l2_device *v4l2_dev = &v4l2->v4l2_dev; -struct v4l2_async_notifier *notifier = &v4l2->notifier;struct device *dev = csi_dev->dev;int ret;@@ -720,42 +637,8 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) goto error_v4l2_ctrl; } -/* Video */ - - ret =sun6i_video_setup (csi_dev); -if (ret) - goto error_v4l2_device; - -/* V4L2 Async */ - -v4l2_async_nf_init (notifier); - notifier->ops = &sun6i_csi_async_ops; - - ret =v4l2_async_nf_parse_fwnode_endpoints (dev, notifier, -sizeof (struct -v4l2_async_subdev ), - sun6i_csi_fwnode_parse); -if (ret) - goto error_video; - - ret =v4l2_async_nf_register (v4l2_dev, notifier); -if (ret) { -dev_err (dev,"failed to register v4l2 async notifier: %d\n" , - ret); - goto error_v4l2_async_notifier; - } -return 0 ; -error_v4l2_async_notifier: -v4l2_async_nf_cleanup (notifier); - -error_video: -sun6i_video_cleanup (csi_dev); - -error_v4l2_device: -v4l2_device_unregister (&v4l2->v4l2_dev); - error_v4l2_ctrl:v4l2_ctrl_handler_free (&v4l2->ctrl_handler);@@ -771,9 +654,6 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)struct sun6i_csi_v4l2 *v4l2 = &csi_dev->v4l2;media_device_unregister (&v4l2->media_dev); -v4l2_async_nf_unregister (&v4l2->notifier); -v4l2_async_nf_cleanup (&v4l2->notifier); -sun6i_video_cleanup (csi_dev);v4l2_device_unregister (&v4l2->v4l2_dev);v4l2_ctrl_handler_free (&v4l2->ctrl_handler);media_device_cleanup (&v4l2->media_dev);@@ -995,8 +875,22 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret) goto error_resources; + ret =sun6i_csi_bridge_setup (csi_dev); +if (ret) + goto error_v4l2; + + ret =sun6i_video_setup (csi_dev); +if (ret) + goto error_bridge; +return 0 ; +error_bridge: +sun6i_csi_bridge_cleanup (csi_dev); + +error_v4l2: +sun6i_csi_v4l2_cleanup (csi_dev); + error_resources:sun6i_csi_resources_cleanup (csi_dev);@@ -1007,6 +901,8 @@ static int sun6i_csi_remove(struct platform_device *pdev) {struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev); +sun6i_video_cleanup (csi_dev); +sun6i_csi_bridge_cleanup (csi_dev);sun6i_csi_v4l2_cleanup (csi_dev);sun6i_csi_resources_cleanup (csi_dev);drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +8
-4@@ -13,11 +13,16 @@#include <media/v4l2-fwnode.h> #include <media/videobuf2-v4l2.h> +#include "sun6i_csi_bridge.h" #include "sun6i_video.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device" +enum sun6i_csi_port { +SUN6I_CSI_PORT_PARALLEL =0 , +}; +struct sun6i_csi_buffer {struct vb2_v4l2_buffer v4l2_buffer;struct list_head list;@@ -46,10 +51,6 @@ struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev;struct v4l2_ctrl_handler ctrl_handler;struct media_device media_dev; - -struct v4l2_async_notifier notifier; -/* video port settings */ -struct v4l2_fwnode_endpoint v4l2_ep; };struct sun6i_csi_device {@@ -57,6 +58,7 @@ struct sun6i_csi_device {struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2; +struct sun6i_csi_bridge bridge;struct sun6i_video video;struct regmap *regmap;@@ -156,4 +158,6 @@ static inline int sun6i_csi_get_bpp(unsigned int pixformat) return 0; } +int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev); +#endif /* __SUN6I_CSI_H__ */ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +157
-0@@ -0,0 +1,473 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> +*/ + +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> + +#include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" + +/* Format */ + +static const u32 sun6i_csi_bridge_mbus_codes[] = { +/* Bayer */ +MEDIA_BUS_FMT_SBGGR8_1X8 , +MEDIA_BUS_FMT_SGBRG8_1X8 , +MEDIA_BUS_FMT_SGRBG8_1X8 , +MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_SBGGR10_1X10 , +MEDIA_BUS_FMT_SGBRG10_1X10 , +MEDIA_BUS_FMT_SGRBG10_1X10 , +MEDIA_BUS_FMT_SRGGB10_1X10 , +MEDIA_BUS_FMT_SBGGR12_1X12 , +MEDIA_BUS_FMT_SGBRG12_1X12 , +MEDIA_BUS_FMT_SGRBG12_1X12 , +MEDIA_BUS_FMT_SRGGB12_1X12 , +/* RGB */ +MEDIA_BUS_FMT_RGB565_2X8_LE , +MEDIA_BUS_FMT_RGB565_2X8_BE , +/* YUV422 */ +MEDIA_BUS_FMT_YUYV8_2X8 , +MEDIA_BUS_FMT_UYVY8_2X8 , +MEDIA_BUS_FMT_YVYU8_2X8 , +MEDIA_BUS_FMT_UYVY8_2X8 , +MEDIA_BUS_FMT_VYUY8_2X8 , +MEDIA_BUS_FMT_YUYV8_1X16 , +MEDIA_BUS_FMT_UYVY8_1X16 , +MEDIA_BUS_FMT_YVYU8_1X16 , +MEDIA_BUS_FMT_UYVY8_1X16 , +MEDIA_BUS_FMT_VYUY8_1X16 , +/* Compressed */ +MEDIA_BUS_FMT_JPEG_1X8 , +}; + +static bool sun6i_csi_bridge_mbus_code_check (u32 mbus_code) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (sun6i_csi_bridge_mbus_codes); i++) +if (sun6i_csi_bridge_mbus_codes[i] == mbus_code) +return true; + +return false; +} + +/* V4L2 Subdev */ + +static int sun6i_csi_bridge_s_stream (struct v4l2_subdev *subdev,int on) +{ +struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct v4l2_subdev *source_subdev; +/* Initialize to 0 to use both in disable label (ret != 0) and off. */ +int ret =0 ; + +/* Source */ + +if (!csi_dev->bridge.source) +return -ENODEV ; + + source_subdev = csi_dev->bridge.source->subdev; + +if (!on) { +v4l2_subdev_call (source_subdev, video, s_stream,0 ); + goto disable; + } + + ret =v4l2_subdev_call (source_subdev, video, s_stream,1 ); +if (ret && ret != -ENOIOCTLCMD ) + goto disable; + +return 0 ; + +disable: + csi_dev->bridge.source =NULL ; + +return ret; +} + +static const struct v4l2_subdev_video_ops sun6i_csi_bridge_video_ops = { + .s_stream = sun6i_csi_bridge_s_stream, +}; + +static void +sun6i_csi_bridge_mbus_format_prepare (struct v4l2_mbus_framefmt *mbus_format) +{ +if (!sun6i_csi_bridge_mbus_code_check (mbus_format->code)) + mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; + + mbus_format->field =V4L2_FIELD_NONE ; + mbus_format->colorspace =V4L2_COLORSPACE_RAW ; + mbus_format->quantization =V4L2_QUANTIZATION_DEFAULT ; + mbus_format->xfer_func =V4L2_XFER_FUNC_DEFAULT ; +} + +static int sun6i_csi_bridge_init_cfg (struct v4l2_subdev *subdev, +struct v4l2_subdev_state *state) +{ +unsigned int pad =SUN6I_CSI_BRIDGE_PAD_SINK ; +struct v4l2_mbus_framefmt *mbus_format = +v4l2_subdev_get_try_format (subdev, state, pad); + + mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; + mbus_format->width =1280 ; + mbus_format->height =720 ; + +sun6i_csi_bridge_mbus_format_prepare (mbus_format); + +return 0 ; +} + +static int +sun6i_csi_bridge_enum_mbus_code (struct v4l2_subdev *subdev, +struct v4l2_subdev_state *state, +struct v4l2_subdev_mbus_code_enum *code_enum) +{ +if (code_enum->index >=ARRAY_SIZE (sun6i_csi_bridge_mbus_codes)) +return -EINVAL ; + + code_enum->code = sun6i_csi_bridge_mbus_codes[code_enum->index]; + +return 0 ; +} + +static int sun6i_csi_bridge_get_fmt (struct v4l2_subdev *subdev, +struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format) +{ +struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct v4l2_mbus_framefmt *mbus_format = &format->format; + +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) + *mbus_format = *v4l2_subdev_get_try_format (subdev, state, + format->pad); +else + *mbus_format = csi_dev->bridge.mbus_format; + +return 0 ; +} + +static int sun6i_csi_bridge_set_fmt (struct v4l2_subdev *subdev, +struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format) +{
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 167
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +10
-0+struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct v4l2_mbus_framefmt *mbus_format = &format->format; + +sun6i_csi_bridge_mbus_format_prepare (mbus_format); + +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) + *v4l2_subdev_get_try_format (subdev, state, format->pad) = + *mbus_format; +else + csi_dev->bridge.mbus_format = *mbus_format;
Note that the driver is responsible for serialising access to its data, i.e. you have to acquire the mutex here.
Quoted 32 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +32
-0+ +return 0 ; +} + +static const struct v4l2_subdev_pad_ops sun6i_csi_bridge_pad_ops = { + .init_cfg = sun6i_csi_bridge_init_cfg, + .enum_mbus_code = sun6i_csi_bridge_enum_mbus_code, + .get_fmt = sun6i_csi_bridge_get_fmt, + .set_fmt = sun6i_csi_bridge_set_fmt, +}; + +const struct v4l2_subdev_ops sun6i_csi_bridge_subdev_ops = { + .video = &sun6i_csi_bridge_video_ops, + .pad = &sun6i_csi_bridge_pad_ops, +}; + +/* Media Entity */ + +static int sun6i_csi_bridge_link_validate (struct media_link *link) +{ +struct v4l2_subdev *subdev = +media_entity_to_v4l2_subdev (link->sink->entity); +struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct device *dev = csi_dev->dev; +struct v4l2_subdev *source_subdev = +media_entity_to_v4l2_subdev (link->source->entity); +int ret; + +/* Only support one enabled source at a time. */ +if (bridge->source) { +dev_err (dev,"multiple sources are connected to the bridge\n" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 209
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +10
-0+return -EBUSY ; + } + + ret =v4l2_subdev_link_validate (link); +if (ret) +return ret; + +if (source_subdev == bridge->source_parallel.subdev) + bridge->source = &bridge->source_parallel; +else
Useless use of else.
Quoted 56 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +56
-0+return -EINVAL ; + +return 0 ; +} + +static const struct media_entity_operations sun6i_csi_bridge_entity_ops = { + .link_validate = sun6i_csi_bridge_link_validate, +}; + +/* V4L2 Async */ + +static int sun6i_csi_bridge_link (struct sun6i_csi_device *csi_dev, +int sink_pad_index, +struct v4l2_subdev *remote_subdev, +bool enabled) +{ +struct device *dev = csi_dev->dev; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; +struct media_entity *sink_entity = &subdev->entity; +struct media_entity *source_entity = &remote_subdev->entity; +int source_pad_index; +int ret; + +/* Get the first remote source pad. */ + ret =media_entity_get_fwnode_pad (source_entity, remote_subdev->fwnode, +MEDIA_PAD_FL_SOURCE ); +if (ret <0 ) { +dev_err (dev,"missing source pad in external entity %s\n" , + source_entity->name); +return -EINVAL ; + } + + source_pad_index = ret; + +dev_dbg (dev,"creating %s:%u -> %s:%u link\n" , source_entity->name, + source_pad_index, sink_entity->name, sink_pad_index); + + ret =media_create_pad_link (source_entity, source_pad_index, + sink_entity, sink_pad_index, + enabled ?MEDIA_LNK_FL_ENABLED :0 ); +if (ret <0 ) { +dev_err (dev,"failed to create %s:%u -> %s:%u link\n" , + source_entity->name, source_pad_index, + sink_entity->name, sink_pad_index); +return ret; + } + +return 0 ; +} + +static int +sun6i_csi_bridge_notifier_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *remote_subdev, +struct v4l2_async_subdev *async_subdev) +{ + struct sun6i_csi_device *csi_dev =
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 275
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +10
-0+ container_of(notifier, struct sun6i_csi_device, + bridge.notifier); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct sun6i_csi_bridge_source *source =NULL ; +struct fwnode_handle *fwnode =dev_fwnode (csi_dev->dev); +struct fwnode_handle *handle =NULL ; +bool enabled; +int ret; + +while ((handle =fwnode_graph_get_next_endpoint (fwnode, handle))) {
I'd instead store the information you need here in struct sun6i_csi_bridge. You could remove the loop here.
Quoted 34 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +34
-0+struct fwnode_endpoint endpoint = {0 }; +struct fwnode_handle *remote_fwnode; + + remote_fwnode =fwnode_graph_get_remote_port_parent (handle); +if (!remote_fwnode) +continue ; + +if (remote_fwnode != remote_subdev->fwnode) + goto next; + + ret =fwnode_graph_parse_endpoint (handle, &endpoint); +if (ret <0 ) + goto next; + +switch (endpoint.port) { +case SUN6I_CSI_PORT_PARALLEL : + source = &bridge->source_parallel; + enabled = true; +break ; +default : +break ; + } + +next: +fwnode_handle_put (remote_fwnode); + } + +if (!source) +return -EINVAL ; + + source->subdev = remote_subdev; + +return sun6i_csi_bridge_link (csi_dev,SUN6I_CSI_BRIDGE_PAD_SINK , + remote_subdev, enabled);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 319
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +10
-0+} + +static int +sun6i_csi_bridge_notifier_complete (struct v4l2_async_notifier *notifier) +{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); + +return sun6i_csi_v4l2_complete (csi_dev);
You could call v4l2_device_register_subdev_nodes() here.
Quoted 160 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +154
-0+} + +static const struct v4l2_async_notifier_operations +sun6i_csi_bridge_notifier_ops = { + .bound = sun6i_csi_bridge_notifier_bound, + .complete = sun6i_csi_bridge_notifier_complete, +}; + +/* Bridge */ + +static int sun6i_csi_bridge_source_setup (struct sun6i_csi_device *csi_dev, +struct sun6i_csi_bridge_source *source, +u32 port, +enum v4l2_mbus_type *bus_types) +{ +struct device *dev = csi_dev->dev; +struct v4l2_async_notifier *notifier = &csi_dev->bridge.notifier; +struct v4l2_fwnode_endpoint *endpoint = &source->endpoint; +struct v4l2_async_subdev *async_subdev; +struct fwnode_handle *handle; +int ret; + + handle =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev), port,0 ,0 ); +if (!handle) +return -ENODEV ; + + ret =v4l2_fwnode_endpoint_parse (handle, endpoint); +if (ret) + goto complete; + +if (bus_types) { +bool valid = false; +unsigned int i; + +for (i =0 ; bus_types[i] !=V4L2_MBUS_INVALID ; i++) { +if (endpoint->bus_type == bus_types[i]) { + valid = true; +break ; + } + } + +if (!valid) { +dev_err (dev,"unsupported bus type for port %d\n" , + port); + ret = -EINVAL ; + goto complete; + } + } + + async_subdev =v4l2_async_nf_add_fwnode_remote (notifier, handle, + struct v4l2_async_subdev); +if (IS_ERR (async_subdev)) { + ret =PTR_ERR (async_subdev); + goto complete; + } + + source->expected = true; + +complete: +fwnode_handle_put (handle); + +return ret; +} + +int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev) +{ +struct device *dev = csi_dev->dev; +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *subdev = &bridge->subdev; +struct v4l2_async_notifier *notifier = &bridge->notifier; +struct media_pad *pads = bridge->pads; +enum v4l2_mbus_type parallel_mbus_types[] = { +V4L2_MBUS_PARALLEL , +V4L2_MBUS_BT656 , +V4L2_MBUS_INVALID + }; +int ret; + +/* V4L2 Subdev */ + +v4l2_subdev_init (subdev, &sun6i_csi_bridge_subdev_ops); +strscpy (subdev->name,SUN6I_CSI_BRIDGE_NAME ,sizeof (subdev->name)); + subdev->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + subdev->owner =THIS_MODULE ; + subdev->dev = dev; + +v4l2_set_subdevdata (subdev, csi_dev); + +/* Media Entity */ + + subdev->entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + subdev->entity.ops = &sun6i_csi_bridge_entity_ops; + +/* Media Pads */ + + pads[SUN6I_CSI_BRIDGE_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + pads[SUN6I_CSI_BRIDGE_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE | +MEDIA_PAD_FL_MUST_CONNECT ; + + ret =media_entity_pads_init (&subdev->entity, +SUN6I_CSI_BRIDGE_PAD_COUNT , pads); +if (ret <0 ) +return ret; + +/* V4L2 Subdev */ + + ret =v4l2_device_register_subdev (v4l2_dev, subdev); +if (ret) { +dev_err (dev,"failed to register v4l2 subdev: %d\n" , ret); + goto error_media_entity; + } + +/* V4L2 Async */ + +v4l2_async_nf_init (notifier); + notifier->ops = &sun6i_csi_bridge_notifier_ops; + +sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_parallel, +SUN6I_CSI_PORT_PARALLEL , + parallel_mbus_types); + + ret =v4l2_async_nf_register (v4l2_dev, notifier); +if (ret) { +dev_err (dev,"failed to register v4l2 async notifier: %d\n" , + ret); + goto error_v4l2_async_notifier; + } + +return 0 ; + +error_v4l2_async_notifier: +v4l2_async_nf_cleanup (notifier); + +v4l2_device_unregister_subdev (subdev); + +error_media_entity: +media_entity_cleanup (&subdev->entity); + +return ret; +} + +void sun6i_csi_bridge_cleanup (struct sun6i_csi_device *csi_dev) +{ +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; +struct v4l2_async_notifier *notifier = &csi_dev->bridge.notifier; + +v4l2_async_nf_unregister (notifier); +v4l2_async_nf_cleanup (notifier); + +v4l2_device_unregister_subdev (subdev); + +media_entity_cleanup (&subdev->entity); +}drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +0
-0
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h line 3
Quoted 3 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +3
-0@@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Bootlin
2022?
Quoted 80 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +41
-0+* Author: Paul Kocialkowski <[email protected]> +*/ + +#ifndef _SUN6I_CSI_BRIDGE_H_ +#define _SUN6I_CSI_BRIDGE_H_ + +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> + +#define SUN6I_CSI_BRIDGE_NAME "sun6i-csi-bridge" + +enum sun6i_csi_bridge_pad { +SUN6I_CSI_BRIDGE_PAD_SINK =0 , +SUN6I_CSI_BRIDGE_PAD_SOURCE =1 , +SUN6I_CSI_BRIDGE_PAD_COUNT =2 , +}; + +struct sun6i_csi_device ; + +struct sun6i_csi_bridge_source { +struct v4l2_subdev *subdev; +struct v4l2_fwnode_endpoint endpoint; +bool expected; +}; + +struct sun6i_csi_bridge { +struct v4l2_subdev subdev; +struct v4l2_async_notifier notifier; +struct media_pad pads[2 ]; +struct v4l2_mbus_framefmt mbus_format; + +struct sun6i_csi_bridge_source source_parallel; +struct sun6i_csi_bridge_source *source; +}; + +/* Bridge */ + +int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev); +void sun6i_csi_bridge_cleanup (struct sun6i_csi_device *csi_dev); + +#endif drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +19
-0@@ -632,6 +632,7 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev) {struct sun6i_video *video = &csi_dev->video;struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *bridge_subdev = &csi_dev->bridge.subdev;struct video_device *video_dev = &video->video_dev;struct vb2_queue *queue = &video->queue;struct media_pad *pad = &video->pad;@@ -715,8 +716,26 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev)v4l2_info (v4l2_dev,"device %s registered as %s\n" , video_dev->name,video_device_node_name (video_dev)); +/* Media Pad Link */ + + ret =media_create_pad_link (&bridge_subdev->entity, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + &video_dev->entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +if (ret <0 ) { +v4l2_err (v4l2_dev,"failed to create %s:%u -> %s:%u link\n" , + bridge_subdev->entity.name, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + video_dev->entity.name,0 ); + goto error_video_device; + } +return 0 ; +error_video_device: +vb2_video_unregister_device (video_dev); + error_media_entity:media_entity_cleanup (&video_dev->entity);
Signature · 1 line
Sakari Ailus
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Hi Sakari,
Quoted 26 lines · Sakari Ailus
Hi Paul,
Quoted 23 lines · Paul Kocialkowski
Introduce a bridge v4l2 subdev to prepare for separation between the processing part (bridge) and the dma engine, which is required to properly support ths isp workflow later on.
Currently the bridge just manages fwnode mapping to media pads, using an async notifier (which was previously in the main code). The
s_streamvideo op just forwards to the connected v4l2 subdev (sensor or MIPI CSI-2 bridge).The video capture device is now registered after the bridge and attaches to it with a media link.
Signed-off-by Paul Kocialkowski <[email protected]>--- .../media/platform/sunxi/sun6i-csi/Makefile | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 156 +----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 12 +- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 473 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 44 ++ .../platform/sunxi/sun6i-csi/sun6i_video.c | 19 + 6 files changed, 571 insertions(+), 135 deletions(-) create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
[...]
Quoted 9 lines
Quoted 9 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +9
-0+static int sun6i_csi_bridge_set_fmt (struct v4l2_subdev *subdev, +struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format) +{ +struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct v4l2_mbus_framefmt *mbus_format = &format->format; + +sun6i_csi_bridge_mbus_format_prepare (mbus_format); +
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 167
Quoted 5 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +5
-0+if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) + *v4l2_subdev_get_try_format (subdev, state, format->pad) = + *mbus_format; +else + csi_dev->bridge.mbus_format = *mbus_format;Note that the driver is responsible for serialising access to its data, i.e. you have to acquire the mutex here.
Thanks, will take care of that next time.
Quoted 36 lines
Quoted 36 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +36
-0+ +return 0 ; +} + +static const struct v4l2_subdev_pad_ops sun6i_csi_bridge_pad_ops = { + .init_cfg = sun6i_csi_bridge_init_cfg, + .enum_mbus_code = sun6i_csi_bridge_enum_mbus_code, + .get_fmt = sun6i_csi_bridge_get_fmt, + .set_fmt = sun6i_csi_bridge_set_fmt, +}; + +const struct v4l2_subdev_ops sun6i_csi_bridge_subdev_ops = { + .video = &sun6i_csi_bridge_video_ops, + .pad = &sun6i_csi_bridge_pad_ops, +}; + +/* Media Entity */ + +static int sun6i_csi_bridge_link_validate (struct media_link *link) +{ +struct v4l2_subdev *subdev = +media_entity_to_v4l2_subdev (link->sink->entity); +struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct device *dev = csi_dev->dev; +struct v4l2_subdev *source_subdev = +media_entity_to_v4l2_subdev (link->source->entity); +int ret; + +/* Only support one enabled source at a time. */ +if (bridge->source) { +dev_err (dev,"multiple sources are connected to the bridge\n" ); +return -EBUSY ; + } + + ret =v4l2_subdev_link_validate (link);
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 209
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +6
-0+if (ret) +return ret; + +if (source_subdev == bridge->source_parallel.subdev) + bridge->source = &bridge->source_parallel; +else Useless use of else.
Fair enough.
Quoted 61 lines
Quoted 61 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +61
-0+return -EINVAL ; + +return 0 ; +} + +static const struct media_entity_operations sun6i_csi_bridge_entity_ops = { + .link_validate = sun6i_csi_bridge_link_validate, +}; + +/* V4L2 Async */ + +static int sun6i_csi_bridge_link (struct sun6i_csi_device *csi_dev, +int sink_pad_index, +struct v4l2_subdev *remote_subdev, +bool enabled) +{ +struct device *dev = csi_dev->dev; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; +struct media_entity *sink_entity = &subdev->entity; +struct media_entity *source_entity = &remote_subdev->entity; +int source_pad_index; +int ret; + +/* Get the first remote source pad. */ + ret =media_entity_get_fwnode_pad (source_entity, remote_subdev->fwnode, +MEDIA_PAD_FL_SOURCE ); +if (ret <0 ) { +dev_err (dev,"missing source pad in external entity %s\n" , + source_entity->name); +return -EINVAL ; + } + + source_pad_index = ret; + +dev_dbg (dev,"creating %s:%u -> %s:%u link\n" , source_entity->name, + source_pad_index, sink_entity->name, sink_pad_index); + + ret =media_create_pad_link (source_entity, source_pad_index, + sink_entity, sink_pad_index, + enabled ?MEDIA_LNK_FL_ENABLED :0 ); +if (ret <0 ) { +dev_err (dev,"failed to create %s:%u -> %s:%u link\n" , + source_entity->name, source_pad_index, + sink_entity->name, sink_pad_index); +return ret; + } + +return 0 ; +} + +static int +sun6i_csi_bridge_notifier_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *remote_subdev, +struct v4l2_async_subdev *async_subdev) +{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct sun6i_csi_bridge_source *source =NULL ; +struct fwnode_handle *fwnode =dev_fwnode (csi_dev->dev);
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 275
Quoted 5 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +5
-0+struct fwnode_handle *handle =NULL ; +bool enabled; +int ret; + +while ((handle =fwnode_graph_get_next_endpoint (fwnode, handle))) {I'd instead store the information you need here in struct
sun6i_csi_bridge. You could remove the loop here.
Is there a different method for matching a remote subdev to a local port? The rationale here is that I need the handle for fwnode_graph_parse_endpoint but cannot get that handle from the remote subdev's fwnode pointer directly.
Quoted 38 lines
Quoted 38 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +38
-0+struct fwnode_endpoint endpoint = {0 }; +struct fwnode_handle *remote_fwnode; + + remote_fwnode =fwnode_graph_get_remote_port_parent (handle); +if (!remote_fwnode) +continue ; + +if (remote_fwnode != remote_subdev->fwnode) + goto next; + + ret =fwnode_graph_parse_endpoint (handle, &endpoint); +if (ret <0 ) + goto next; + +switch (endpoint.port) { +case SUN6I_CSI_PORT_PARALLEL : + source = &bridge->source_parallel; + enabled = true; +break ; +default : +break ; + } + +next: +fwnode_handle_put (remote_fwnode); + } + +if (!source) +return -EINVAL ; + + source->subdev = remote_subdev; + +return sun6i_csi_bridge_link (csi_dev,SUN6I_CSI_BRIDGE_PAD_SINK , + remote_subdev, enabled); +} + +static int +sun6i_csi_bridge_notifier_complete (struct v4l2_async_notifier *notifier)
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 319
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +6
-0+{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); + +return sun6i_csi_v4l2_complete (csi_dev);You could call
v4l2_device_register_subdev_nodes()here.
That's definitely what sun6i_csi_v4l2_complete does (the diff is probably not very clear). Note that the wrapper is extended later on to register the capture video device for the no-isp path.
Maybe the capture registration could be kept in sun6i_csi_probe for the non-isp path and then the wrapper wouldn't be needed. I don't mind either way.
Quoted 157 lines
Quoted 157 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +154
-0+} + +static const struct v4l2_async_notifier_operations +sun6i_csi_bridge_notifier_ops = { + .bound = sun6i_csi_bridge_notifier_bound, + .complete = sun6i_csi_bridge_notifier_complete, +}; + +/* Bridge */ + +static int sun6i_csi_bridge_source_setup (struct sun6i_csi_device *csi_dev, +struct sun6i_csi_bridge_source *source, +u32 port, +enum v4l2_mbus_type *bus_types) +{ +struct device *dev = csi_dev->dev; +struct v4l2_async_notifier *notifier = &csi_dev->bridge.notifier; +struct v4l2_fwnode_endpoint *endpoint = &source->endpoint; +struct v4l2_async_subdev *async_subdev; +struct fwnode_handle *handle; +int ret; + + handle =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev), port,0 ,0 ); +if (!handle) +return -ENODEV ; + + ret =v4l2_fwnode_endpoint_parse (handle, endpoint); +if (ret) + goto complete; + +if (bus_types) { +bool valid = false; +unsigned int i; + +for (i =0 ; bus_types[i] !=V4L2_MBUS_INVALID ; i++) { +if (endpoint->bus_type == bus_types[i]) { + valid = true; +break ; + } + } + +if (!valid) { +dev_err (dev,"unsupported bus type for port %d\n" , + port); + ret = -EINVAL ; + goto complete; + } + } + + async_subdev =v4l2_async_nf_add_fwnode_remote (notifier, handle, + struct v4l2_async_subdev); +if (IS_ERR (async_subdev)) { + ret =PTR_ERR (async_subdev); + goto complete; + } + + source->expected = true; + +complete: +fwnode_handle_put (handle); + +return ret; +} + +int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev) +{ +struct device *dev = csi_dev->dev; +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *subdev = &bridge->subdev; +struct v4l2_async_notifier *notifier = &bridge->notifier; +struct media_pad *pads = bridge->pads; +enum v4l2_mbus_type parallel_mbus_types[] = { +V4L2_MBUS_PARALLEL , +V4L2_MBUS_BT656 , +V4L2_MBUS_INVALID + }; +int ret; + +/* V4L2 Subdev */ + +v4l2_subdev_init (subdev, &sun6i_csi_bridge_subdev_ops); +strscpy (subdev->name,SUN6I_CSI_BRIDGE_NAME ,sizeof (subdev->name)); + subdev->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + subdev->owner =THIS_MODULE ; + subdev->dev = dev; + +v4l2_set_subdevdata (subdev, csi_dev); + +/* Media Entity */ + + subdev->entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + subdev->entity.ops = &sun6i_csi_bridge_entity_ops; + +/* Media Pads */ + + pads[SUN6I_CSI_BRIDGE_PAD_SINK ].flags =MEDIA_PAD_FL_SINK ; + pads[SUN6I_CSI_BRIDGE_PAD_SOURCE ].flags =MEDIA_PAD_FL_SOURCE | +MEDIA_PAD_FL_MUST_CONNECT ; + + ret =media_entity_pads_init (&subdev->entity, +SUN6I_CSI_BRIDGE_PAD_COUNT , pads); +if (ret <0 ) +return ret; + +/* V4L2 Subdev */ + + ret =v4l2_device_register_subdev (v4l2_dev, subdev); +if (ret) { +dev_err (dev,"failed to register v4l2 subdev: %d\n" , ret); + goto error_media_entity; + } + +/* V4L2 Async */ + +v4l2_async_nf_init (notifier); + notifier->ops = &sun6i_csi_bridge_notifier_ops; + +sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_parallel, +SUN6I_CSI_PORT_PARALLEL , + parallel_mbus_types); + + ret =v4l2_async_nf_register (v4l2_dev, notifier); +if (ret) { +dev_err (dev,"failed to register v4l2 async notifier: %d\n" , + ret); + goto error_v4l2_async_notifier; + } + +return 0 ; + +error_v4l2_async_notifier: +v4l2_async_nf_cleanup (notifier); + +v4l2_device_unregister_subdev (subdev); + +error_media_entity: +media_entity_cleanup (&subdev->entity); + +return ret; +} + +void sun6i_csi_bridge_cleanup (struct sun6i_csi_device *csi_dev) +{ +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; +struct v4l2_async_notifier *notifier = &csi_dev->bridge.notifier; + +v4l2_async_nf_unregister (notifier); +v4l2_async_nf_cleanup (notifier); + +v4l2_device_unregister_subdev (subdev); + +media_entity_cleanup (&subdev->entity); +}drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +0
-0
Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h line 3
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +3
-0@@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2021 Bootlin 2022?
Right, thanks!
Quoted 83 lines
Quoted 80 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h new file +41
-0+* Author: Paul Kocialkowski <[email protected]> +*/ + +#ifndef _SUN6I_CSI_BRIDGE_H_ +#define _SUN6I_CSI_BRIDGE_H_ + +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> + +#define SUN6I_CSI_BRIDGE_NAME "sun6i-csi-bridge" + +enum sun6i_csi_bridge_pad { +SUN6I_CSI_BRIDGE_PAD_SINK =0 , +SUN6I_CSI_BRIDGE_PAD_SOURCE =1 , +SUN6I_CSI_BRIDGE_PAD_COUNT =2 , +}; + +struct sun6i_csi_device ; + +struct sun6i_csi_bridge_source { +struct v4l2_subdev *subdev; +struct v4l2_fwnode_endpoint endpoint; +bool expected; +}; + +struct sun6i_csi_bridge { +struct v4l2_subdev subdev; +struct v4l2_async_notifier notifier; +struct media_pad pads[2 ]; +struct v4l2_mbus_framefmt mbus_format; + +struct sun6i_csi_bridge_source source_parallel; +struct sun6i_csi_bridge_source *source; +}; + +/* Bridge */ + +int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev); +void sun6i_csi_bridge_cleanup (struct sun6i_csi_device *csi_dev); + +#endif drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +19
-0@@ -632,6 +632,7 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev) {struct sun6i_video *video = &csi_dev->video;struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_subdev *bridge_subdev = &csi_dev->bridge.subdev;struct video_device *video_dev = &video->video_dev;struct vb2_queue *queue = &video->queue;struct media_pad *pad = &video->pad;@@ -715,8 +716,26 @@ int sun6i_video_setup(struct sun6i_csi_device *csi_dev)v4l2_info (v4l2_dev,"device %s registered as %s\n" , video_dev->name,video_device_node_name (video_dev)); +/* Media Pad Link */ + + ret =media_create_pad_link (&bridge_subdev->entity, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + &video_dev->entity,0 , +MEDIA_LNK_FL_ENABLED | +MEDIA_LNK_FL_IMMUTABLE ); +if (ret <0 ) { +v4l2_err (v4l2_dev,"failed to create %s:%u -> %s:%u link\n" , + bridge_subdev->entity.name, +SUN6I_CSI_BRIDGE_PAD_SOURCE , + video_dev->entity.name,0 ); + goto error_video_device; + } +return 0 ; +error_video_device: +vb2_video_unregister_device (video_dev); + error_media_entity:media_entity_cleanup (&video_dev->entity);Signature · 1 line
Sakari Ailus
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Hi Paul,
Quoted 20 lines · Paul Kocialkowski
Quoted 11 lines
Quoted 11 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +11
-0+static int +sun6i_csi_bridge_notifier_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *remote_subdev, +struct v4l2_async_subdev *async_subdev) +{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct sun6i_csi_bridge_source *source =NULL ; +struct fwnode_handle *fwnode =dev_fwnode (csi_dev->dev);Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 275
Quoted 5 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +5
-0+struct fwnode_handle *handle =NULL ; +bool enabled; +int ret; + +while ((handle =fwnode_graph_get_next_endpoint (fwnode, handle))) {I'd instead store the information you need here in struct
sun6i_csi_bridge. You could remove the loop here.
Quoted 3 lines
Is there a different method for matching a remote subdev to a local port? The rationale here is that I need the handle for
fwnode_graph_parse_endpointbut cannot get that handle from the remote subdev's fwnode pointer directly.
You generally shouldn't try to match fwnodes here as the V4L2 async framework has already done that job. This information can be found behind the async_subdev pointer.
See e.g. drivers/media/pci/intel/ipu3/ipu3-cio2-main.c for an example.
Quoted 48 lines
Quoted 39 lines
Quoted 39 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +38
-0+struct fwnode_endpoint endpoint = {0 }; +struct fwnode_handle *remote_fwnode; + + remote_fwnode =fwnode_graph_get_remote_port_parent (handle); +if (!remote_fwnode) +continue ; + +if (remote_fwnode != remote_subdev->fwnode) + goto next; + + ret =fwnode_graph_parse_endpoint (handle, &endpoint); +if (ret <0 ) + goto next; + +switch (endpoint.port) { +case SUN6I_CSI_PORT_PARALLEL : + source = &bridge->source_parallel; + enabled = true; +break ; +default : +break ; + } + +next: +fwnode_handle_put (remote_fwnode); + } + +if (!source) +return -EINVAL ; + + source->subdev = remote_subdev; + +return sun6i_csi_bridge_link (csi_dev,SUN6I_CSI_BRIDGE_PAD_SINK , + remote_subdev, enabled); +} + +static int +sun6i_csi_bridge_notifier_complete (struct v4l2_async_notifier *notifier)Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 319
Quoted 6 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +6
-0+{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); + +return sun6i_csi_v4l2_complete (csi_dev);You could call
v4l2_device_register_subdev_nodes()here.
Quoted 3 lines
That's definitely what
sun6i_csi_v4l2_completedoes (the diff is probably not very clear). Note that the wrapper is extended later on to register the capture video device for the no-isp path.
I could be missing something... Do you need to call sun6i_csi_v4l2_complete() in multiple places or not? If not, then I think it'd be probably better to just move the code here.
Quoted 3 lines
Maybe the capture registration could be kept in
sun6i_csi_probefor the non-isp path and then the wrapper wouldn't be needed. I don't mind either way.
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management
Hi Sakari,
Quoted 27 lines · Sakari Ailus
Hi Paul,
Quoted 20 lines · Paul Kocialkowski
Quoted 11 lines
Quoted 11 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +11
-0+static int +sun6i_csi_bridge_notifier_bound (struct v4l2_async_notifier *notifier, +struct v4l2_subdev *remote_subdev, +struct v4l2_async_subdev *async_subdev) +{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); +struct sun6i_csi_bridge *bridge = &csi_dev->bridge; +struct sun6i_csi_bridge_source *source =NULL ; +struct fwnode_handle *fwnode =dev_fwnode (csi_dev->dev);Quoted 8 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 275
Quoted 5 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +5
-0+struct fwnode_handle *handle =NULL ; +bool enabled; +int ret; + +while ((handle =fwnode_graph_get_next_endpoint (fwnode, handle))) {I'd instead store the information you need here in struct
sun6i_csi_bridge. You could remove the loop here.Quoted 3 lines
Is there a different method for matching a remote subdev to a local port? The rationale here is that I need the handle for
fwnode_graph_parse_endpointbut cannot get that handle from the remote subdev's fwnode pointer directly.
Quoted 5 lines
You generally shouldn't try to match fwnodes here as the V4L2 async framework has already done that job. This information can be found behind the
async_subdevpointer.See e.g.
drivers/media/pci/intel/ipu3/ipu3-cio2-main.cfor an example.
Thanks for the feedback, I'll look into that.
Quoted 48 lines
Quoted 48 lines
Quoted 47 lines
Quoted 35 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +34
-0+struct fwnode_endpoint endpoint = {0 }; +struct fwnode_handle *remote_fwnode; + + remote_fwnode =fwnode_graph_get_remote_port_parent (handle); +if (!remote_fwnode) +continue ; + +if (remote_fwnode != remote_subdev->fwnode) + goto next; + + ret =fwnode_graph_parse_endpoint (handle, &endpoint); +if (ret <0 ) + goto next; + +switch (endpoint.port) { +case SUN6I_CSI_PORT_PARALLEL : + source = &bridge->source_parallel; + enabled = true; +break ; +default : +break ; + } + +next: +fwnode_handle_put (remote_fwnode); + } + +if (!source) +return -EINVAL ; + + source->subdev = remote_subdev; + +return sun6i_csi_bridge_link (csi_dev,SUN6I_CSI_BRIDGE_PAD_SINK , + remote_subdev, enabled);drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c line 319
Quoted 10 lines
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c new file +10
-0+} + +static int +sun6i_csi_bridge_notifier_complete (struct v4l2_async_notifier *notifier) +{ +struct sun6i_csi_device *csi_dev = + container_of(notifier, struct sun6i_csi_device, + bridge.notifier); + +return sun6i_csi_v4l2_complete (csi_dev);You could call
v4l2_device_register_subdev_nodes()here.
Quoted 7 lines
Quoted 3 lines
That's definitely what
sun6i_csi_v4l2_completedoes (the diff is probably not very clear). Note that the wrapper is extended later on to register the capture video device for the no-isp path.I could be missing something... Do you need to call
sun6i_csi_v4l2_complete()in multiple places or not? If not, then I think it'd be probably better to just move the code here.
No this is only called here so I guess we can avoid it entirely.
Thanks,
Paul
Quoted 8 lines
Quoted 3 lines
Maybe the capture registration could be kept in
sun6i_csi_probefor the non-isp path and then the wrapper wouldn't be needed. I don't mind either way.Signature · 3 lines
Kind regards, Sakari Ailus
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 31/66 media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture
In reply to Paul KocialkowskiIn an effort to distinguish between the core csi engine (to be represented as the bridge) and the dma engine (the capture video device), rename the video component to capture, with the appropriate prefix. No functional change intended.
---
.../media/platform/sunxi/sun6i-csi/Makefile | 2 +-
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 6 +-
.../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 +-
.../{sun6i_video.c => sun6i_csi_capture.c} | 344 +++++++++---------
.../{sun6i_video.h => sun6i_csi_capture.h} | 14 +-
5 files changed, 187 insertions(+), 183 deletions(-)
rename drivers/media/platform/sunxi/sun6i-csi/{sun6i_video.c => sun6i_csi_capture.c} (58%)
rename drivers/media/platform/sunxi/sun6i-csi/{sun6i_video.h => sun6i_csi_capture.h} (64%)drivers/media/platform/sunxi/sun6i-csi/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -sun6i-csi-y += sun6i_video.o sun6i_csi.o sun6i_csi_bridge.o +sun6i-csi-y += sun6i_csi.o sun6i_csi_bridge.o sun6i_csi_capture.o obj-$(CONFIG_VIDEO_SUN6I_CSI) += sun6i-csi.o
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +3 -3
@@ -684,7 +684,7 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private) }if (status &CSI_CH_INT_STA_FD_PD ) -sun6i_video_frame_done (csi_dev); +sun6i_csi_capture_frame_done (csi_dev);regmap_write (regmap,CSI_CH_INT_STA_REG , status);
@@ -879,7 +879,7 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret) goto error_v4l2; - ret =sun6i_video_setup (csi_dev); + ret =sun6i_csi_capture_setup (csi_dev);if (ret) goto error_bridge;
@@ -901,7 +901,7 @@ static int sun6i_csi_remove(struct platform_device *pdev) {struct sun6i_csi_device *csi_dev =platform_get_drvdata (pdev); -sun6i_video_cleanup (csi_dev); +sun6i_csi_capture_cleanup (csi_dev);sun6i_csi_bridge_cleanup (csi_dev);sun6i_csi_v4l2_cleanup (csi_dev);sun6i_csi_resources_cleanup (csi_dev);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +2 -2
@@ -14,7 +14,7 @@#include <media/videobuf2-v4l2.h> #include "sun6i_csi_bridge.h" -#include "sun6i_video.h" +#include "sun6i_csi_capture.h" #define SUN6I_CSI_NAME "sun6i-csi"#define SUN6I_CSI_DESCRIPTION "Allwinner A31 CSI Device"
@@ -59,7 +59,7 @@ struct sun6i_csi_device {struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2;struct sun6i_csi_bridge bridge; -struct sun6i_video video; +struct sun6i_csi_capture capture;struct regmap *regmap;struct clk *clk_bus;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +174 -170
754 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +7 -7
@@ -5,15 +5,15 @@* Author: Yong Deng <[email protected]> */ -#ifndef __SUN6I_VIDEO_H__ -#define __SUN6I_VIDEO_H__ +#ifndef __SUN6I_CAPTURE_H__ +#define __SUN6I_CAPTURE_H__ #include <media/v4l2-dev.h> #include <media/videobuf2-core.h> struct sun6i_csi_device; -struct sun6i_video { +struct sun6i_csi_capture { struct video_device video_dev; struct vb2_queue queue; struct mutex lock; /* Queue lock. */
@@ -27,9 +27,9 @@ struct sun6i_video { unsigned int sequence; }; -int sun6i_video_setup (struct sun6i_csi_device *csi_dev); -void sun6i_video_cleanup (struct sun6i_csi_device *csi_dev); +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_video_frame_done (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_VIDEO_H__ */ +#endif /* __SUN6I_CAPTURE_H__ */
Signature · 1 line
2.34.1
Re: [PATCH v2 31/66] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture
Quoted 6 lines · Paul Kocialkowski
In an effort to distinguish between the core csi engine (to be represented as the bridge) and the dma engine (the capture video device), rename the video component to capture, with the appropriate prefix. No functional change intended.
Signed-off-by Paul Kocialkowski <[email protected]>
Maxime
PATCH v2 32/66 media: sun6i-csi: Add capture state using vsync for page flip
In reply to Paul KocialkowskiThis introduces a new state structure and associated helpers for capture, which handles the buffer queue and state for each submitted buffer.
Besides from the code refactoring, this changes the page flip point to vsync instead of frame done, which allows working with only two buffers without losing frames. This is apparently a more appropriate thing to do with this controller.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 + .../platform/sunxi/sun6i-csi/sun6i_csi.h | 3 - .../sunxi/sun6i-csi/sun6i_csi_capture.c | 259 ++++++++++-------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 23 +- 4 files changed, 165 insertions(+), 124 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +4 -0
@@ -566,6 +566,7 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable)regmap_write (regmap,CSI_CH_INT_STA_REG ,0xFF ); regmap_write(regmap, CSI_CH_INT_EN_REG, + CSI_CH_INT_EN_VS_INT_EN | CSI_CH_INT_EN_HB_OF_INT_EN | CSI_CH_INT_EN_FIFO2_OF_INT_EN | CSI_CH_INT_EN_FIFO1_OF_INT_EN |
@@ -686,6 +687,9 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)if (status &CSI_CH_INT_STA_FD_PD )sun6i_csi_capture_frame_done (csi_dev); +if (status &CSI_CH_INT_STA_VS_PD ) +sun6i_csi_capture_sync (csi_dev); +regmap_write (regmap,CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -3
@@ -26,9 +26,6 @@ enum sun6i_csi_port {struct sun6i_csi_buffer {struct vb2_v4l2_buffer v4l2_buffer;struct list_head list; - -dma_addr_t dma_addr; -bool queued_to_csi; };/**
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +144 -115
371 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +17 -6
@@ -13,23 +13,34 @@struct sun6i_csi_device ; +#undef current +struct sun6i_csi_capture_state { +struct list_head queue; +spinlock_t lock;/* Queue and buffers lock. */ + +struct sun6i_csi_buffer *pending; +struct sun6i_csi_buffer *current; +struct sun6i_csi_buffer *complete; + +unsigned int sequence; +}; +struct sun6i_csi_capture { +struct sun6i_csi_capture_state state; +struct video_device video_dev;struct vb2_queue queue;struct mutex lock;/* Queue lock. */ struct media_pad pad; -struct list_head dma_queue; -spinlock_t dma_queue_lock;/* DMA queue lock. */ -struct v4l2_format format;u32 mbus_code; -unsigned int sequence; }; +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_CAPTURE_H__ */
Signature · 1 line
2.34.1
Re: [PATCH v2 32/66] media: sun6i-csi: Add capture state using vsync for page flip
Quoted 8 lines · Paul Kocialkowski
This introduces a new state structure and associated helpers for capture, which handles the buffer queue and state for each submitted buffer.
Besides from the code refactoring, this changes the page flip point to vsync instead of frame done, which allows working with only two buffers without losing frames. This is apparently a more appropriate thing to do with this controller.
Why? What issues were you seeing before, how does using a separate interrupt addresses it, and what makes you think it's more appropriate?
Maxime
Re: [PATCH v2 32/66] media: sun6i-csi: Add capture state using vsync for page flip
Hi,
Quoted 5 lines · Maxime Ripard
Quoted 4 lines · Paul Kocialkowski
This introduces a new state structure and associated helpers for capture, which handles the buffer queue and state for each submitted buffer.
Quoted 7 lines
Quoted 4 lines
Besides from the code refactoring, this changes the page flip point to vsync instead of frame done, which allows working with only two buffers without losing frames. This is apparently a more appropriate thing to do with this controller.
Why? What issues were you seeing before, how does using a separate interrupt addresses it, and what makes you think it's more appropriate?
I'll try to update the commit log to address this, thanks.
One of the main issues that the rework is trying to address is the way that double buffering is handled, which currently requires up to 3 buffers to work, due to how buffer configuration is implemented. In particular, it's synchronizing to the frame done interrupt which seems to hit after scanout of the next frame begins, so page flips are always delayed by one frame.
This is currently solved by setting two buffers when starting the stream:
the first one is set before vcap is enabled and seems to be sampled when the first frame scan begins and the second one is set after and stays until the second vsync hits, at which point it becomes the current active buffer. This way no frame is lost but 3 frames are needed to start.
This proposal changes the sync point to vsync which allows page flipping to happen for the next frame, thus only 2 buffers are required.
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 32/66] media: sun6i-csi: Add capture state using vsync for page flip
Quoted 25 lines · Paul Kocialkowski
Hi,
Quoted 5 lines · Maxime Ripard
Quoted 4 lines · Paul Kocialkowski
This introduces a new state structure and associated helpers for capture, which handles the buffer queue and state for each submitted buffer.
Quoted 7 lines
Quoted 4 lines
Besides from the code refactoring, this changes the page flip point to vsync instead of frame done, which allows working with only two buffers without losing frames. This is apparently a more appropriate thing to do with this controller.
Why? What issues were you seeing before, how does using a separate interrupt addresses it, and what makes you think it's more appropriate?
I'll try to update the commit log to address this, thanks.
One of the main issues that the rework is trying to address is the way that double buffering is handled, which currently requires up to 3 buffers to work, due to how buffer configuration is implemented. In particular, it's synchronizing to the frame done interrupt which seems to hit after scanout of the next frame begins, so page flips are always delayed by one frame.
Quoted 8 lines
This is currently solved by setting two buffers when starting the stream:
the first one is set before vcap is enabled and seems to be sampled when the first frame scan begins and the second one is set after and stays until the second vsync hits, at which point it becomes the current active buffer. This way no frame is lost but 3 frames are needed to start.This proposal changes the sync point to vsync which allows page flipping to happen for the next frame, thus only 2 buffers are required.
This should be in your commit log
Maxime
PATCH v2 33/66 media: sun6i-csi: Rework register definitions, invert misleading fields
In reply to Paul KocialkowskiThis cleans up the register definitions a bit, adds a prefix, remove masks. Registers are now fully defined, some additional fields were added when needed. New format definitions are added for future use.
Some fields are wrongly defined (inverted) in Allwinner litterature (e.g. field vs frame prefixes), which is quite misleading. They are now corrected to reflect their actual behavior.
This should only be a cosmetic commit. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 182 ++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 296 ++++++++++-------- 2 files changed, 266 insertions(+), 212 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +97 -85
@@ -155,7 +155,8 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)int ret;if (!enable) { -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,0 );pm_runtime_put (dev);return 0 ;
@@ -165,7 +166,8 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)if (ret <0 )return ret; -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,CSI_EN_CSI_EN ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , +SUN6I_CSI_EN_CSI_EN );return 0 ; }
@@ -334,7 +336,7 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)struct sun6i_csi_config *config = &csi_dev->config;unsigned char bus_width;u32 flags; -u32 cfg; +u32 cfg =0 ;bool input_interlaced = false; if (config->field == V4L2_FIELD_INTERLACED
@@ -344,52 +346,63 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev) bus_width = endpoint->bus.parallel.bus_width; -regmap_read (csi_dev->regmap,CSI_IF_CFG_REG , &cfg); - - cfg &= ~(CSI_IF_CFG_CSI_IF_MASK |CSI_IF_CFG_MIPI_IF_MASK | -CSI_IF_CFG_IF_DATA_WIDTH_MASK | -CSI_IF_CFG_CLK_POL_MASK |CSI_IF_CFG_VREF_POL_MASK | -CSI_IF_CFG_HREF_POL_MASK |CSI_IF_CFG_FIELD_MASK | -CSI_IF_CFG_SRC_TYPE_MASK ); -if (input_interlaced) - cfg |=CSI_IF_CFG_SRC_TYPE_INTERLACED ; + cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ;else - cfg |=CSI_IF_CFG_SRC_TYPE_PROGRESSED ; + cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ;switch (endpoint->bus_type) {case V4L2_MBUS_PARALLEL : - cfg |=CSI_IF_CFG_MIPI_IF_CSI ; + cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; flags = endpoint->bus.parallel.flags; - cfg |= (bus_width ==16 ) ?CSI_IF_CFG_CSI_IF_YUV422_16BIT : -CSI_IF_CFG_CSI_IF_YUV422_INTLV ; +if (bus_width ==16 ) + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; +else + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=CSI_IF_CFG_FIELD_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=CSI_IF_CFG_VREF_POL_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; +if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=CSI_IF_CFG_HREF_POL_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ; + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;case V4L2_MBUS_BT656 : - cfg |=CSI_IF_CFG_MIPI_IF_CSI ; + cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; flags = endpoint->bus.parallel.flags; - cfg |= (bus_width ==16 ) ?CSI_IF_CFG_CSI_IF_BT1120 : -CSI_IF_CFG_CSI_IF_BT656 ; +if (bus_width ==16 ) + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; +else + cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=CSI_IF_CFG_FIELD_POSITIVE ; + cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=CSI_IF_CFG_CLK_POL_FALLING_EDGE ; + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;default : dev_warn(csi_dev->dev, "Unsupported bus type: %d\n",
@@ -399,13 +412,13 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)switch (bus_width) {case 8 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_8BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ;break ;case 10 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_10BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ;break ;case 12 : - cfg |=CSI_IF_CFG_IF_DATA_WIDTH_12BIT ; + cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ;break ;case 16 :/* No need to configure DATA_WIDTH for 16bit */ break ;
@@ -414,42 +427,35 @@ static void sun6i_csi_setup_bus(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_IF_CFG_REG , cfg); +regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); }static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) {struct sun6i_csi_config *config = &csi_dev->config; -u32 cfg; +u32 cfg =0 ;u32 val; -regmap_read (csi_dev->regmap,CSI_CH_CFG_REG , &cfg); - - cfg &= ~(CSI_CH_CFG_INPUT_FMT_MASK | -CSI_CH_CFG_OUTPUT_FMT_MASK |CSI_CH_CFG_VFLIP_EN | -CSI_CH_CFG_HFLIP_EN |CSI_CH_CFG_FIELD_SEL_MASK | -CSI_CH_CFG_INPUT_SEQ_MASK ); - val =get_csi_input_format (csi_dev, config->code, config->pixelformat); - cfg |=CSI_CH_CFG_INPUT_FMT (val); + cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); val =get_csi_output_format (csi_dev, config->pixelformat, config->field); - cfg |=CSI_CH_CFG_OUTPUT_FMT (val); + cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); val =get_csi_input_seq (csi_dev, config->code, config->pixelformat); - cfg |=CSI_CH_CFG_INPUT_SEQ (val); + cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val);if (config->field ==V4L2_FIELD_TOP ) - cfg |=CSI_CH_CFG_FIELD_SEL_FIELD0 ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ;else if (config->field ==V4L2_FIELD_BOTTOM ) - cfg |=CSI_CH_CFG_FIELD_SEL_FIELD1 ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ;else - cfg |=CSI_CH_CFG_FIELD_SEL_BOTH ; + cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; -regmap_write (csi_dev->regmap,CSI_CH_CFG_REG , cfg); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); }static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev)
@@ -475,12 +481,12 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_CH_HSIZE_REG , -CSI_CH_HSIZE_HOR_LEN (hor_len) | -CSI_CH_HSIZE_HOR_START (0 )); -regmap_write (csi_dev->regmap,CSI_CH_VSIZE_REG , -CSI_CH_VSIZE_VER_LEN (height) | -CSI_CH_VSIZE_VER_START (0 )); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_HSIZE_REG , +SUN6I_CSI_CH_HSIZE_LEN (hor_len) | +SUN6I_CSI_CH_HSIZE_START (0 )); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_VSIZE_REG , +SUN6I_CSI_CH_VSIZE_LEN (height) | +SUN6I_CSI_CH_VSIZE_START (0 )); planar_offset[0 ] =0 ;switch (config->pixelformat) {
@@ -521,9 +527,9 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)break ; } -regmap_write (csi_dev->regmap,CSI_CH_BUF_LEN_REG , -CSI_CH_BUF_LEN_BUF_LEN_C (bytesperline_c) | -CSI_CH_BUF_LEN_BUF_LEN_Y (bytesperline_y)); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_BUF_LEN_REG , +SUN6I_CSI_CH_BUF_LEN_CHROMA_LINE (bytesperline_c) | +SUN6I_CSI_CH_BUF_LEN_LUMA_LINE (bytesperline_y)); } int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,
@@ -544,14 +550,16 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev,dma_addr_t addr) { -regmap_write (csi_dev->regmap,CSI_CH_F0_BUFA_REG , - (addr + csi_dev->planar_offset[0 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + csi_dev->planar_offset[0 ]));if (csi_dev->planar_offset[1 ] !=-1 ) -regmap_write (csi_dev->regmap,CSI_CH_F1_BUFA_REG , - (addr + csi_dev->planar_offset[1 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + + csi_dev->planar_offset[1 ]));if (csi_dev->planar_offset[2 ] !=-1 ) -regmap_write (csi_dev->regmap,CSI_CH_F2_BUFA_REG , - (addr + csi_dev->planar_offset[2 ]) >>2 ); +regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (addr + + csi_dev->planar_offset[2 ])); }void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable)
@@ -559,23 +567,25 @@ void sun6i_csi_set_stream(struct sun6i_csi_device *csi_dev, bool enable)struct regmap *regmap = csi_dev->regmap;if (!enable) { -regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON ,0 ); -regmap_write (regmap,CSI_CH_INT_EN_REG ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG , +SUN6I_CSI_CAP_VCAP_ON ,0 ); +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 );return ; } -regmap_write (regmap,CSI_CH_INT_STA_REG ,0xFF ); -regmap_write (regmap,CSI_CH_INT_EN_REG , -CSI_CH_INT_EN_VS_INT_EN | -CSI_CH_INT_EN_HB_OF_INT_EN | -CSI_CH_INT_EN_FIFO2_OF_INT_EN | -CSI_CH_INT_EN_FIFO1_OF_INT_EN | -CSI_CH_INT_EN_FIFO0_OF_INT_EN | -CSI_CH_INT_EN_FD_INT_EN | -CSI_CH_INT_EN_CD_INT_EN ); - -regmap_update_bits (regmap,CSI_CAP_REG ,CSI_CAP_CH0_VCAP_ON , -CSI_CAP_CH0_VCAP_ON ); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , +SUN6I_CSI_CH_INT_STA_CLEAR ); +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , +SUN6I_CSI_CH_INT_EN_VS | +SUN6I_CSI_CH_INT_EN_HB_OF | +SUN6I_CSI_CH_INT_EN_FIFO2_OF | +SUN6I_CSI_CH_INT_EN_FIFO1_OF | +SUN6I_CSI_CH_INT_EN_FIFO0_OF | +SUN6I_CSI_CH_INT_EN_FD | +SUN6I_CSI_CH_INT_EN_CD ); + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , +SUN6I_CSI_CAP_VCAP_ON ); }/* Media */
@@ -668,29 +678,31 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)struct regmap *regmap = csi_dev->regmap;u32 status; -regmap_read (regmap,CSI_CH_INT_STA_REG , &status); +regmap_read (regmap,SUN6I_CSI_CH_INT_STA_REG , &status);if (!(status &0xFF ))return IRQ_NONE ; -if ((status &CSI_CH_INT_STA_FIFO0_OF_PD ) || - (status &CSI_CH_INT_STA_FIFO1_OF_PD ) || - (status &CSI_CH_INT_STA_FIFO2_OF_PD ) || - (status &CSI_CH_INT_STA_HB_OF_PD )) { -regmap_write (regmap,CSI_CH_INT_STA_REG , status); -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN ,0 ); -regmap_update_bits (regmap,CSI_EN_REG ,CSI_EN_CSI_EN , -CSI_EN_CSI_EN ); +if ((status &SUN6I_CSI_CH_INT_STA_FIFO0_OF ) || + (status &SUN6I_CSI_CH_INT_STA_FIFO1_OF ) || + (status &SUN6I_CSI_CH_INT_STA_FIFO2_OF ) || + (status &SUN6I_CSI_CH_INT_STA_HB_OF )) { +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status); + +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG , +SUN6I_CSI_EN_CSI_EN ,SUN6I_CSI_EN_CSI_EN );return IRQ_HANDLED ; } -if (status &CSI_CH_INT_STA_FD_PD ) +if (status &SUN6I_CSI_CH_INT_STA_FD )sun6i_csi_capture_frame_done (csi_dev); -if (status &CSI_CH_INT_STA_VS_PD ) +if (status &SUN6I_CSI_CH_INT_STA_VS )sun6i_csi_capture_sync (csi_dev); -regmap_write (regmap,CSI_CH_INT_STA_REG , status); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +169 -127
302 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 33/66] media: sun6i-csi: Rework register definitions, invert misleading fields
Quoted 7 lines · Paul Kocialkowski
This cleans up the register definitions a bit, adds a prefix, remove masks. Registers are now fully defined, some additional fields were added when needed. New format definitions are added for future use.
Some fields are wrongly defined (inverted) in Allwinner litterature (e.g. field vs frame prefixes), which is quite misleading. They are now corrected to reflect their actual behavior.
How was it tested?
In particular, see
https://lore.kernel.org/all/[email protected]/
Maxime
Re: [PATCH v2 33/66] media: sun6i-csi: Rework register definitions, invert misleading fields
Hi,
Quoted 5 lines · Maxime Ripard
Quoted 4 lines · Paul Kocialkowski
This cleans up the register definitions a bit, adds a prefix, remove masks. Registers are now fully defined, some additional fields were added when needed. New format definitions are added for future use.
Quoted 8 lines
Quoted 3 lines
Some fields are wrongly defined (inverted) in Allwinner litterature (e.g. field vs frame prefixes), which is quite misleading. They are now corrected to reflect their actual behavior.
How was it tested?
In particular, see
https://lore.kernel.org/all/[email protected]/
No oscilloscope testing on my side to investigate the matter in depth, so the polarities inversion is based on what you changed in the driver.
The idea is to change the register definitions to match what the hardware appears to be doing (based on your good look at the oscilloscope) to avoid the confusion of setting register fields that look contradictory. It's just a rename and the behavior remains the same.
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
PATCH v2 34/66 media: sun6i-csi: Add dimensions and format helpers to capture
In reply to Paul KocialkowskiDefine and export useful helpers to access dimensions and pixel format.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 19 +++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 +++++ 2 files changed, 24 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +19 -0
@@ -25,6 +25,25 @@/* Helpers */ +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height) +{ +if (width) + *width = csi_dev->capture.format.fmt.pix.width; +if (height) + *height = csi_dev->capture.format.fmt.pix.height; +} + +void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev, +u32 *pixelformat,u32 *field) +{ +if (pixelformat) + *pixelformat = csi_dev->capture.format.fmt.pix.pixelformat; + +if (field) + *field = csi_dev->capture.format.fmt.pix.field; +} +static struct v4l2_subdev *sun6i_csi_capture_remote_subdev (struct sun6i_csi_capture *capture,u32 *pad) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -37,6 +37,11 @@ struct sun6i_csi_capture {u32 mbus_code; }; +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height); +void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev, +u32 *pixelformat,u32 *field); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.34.1
PATCH v2 35/66 media: sun6i-csi: Implement address configuration without indirection
In reply to Paul KocialkowskiInstead of calculating the planar_offset at one point and using it later in a dedicated function, reimplement address configuration with v4l2 format info in the buffer_configure function.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 27 ---------------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 10 ------ .../sunxi/sun6i-csi/sun6i_csi_capture.c | 32 ++++++++++++++++++- 3 files changed, 31 insertions(+), 38 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -27
@@ -463,7 +463,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)struct sun6i_csi_config *config = &csi_dev->config;u32 bytesperline_y;u32 bytesperline_c; -int *planar_offset = csi_dev->planar_offset;u32 width = config->width;u32 height = config->height;u32 hor_len = width;
@@ -488,7 +487,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)SUN6I_CSI_CH_VSIZE_LEN (height) | SUN6I_CSI_CH_VSIZE_START(0)); - planar_offset[0 ] =0 ;switch (config->pixelformat) {case V4L2_PIX_FMT_NV12_16L16 :case V4L2_PIX_FMT_NV12 :
@@ -497,23 +495,15 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev)case V4L2_PIX_FMT_NV61 : bytesperline_y = width; bytesperline_c = width; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] =-1 ;break ;case V4L2_PIX_FMT_YUV420 :case V4L2_PIX_FMT_YVU420 : bytesperline_y = width; bytesperline_c = width /2 ; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] = planar_offset[1 ] + - bytesperline_c * height /2 ;break ;case V4L2_PIX_FMT_YUV422P : bytesperline_y = width; bytesperline_c = width /2 ; - planar_offset[1 ] = bytesperline_y * height; - planar_offset[2 ] = planar_offset[1 ] + - bytesperline_c * height;break ;default :/* raw */ dev_dbg(csi_dev->dev,
@@ -522,8 +512,6 @@ static void sun6i_csi_set_window(struct sun6i_csi_device *csi_dev) bytesperline_y = (sun6i_csi_get_bpp (config->pixelformat) * config->width) /8 ; bytesperline_c =0 ; - planar_offset[1 ] =-1 ; - planar_offset[2 ] =-1 ;break ; }
@@ -547,21 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,return 0 ; } -void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, -dma_addr_t addr) -{ -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + csi_dev->planar_offset[0 ])); -if (csi_dev->planar_offset[1 ] !=-1 ) -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + - csi_dev->planar_offset[1 ])); -if (csi_dev->planar_offset[2 ] !=-1 ) -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , -SUN6I_CSI_ADDR_VALUE (addr + - csi_dev->planar_offset[2 ])); -} -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) {struct regmap *regmap = csi_dev->regmap;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -10
@@ -63,8 +63,6 @@ struct sun6i_csi_device {struct clk *clk_mod;struct clk *clk_ram;struct reset_control *reset; - -int planar_offset[3 ]; };/**
@@ -91,14 +89,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable);int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config); -/** -* sun6i_csi_update_buf_addr() - update the csi frame buffer address -* @csi: pointer to the csi -* @addr: frame buffer's physical address -*/ -void sun6i_csi_update_buf_addr (struct sun6i_csi_device *csi_dev, -dma_addr_t addr); -/** * sun6i_csi_set_stream() - start/stop csi streaming * @csi: pointer to the csi
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +31 -1
@@ -6,6 +6,7 @@*/ #include <linux/of.h> +#include <linux/regmap.h> #include <media/v4l2-device.h> #include <media/v4l2-event.h>
@@ -16,6 +17,7 @@#include "sun6i_csi.h" #include "sun6i_csi_capture.h" +#include "sun6i_csi_reg.h" /* This is got from BSP sources. */ #define MIN_WIDTH (32)
@@ -109,13 +111,41 @@ static void sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, struct sun6i_csi_buffer *csi_buffer) { + struct regmap *regmap = csi_dev->regmap; +const struct v4l2_format_info *info;struct vb2_buffer *vb2_buffer; +unsigned int width, height;dma_addr_t address; +u32 pixelformat; vb2_buffer = &csi_buffer->v4l2_buffer.vb2_buf; address =vb2_dma_contig_plane_dma_addr (vb2_buffer,0 ); -sun6i_csi_update_buf_addr (csi_dev, address); +regmap_write (regmap,SUN6I_CSI_CH_FIFO0_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + +sun6i_csi_capture_dimensions (csi_dev, &width, &height); +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); + + info =v4l2_format_info (pixelformat); +/* Unsupported formats are single-plane, so we can stop here. */ +if (!info) +return ; + +if (info->comp_planes >1 ) { + address += info->bpp[0 ] * width * height; + +regmap_write (regmap,SUN6I_CSI_CH_FIFO1_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + } + +if (info->comp_planes >2 ) { + address += info->bpp[1 ] *DIV_ROUND_UP (width, info->hdiv) * +DIV_ROUND_UP (height, info->vdiv); + +regmap_write (regmap,SUN6I_CSI_CH_FIFO2_ADDR_REG , +SUN6I_CSI_ADDR_VALUE (address)); + } }static void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev)
Signature · 1 line
2.34.1
PATCH v2 36/66 media: sun6i-csi: Split stream sequences and irq code in capture
In reply to Paul KocialkowskiCreate minimal helpers that split the enable/disable flow, which will make it easier to move control over to the bridge later on.
Generally speaking the goal is to move register configuration to the capture code and later split it with the bridge code.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 26 --------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 --- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 58 ++++++++++++++++++- 3 files changed, 55 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -26
@@ -535,32 +535,6 @@ int sun6i_csi_update_config(struct sun6i_csi_device *csi_dev,return 0 ; } -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable) -{ -struct regmap *regmap = csi_dev->regmap; - -if (!enable) { -regmap_update_bits (regmap,SUN6I_CSI_CAP_REG , -SUN6I_CSI_CAP_VCAP_ON ,0 ); -regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); -return ; - } - -regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , -SUN6I_CSI_CH_INT_STA_CLEAR ); -regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , -SUN6I_CSI_CH_INT_EN_VS | -SUN6I_CSI_CH_INT_EN_HB_OF | -SUN6I_CSI_CH_INT_EN_FIFO2_OF | -SUN6I_CSI_CH_INT_EN_FIFO1_OF | -SUN6I_CSI_CH_INT_EN_FIFO0_OF | -SUN6I_CSI_CH_INT_EN_FD | -SUN6I_CSI_CH_INT_EN_CD ); - -regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , -SUN6I_CSI_CAP_VCAP_ON ); -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -7
@@ -89,13 +89,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable);int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev,struct sun6i_csi_config *config); -/** -* sun6i_csi_set_stream() - start/stop csi streaming -* @csi: pointer to the csi -* @enable: start/stop -*/ -void sun6i_csi_set_stream (struct sun6i_csi_device *csi_dev,bool enable); -/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +55 -3
88 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 37/66 media: sun6i-csi: Move power management to runtime pm in capture
In reply to Paul KocialkowskiLet's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to v4l2_pipeline_pm_get.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 24 ----------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 ---- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 41 ++++++++++--------- 3 files changed, 22 insertions(+), 50 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -24
@@ -148,30 +148,6 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi_device *csi_dev,return false; } -int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable) -{ -struct device *dev = csi_dev->dev; -struct regmap *regmap = csi_dev->regmap; -int ret; - -if (!enable) { -regmap_update_bits (regmap,SUN6I_CSI_EN_REG , -SUN6I_CSI_EN_CSI_EN ,0 ); -pm_runtime_put (dev); - -return 0 ; - } - - ret =pm_runtime_resume_and_get (dev); -if (ret <0 ) -return ret; - -regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , -SUN6I_CSI_EN_CSI_EN ); - -return 0 ; -} -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev,u32 mbus_code,u32 pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -7
@@ -74,13 +74,6 @@ struct sun6i_csi_device {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/** -* sun6i_csi_set_power() - power on/off the csi -* @csi: pointer to the csi -* @enable: on/off -*/ -int sun6i_csi_set_power (struct sun6i_csi_device *csi_dev,bool enable); -/** * sun6i_csi_update_config() - update the csi register settings * @csi: pointer to the csi
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +22 -19
116 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm in capture
Hi Paul,
Quoted 6 lines · Paul Kocialkowski
Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to
v4l2_pipeline_pm_get.Signed-off-by Paul Kocialkowski <[email protected]>
Nice patch!
Do you still need v4l2_pipeline_pm_put()? Removing it would be a separate patch of course.
Signature · 3 lines
Kind regards, Sakari Ailus
Re: [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm in capture
Hi Sakari,
Quoted 11 lines · Sakari Ailus
Hi Paul,
Quoted 6 lines · Paul Kocialkowski
Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to
v4l2_pipeline_pm_get.Signed-off-by Paul Kocialkowski <[email protected]>Nice patch!
Thanks!
Quoted 2 lines
Do you still need
v4l2_pipeline_pm_put()? Removing it would be a separate patch of course.
My understanding is that this is still useful if there are drivers in the pipeline that rely on s_power instead of rpm (a typical case could be an old sensor driver). So that's why this is kept around, but all other components of the pipeline (isp/csi/mipi csi-2) are using rpm now.
Cheers,
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm in capture
Hi Paul,
Quoted 13 lines · Paul Kocialkowski
Quoted 9 lines · Sakari Ailus
Quoted 6 lines · Paul Kocialkowski
Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to
v4l2_pipeline_pm_get.Signed-off-by Paul Kocialkowski <[email protected]>Nice patch!
Thanks!
Quoted 7 lines
Quoted 2 lines
Do you still need
v4l2_pipeline_pm_put()? Removing it would be a separate patch of course.My understanding is that this is still useful if there are drivers in the pipeline that rely on
s_powerinstead of rpm (a typical case could be an old sensor driver). So that's why this is kept around, but all other components of the pipeline (isp/csi/mipi csi-2) are using rpm now.
If that's not the case on your test platforms, I think it would be better to drop support for this old API, and convert drivers that still use .s_power() if someone needs to use one on an Allwinner platform.
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm in capture
Hi Laurent,
Quoted 19 lines · Laurent Pinchart
Hi Paul,
Quoted 16 lines · Paul Kocialkowski
Quoted 9 lines · Sakari Ailus
Quoted 6 lines · Paul Kocialkowski
Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to
v4l2_pipeline_pm_get.Signed-off-by Paul Kocialkowski <[email protected]>Nice patch!
Thanks!
Quoted 2 lines
Do you still need
v4l2_pipeline_pm_put()? Removing it would be a separate patch of course.
Quoted 8 lines
Quoted 4 lines
My understanding is that this is still useful if there are drivers in the pipeline that rely on
s_powerinstead of rpm (a typical case could be an old sensor driver). So that's why this is kept around, but all other components of the pipeline (isp/csi/mipi csi-2) are using rpm now.If that's not the case on your test platforms, I think it would be better to drop support for this old API, and convert drivers that still use .s_power() if someone needs to use one on an Allwinner platform.
I agree this is the path to follow but it feels like we're not quite there yet and a bunch of driver were not converted at this point, including some popular ones like ov5640, which I know for sure is used with Allwinner devices.
Honestly I'd be happy to get rid of these legacy functions as soon as the transition is done, but doing it now would mean breaking a significant number of use cases (which I'm trying to avoid here despite all the changes).
I definitely wouldn't be confident making that transition here and it probably wouldn't be a good idea to make that a requirement to merge this (already quite big) series.
What do you think?
Paul
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Re: [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm in capture
Hi Paul,
Quoted 39 lines · Paul Kocialkowski
Hi Laurent,
Quoted 19 lines · Laurent Pinchart
Hi Paul,
Quoted 16 lines · Paul Kocialkowski
Quoted 9 lines · Sakari Ailus
Quoted 6 lines · Paul Kocialkowski
Let's just enable the module when we start using it (at stream on) and benefit from runtime pm instead of enabling it at first open.
Also reorder the call to
v4l2_pipeline_pm_get.Signed-off-by Paul Kocialkowski <[email protected]>Nice patch!
Thanks!
Quoted 2 lines
Do you still need
v4l2_pipeline_pm_put()? Removing it would be a separate patch of course.Quoted 8 lines
Quoted 4 lines
My understanding is that this is still useful if there are drivers in the pipeline that rely on
s_powerinstead of rpm (a typical case could be an old sensor driver). So that's why this is kept around, but all other components of the pipeline (isp/csi/mipi csi-2) are using rpm now.If that's not the case on your test platforms, I think it would be better to drop support for this old API, and convert drivers that still use .s_power() if someone needs to use one on an Allwinner platform.
I agree this is the path to follow but it feels like we're not quite there yet and a bunch of driver were not converted at this point, including some popular ones like ov5640, which I know for sure is used with Allwinner devices.
Honestly I'd be happy to get rid of these legacy functions as soon as the transition is done, but doing it now would mean breaking a significant number of use cases (which I'm trying to avoid here despite all the changes).
Quoted 5 lines
I definitely wouldn't be confident making that transition here and it probably wouldn't be a good idea to make that a requirement to merge this (already quite big) series.
What do you think?
Feel free to keep it if you prefer that.
All sensor drivers that implement s_power are old but there are quite a few of them. Converting them isn't trivial so best done by someone who has access to the hardware.
Signature · 3 lines
Regards, Sakari Ailus
PATCH v2 38/66 media: sun6i-csi: Move register configuration to capture
In reply to Paul KocialkowskiContinue moving things over to capture in tidy helpers. Also take the occasion to remove the config struct, which is unwelcome redundancy and use the capture helpers instead.
The code is only adapted to reflect the removal of the config structure. No functional change intended.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 363 ----------------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 25 -- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 364 +++++++++++++++++- 3 files changed, 356 insertions(+), 396 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -363
@@ -148,369 +148,6 @@ bool sun6i_csi_is_format_supported(struct sun6i_csi_device *csi_dev,return false; } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* non-YUV */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return CSI_INPUT_FORMAT_RAW ; - -switch (pixformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return CSI_INPUT_FORMAT_RAW ; -default : -break ; - } - -/* not support YUV420 input format yet */ -dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" ); -return CSI_INPUT_FORMAT_YUV422 ; -} - -static enum csi_output_fmt -get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, -u32 field) -{ -bool buf_interlaced = false; - -if (field ==V4L2_FIELD_INTERLACED - || field ==V4L2_FIELD_INTERLACED_TB - || field ==V4L2_FIELD_INTERLACED_BT ) - buf_interlaced = true; - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return buf_interlaced ?CSI_FRAME_RAW_10 :CSI_FIELD_RAW_10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -return buf_interlaced ?CSI_FRAME_RAW_12 :CSI_FIELD_RAW_12 ; - -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -case V4L2_PIX_FMT_NV12_16L16 : -return buf_interlaced ?CSI_FRAME_MB_YUV420 : -CSI_FIELD_MB_YUV420 ; -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV420 : -CSI_FIELD_UV_CB_YUV420 ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV420 : -CSI_FIELD_PLANAR_YUV420 ; -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV422 : -CSI_FIELD_UV_CB_YUV422 ; -case V4L2_PIX_FMT_YUV422P : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV422 : -CSI_FIELD_PLANAR_YUV422 ; - -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return buf_interlaced ?CSI_FRAME_RGB565 :CSI_FIELD_RGB565 ; - -case V4L2_PIX_FMT_JPEG : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return CSI_FIELD_RAW_8 ; -} - -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* Input sequence does not apply to non-YUV formats */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return 0 ; - -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YUYV ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YVYU ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YVU420 : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YVYU ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YUYV ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_YUYV : -return CSI_INPUT_SEQ_YUYV ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , - pixformat); -break ; - } - -return CSI_INPUT_SEQ_YUYV ; -} - -static void sun6i_csi_setup_bus (struct sun6i_csi_device *csi_dev) -{ -struct v4l2_fwnode_endpoint *endpoint = - &csi_dev->bridge.source->endpoint; -struct sun6i_csi_config *config = &csi_dev->config; -unsigned char bus_width; -u32 flags; -u32 cfg =0 ; -bool input_interlaced = false; - -if (config->field ==V4L2_FIELD_INTERLACED - || config->field ==V4L2_FIELD_INTERLACED_TB - || config->field ==V4L2_FIELD_INTERLACED_BT ) - input_interlaced = true; - - bus_width = endpoint->bus.parallel.bus_width; - -if (input_interlaced) - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | -SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | -SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; -else - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; - -switch (endpoint->bus_type) { -case V4L2_MBUS_PARALLEL : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; - -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; -else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; - -if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; - -if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; - -if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; - -if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; -else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; -break ; -case V4L2_MBUS_BT656 : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; - -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; -else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; - -if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; -else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; - -if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; -else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; -break ; -default : -dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , - endpoint->bus_type); -break ; - } - -switch (bus_width) { -case 8 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; -break ; -case 10 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; -break ; -case 12 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; -break ; -case 16 :/* No need to configure DATA_WIDTH for 16bit */ -break ; -default : -dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width); -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); -} - -static void sun6i_csi_set_format (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_config *config = &csi_dev->config; -u32 cfg =0 ; -u32 val; - - val =get_csi_input_format (csi_dev, config->code, - config->pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); - - val =get_csi_output_format (csi_dev, config->pixelformat, - config->field); - cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); - - val =get_csi_input_seq (csi_dev, config->code, - config->pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val); - -if (config->field ==V4L2_FIELD_TOP ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; -else if (config->field ==V4L2_FIELD_BOTTOM ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; -else - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); -} - -static void sun6i_csi_set_window (struct sun6i_csi_device *csi_dev) -{ -struct sun6i_csi_config *config = &csi_dev->config; -u32 bytesperline_y; -u32 bytesperline_c; -u32 width = config->width; -u32 height = config->height; -u32 hor_len = width; - -switch (config->pixelformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -dev_dbg (csi_dev->dev, -"Horizontal length should be 2 times of width for packed YUV formats!\n" ); - hor_len = width *2 ; -break ; -default : -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_HSIZE_REG , -SUN6I_CSI_CH_HSIZE_LEN (hor_len) | -SUN6I_CSI_CH_HSIZE_START (0 )); -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_VSIZE_REG , -SUN6I_CSI_CH_VSIZE_LEN (height) | -SUN6I_CSI_CH_VSIZE_START (0 )); - -switch (config->pixelformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : - bytesperline_y = width; - bytesperline_c = width; -break ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : - bytesperline_y = width; - bytesperline_c = width /2 ; -break ; -case V4L2_PIX_FMT_YUV422P : - bytesperline_y = width; - bytesperline_c = width /2 ; -break ; -default :/* raw */ -dev_dbg (csi_dev->dev, -"Calculating pixelformat(0x%x)'s bytesperline as a packed format\n" , - config->pixelformat); - bytesperline_y = (sun6i_csi_get_bpp (config->pixelformat) * - config->width) /8 ; - bytesperline_c =0 ; -break ; - } - -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_BUF_LEN_REG , -SUN6I_CSI_CH_BUF_LEN_CHROMA_LINE (bytesperline_c) | -SUN6I_CSI_CH_BUF_LEN_LUMA_LINE (bytesperline_y)); -} - -int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev, -struct sun6i_csi_config *config) -{ -if (!config) -return -EINVAL ; - -memcpy (&csi_dev->config, config,sizeof (csi_dev->config)); - -sun6i_csi_setup_bus (csi_dev); -sun6i_csi_set_format (csi_dev); -sun6i_csi_set_window (csi_dev); - -return 0 ; -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -25
@@ -28,22 +28,6 @@ struct sun6i_csi_buffer {struct list_head list; }; -/** -* struct sun6i_csi_config - configs for sun6i csi -* @pixelformat: v4l2 pixel format (V4L2_PIX_FMT_*) -* @code: media bus format code (MEDIA_BUS_FMT_*) -* @field: used interlacing type (enum v4l2_field) -* @width: frame width -* @height: frame height -*/ -struct sun6i_csi_config { -u32 pixelformat; -u32 code; -u32 field; -u32 width; -u32 height; -}; -struct sun6i_csi_v4l2 {struct v4l2_device v4l2_dev;struct v4l2_ctrl_handler ctrl_handler;
@@ -53,7 +37,6 @@ struct sun6i_csi_v4l2 {struct sun6i_csi_device {struct device *dev; -struct sun6i_csi_config config;struct sun6i_csi_v4l2 v4l2;struct sun6i_csi_bridge bridge;struct sun6i_csi_capture capture;
@@ -74,14 +57,6 @@ struct sun6i_csi_device {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/** -* sun6i_csi_update_config() - update the csi register settings -* @csi: pointer to the csi -* @config: see struct sun6i_csi_config -*/ -int sun6i_csi_update_config (struct sun6i_csi_device *csi_dev, -struct sun6i_csi_config *config); -/* get bpp form v4l2 pixformat */ static inline int sun6i_csi_get_bpp (unsigned int pixformat) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +356 -8
374 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 39/66 media: sun6i-csi: Rework capture format management with helper
In reply to Paul KocialkowskiRemove the need for local copies of the v4l2 format and add a common helper to prepare a format compatible with the driver, using the relevant v4l2 helper.
Also cleanup the size bound defines while at it.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 109 +++++++++--------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 + 2 files changed, 57 insertions(+), 57 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +52 -57
@@ -20,12 +20,6 @@#include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" -/* This is got from BSP sources. */ -#define MIN_WIDTH (32) -#define MIN_HEIGHT (32) -#define MAX_WIDTH (4800) -#define MAX_HEIGHT (4800) -/* Helpers */ void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
@@ -833,6 +827,46 @@ static const struct vb2_ops sun6i_csi_capture_queue_ops = {/* V4L2 Device */ +static void sun6i_csi_capture_format_prepare (struct v4l2_format *format) +{ +struct v4l2_pix_format *pix_format = &format->fmt.pix; +unsigned int width, height; + +v4l_bound_align_image (&pix_format->width,SUN6I_CSI_CAPTURE_WIDTH_MIN , +SUN6I_CSI_CAPTURE_WIDTH_MAX ,1 , + &pix_format->height,SUN6I_CSI_CAPTURE_HEIGHT_MIN , +SUN6I_CSI_CAPTURE_HEIGHT_MAX ,1 ,0 ); + +if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) + pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; + + width = pix_format->width; + height = pix_format->height; + +switch (pix_format->pixelformat) { +case V4L2_PIX_FMT_NV12_16L16 : + pix_format->bytesperline = width *12 /8 ; + pix_format->sizeimage = pix_format->bytesperline * height; +break ; +case V4L2_PIX_FMT_JPEG : + pix_format->bytesperline = width; + pix_format->sizeimage = pix_format->bytesperline * height; +break ; +default : +v4l2_fill_pixfmt (pix_format, pix_format->pixelformat, + width, height); +break ; + } + +if (pix_format->field ==V4L2_FIELD_ANY ) + pix_format->field =V4L2_FIELD_NONE ; + + pix_format->colorspace =V4L2_COLORSPACE_RAW ; + pix_format->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + pix_format->quantization =V4L2_QUANTIZATION_DEFAULT ; + pix_format->xfer_func =V4L2_XFER_FUNC_DEFAULT ; +} +static int sun6i_csi_capture_querycap (struct file *file,void *private,struct v4l2_capability *capability) {
@@ -864,50 +898,8 @@ static int sun6i_csi_capture_g_fmt(struct file *file, void *private, struct v4l2_format *format) {struct sun6i_csi_device *csi_dev =video_drvdata (file); -struct sun6i_csi_capture *capture = &csi_dev->capture; - *format = capture->format; - -return 0 ; -} - -static int sun6i_csi_capture_format_try (struct sun6i_csi_capture *capture, -struct v4l2_format *format) -{ -struct v4l2_pix_format *pix_format = &format->fmt.pix; -int bpp; - -if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; - -v4l_bound_align_image (&pix_format->width,MIN_WIDTH ,MAX_WIDTH ,1 , - &pix_format->height,MIN_HEIGHT ,MAX_WIDTH ,1 ,1 ); - - bpp =sun6i_csi_get_bpp (pix_format->pixelformat); - pix_format->bytesperline = (pix_format->width * bpp) >>3 ; - pix_format->sizeimage = pix_format->bytesperline * pix_format->height; - -if (pix_format->field ==V4L2_FIELD_ANY ) - pix_format->field =V4L2_FIELD_NONE ; - - pix_format->colorspace =V4L2_COLORSPACE_RAW ; - pix_format->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; - pix_format->quantization =V4L2_QUANTIZATION_DEFAULT ; - pix_format->xfer_func =V4L2_XFER_FUNC_DEFAULT ; - -return 0 ; -} - -static int sun6i_csi_capture_format_set (struct sun6i_csi_capture *capture, -struct v4l2_format *format) -{ -int ret; - - ret =sun6i_csi_capture_format_try (capture, format); -if (ret) -return ret; - - capture->format = *format; + *format = csi_dev->capture.format;return 0 ; }
@@ -921,16 +913,19 @@ static int sun6i_csi_capture_s_fmt(struct file *file, void *private,if (vb2_is_busy (&capture->queue))return -EBUSY ; -return sun6i_csi_capture_format_set (capture, format); +sun6i_csi_capture_format_prepare (format); + + csi_dev->capture.format = *format; + +return 0 ; }static int sun6i_csi_capture_try_fmt (struct file *file,void *private,struct v4l2_format *format) { -struct sun6i_csi_device *csi_dev =video_drvdata (file); -struct sun6i_csi_capture *capture = &csi_dev->capture; +sun6i_csi_capture_format_prepare (format); -return sun6i_csi_capture_format_try (capture, format); +return 0 ; } static int sun6i_csi_capture_enum_input(struct file *file, void *private,
@@ -1125,8 +1120,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)struct video_device *video_dev = &capture->video_dev;struct vb2_queue *queue = &capture->queue;struct media_pad *pad = &capture->pad; -struct v4l2_format format = {0 }; -struct v4l2_pix_format *pix_format = &format.fmt.pix; +struct v4l2_format *format = &csi_dev->capture.format; +struct v4l2_pix_format *pix_format = &format->fmt.pix;int ret;/* State */
@@ -1169,13 +1164,13 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Format */ - format.type = queue->type; + format->type = queue->type; pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; pix_format->width =1280 ; pix_format->height =720 ; pix_format->field =V4L2_FIELD_NONE ; -sun6i_csi_capture_format_set (capture, &format); +sun6i_csi_capture_format_prepare (format);/* Video Device */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -11,6 +11,11 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> +#define SUN6I_CSI_CAPTURE_WIDTH_MIN 32 +#define SUN6I_CSI_CAPTURE_WIDTH_MAX 4800 +#define SUN6I_CSI_CAPTURE_HEIGHT_MIN 32 +#define SUN6I_CSI_CAPTURE_HEIGHT_MAX 4800 +struct sun6i_csi_device ;#undef current
Signature · 1 line
2.34.1
PATCH v2 40/66 media: sun6i-csi: Remove custom format helper and rework configure
In reply to Paul KocialkowskiRemove the custom sun6i_csi_get_bpp helper in favor of common v4l2 infrastructure and rework the related window configuration code.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 49 ------------- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 70 +++++++++---------- 2 files changed, 35 insertions(+), 84 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -49
@@ -57,55 +57,6 @@ struct sun6i_csi_device {bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev,u32 pixformat,u32 mbus_code); -/* get bpp form v4l2 pixformat */ -static inline int sun6i_csi_get_bpp (unsigned int pixformat) -{ -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -case V4L2_PIX_FMT_JPEG : -return 8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return 10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return 12 ; -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV422P : -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return 16 ; -case V4L2_PIX_FMT_RGB24 : -case V4L2_PIX_FMT_BGR24 : -return 24 ; -case V4L2_PIX_FMT_RGB32 : -case V4L2_PIX_FMT_BGR32 : -return 32 ; -default : -WARN (1 ,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return 0 ; -} -int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev);#endif /* __SUN6I_CSI_H__ */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +35 -35
103 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 41/66 media: sun6i-csi: Add bridge dimensions and format helpers
In reply to Paul KocialkowskiIntroduce new helpers to ease getting information about the bridge.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 20 +++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 7 +++++++ 2 files changed, 27 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +20 -0
@@ -12,6 +12,26 @@#include "sun6i_csi.h" #include "sun6i_csi_bridge.h" +/* Helpers */ + +void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height) +{ +if (width) + *width = csi_dev->bridge.mbus_format.width; +if (height) + *height = csi_dev->bridge.mbus_format.height; +} + +void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, +u32 *mbus_code,u32 *field) +{ +if (mbus_code) + *mbus_code = csi_dev->bridge.mbus_format.code; +if (field) + *field = csi_dev->bridge.mbus_format.field; +} +/* Format */ static const u32 sun6i_csi_bridge_mbus_codes[] = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +7 -0
@@ -36,6 +36,13 @@ struct sun6i_csi_bridge {struct sun6i_csi_bridge_source *source; }; +/* Helpers */ + +void sun6i_csi_bridge_dimensions (struct sun6i_csi_device *csi_dev, +unsigned int *width,unsigned int *height); +void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev, +u32 *mbus_code,u32 *field); +/* Bridge */ int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.34.1
PATCH v2 42/66 media: sun6i-csi: Get mbus code from bridge instead of storing it
In reply to Paul KocialkowskiAnother instance of removing a duplicated variable and using common helpers instead.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 18 +++++------------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 - 2 files changed, 5 insertions(+), 14 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +5 -13
@@ -17,6 +17,7 @@#include <media/videobuf2-v4l2.h> #include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" #include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h"
@@ -455,20 +456,20 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) { -struct sun6i_csi_capture *capture = &csi_dev->capture; -u32 pixelformat, field; +u32 mbus_code, pixelformat, field;u32 cfg =0 ;u32 val;sun6i_csi_capture_format (csi_dev, &pixelformat, &field); +sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - val =get_csi_input_format (csi_dev, capture->mbus_code, pixelformat); + val =get_csi_input_format (csi_dev, mbus_code, pixelformat); cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); val =get_csi_output_format (csi_dev, pixelformat, field); cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); - val =get_csi_input_seq (csi_dev, capture->mbus_code, pixelformat); + val =get_csi_input_seq (csi_dev, mbus_code, pixelformat); cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val);if (field ==V4L2_FIELD_TOP )
@@ -739,11 +740,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; -if (capture->mbus_code ==0 ) { - ret = -EINVAL ; - goto error_media_pipeline; - } - subdev =sun6i_csi_capture_remote_subdev (capture,NULL );if (!subdev) { ret = -EINVAL ;
@@ -1067,8 +1063,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)struct v4l2_subdev_format source_fmt;int ret; - capture->mbus_code =0 ; -if (!media_entity_remote_pad (link->sink->entity->pads)) {dev_info (csi_dev->dev,"capture node %s pad not connected\n" , vdev->name);
@@ -1100,8 +1094,6 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)return -EPIPE ; } - capture->mbus_code = source_fmt.format.code; -return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +0 -1
@@ -39,7 +39,6 @@ struct sun6i_csi_capture {struct media_pad pad;struct v4l2_format format; -u32 mbus_code; }; void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
Signature · 1 line
2.34.1
PATCH v2 43/66 media: sun6i-csi: Tidy capture configure code
In reply to Paul KocialkowskiSome misc code cleanups and preparation for upcoming changes.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 105 ++++++++---------- 1 file changed, 46 insertions(+), 59 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +46 -59
@@ -353,133 +353,120 @@ static enum csi_input_seq get_csi_input_seq(struct sun6i_csi_device *csi_dev,static void sun6i_csi_capture_configure_interface (struct sun6i_csi_device *csi_dev) { +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap;struct v4l2_fwnode_endpoint *endpoint = &csi_dev->bridge.source->endpoint; +unsigned char bus_width = endpoint->bus.parallel.bus_width; +unsigned int flags = endpoint->bus.parallel.flags;u32 pixelformat, field; -unsigned char bus_width; -u32 flags; -u32 cfg =0 ; -bool input_interlaced = false; +u32 value =SUN6I_CSI_IF_CFG_IF_CSI ;sun6i_csi_capture_format (csi_dev, &pixelformat, &field);if (field ==V4L2_FIELD_INTERLACED || field ==V4L2_FIELD_INTERLACED_TB || field ==V4L2_FIELD_INTERLACED_BT ) - input_interlaced = true; - - bus_width = endpoint->bus.parallel.bus_width; - -if (input_interlaced) - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | -SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | -SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ;else - cfg |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ;switch (endpoint->bus_type) {case V4L2_MBUS_PARALLEL : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ;else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ;if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ;else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;case V4L2_MBUS_BT656 : - cfg |=SUN6I_CSI_IF_CFG_IF_CSI ; - - flags = endpoint->bus.parallel.flags; -if (bus_width ==16 ) - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ;else - cfg |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ;if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) - cfg |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ;else - cfg |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ;if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ;else - cfg |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ;break ;default : -dev_warn (csi_dev->dev,"Unsupported bus type: %d\n" , - endpoint->bus_type); +dev_warn (dev,"unsupported bus type: %d\n" , endpoint->bus_type);break ; }switch (bus_width) {case 8 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; +/* 16-bit YUV formats use a doubled width in 8-bit mode. */ +case 16 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ;break ;case 10 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ;break ;case 12 : - cfg |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; -break ; -case 16 :/* No need to configure DATA_WIDTH for 16bit */ + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ;break ;default : -dev_warn (csi_dev->dev,"Unsupported bus width: %u\n" , bus_width); +dev_warn (dev,"unsupported bus width: %u\n" , bus_width);break ; } -regmap_write (csi_dev->regmap,SUN6I_CSI_IF_CFG_REG , cfg); +regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); }static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) { +struct regmap *regmap = csi_dev->regmap;u32 mbus_code, pixelformat, field; -u32 cfg =0 ; -u32 val; +u8 input_format, input_yuv_seq, output_format; +u32 value =0 ;sun6i_csi_capture_format (csi_dev, &pixelformat, &field);sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - val =get_csi_input_format (csi_dev, mbus_code, pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_FMT (val); - - val =get_csi_output_format (csi_dev, pixelformat, field); - cfg |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (val); + input_format =get_csi_input_format (csi_dev, mbus_code, pixelformat); + input_yuv_seq =get_csi_input_seq (csi_dev, mbus_code, pixelformat); + output_format =get_csi_output_format (csi_dev, pixelformat, field); - val =get_csi_input_seq (csi_dev, mbus_code, pixelformat); - cfg |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (val); + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); + value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq);if (field ==V4L2_FIELD_TOP ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ;else if (field ==V4L2_FIELD_BOTTOM ) - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ;else - cfg |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; -regmap_write (csi_dev->regmap,SUN6I_CSI_CH_CFG_REG , cfg); +regmap_write (regmap,SUN6I_CSI_CH_CFG_REG , value); }static void sun6i_csi_capture_configure_window (struct sun6i_csi_device *csi_dev)
Signature · 1 line
2.34.1
PATCH v2 44/66 media: sun6i-csi: Introduce bridge format structure, list and helper
In reply to Paul KocialkowskiIntroduce a more informative format list for the bridge, with information about how to configure the input. This separation will later be useful when using the bridge standalone (without capture) for the isp workflow.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 169 ++++++++++++++---- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 12 ++ 2 files changed, 145 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +133 -36
@@ -11,6 +11,7 @@#include "sun6i_csi.h" #include "sun6i_csi_bridge.h" +#include "sun6i_csi_reg.h" /* Helpers */
@@ -34,47 +35,143 @@ void sun6i_csi_bridge_format(struct sun6i_csi_device *csi_dev,/* Format */ -static const u32 sun6i_csi_bridge_mbus_codes[] = { +static const struct sun6i_csi_bridge_format sun6i_csi_bridge_formats[] = {/* Bayer */ -MEDIA_BUS_FMT_SBGGR8_1X8 , -MEDIA_BUS_FMT_SGBRG8_1X8 , -MEDIA_BUS_FMT_SGRBG8_1X8 , -MEDIA_BUS_FMT_SRGGB8_1X8 , -MEDIA_BUS_FMT_SBGGR10_1X10 , -MEDIA_BUS_FMT_SGBRG10_1X10 , -MEDIA_BUS_FMT_SGRBG10_1X10 , -MEDIA_BUS_FMT_SRGGB10_1X10 , -MEDIA_BUS_FMT_SBGGR12_1X12 , -MEDIA_BUS_FMT_SGBRG12_1X12 , -MEDIA_BUS_FMT_SGRBG12_1X12 , -MEDIA_BUS_FMT_SRGGB12_1X12 , + { + .mbus_code =MEDIA_BUS_FMT_SBGGR8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB8_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SBGGR10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB10_1X10 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SBGGR12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGBRG12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SGRBG12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_SRGGB12_1X12 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + },/* RGB */ -MEDIA_BUS_FMT_RGB565_2X8_LE , -MEDIA_BUS_FMT_RGB565_2X8_BE , + { + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_LE , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, + { + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_BE , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + },/* YUV422 */ -MEDIA_BUS_FMT_YUYV8_2X8 , -MEDIA_BUS_FMT_UYVY8_2X8 , -MEDIA_BUS_FMT_YVYU8_2X8 , -MEDIA_BUS_FMT_UYVY8_2X8 , -MEDIA_BUS_FMT_VYUY8_2X8 , -MEDIA_BUS_FMT_YUYV8_1X16 , -MEDIA_BUS_FMT_UYVY8_1X16 , -MEDIA_BUS_FMT_YVYU8_1X16 , -MEDIA_BUS_FMT_UYVY8_1X16 , -MEDIA_BUS_FMT_VYUY8_1X16 , + { + .mbus_code =MEDIA_BUS_FMT_YUYV8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YVYU8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_VYUY8_2X8 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YUYV8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_YVYU8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_YVYU , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_YUYV , + }, + { + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + }, + { + .mbus_code =MEDIA_BUS_FMT_VYUY8_1X16 , + .input_format =SUN6I_CSI_INPUT_FMT_YUV422 , + .input_yuv_seq =SUN6I_CSI_INPUT_YUV_SEQ_VYUY , + .input_yuv_seq_invert =SUN6I_CSI_INPUT_YUV_SEQ_UYVY , + },/* Compressed */ -MEDIA_BUS_FMT_JPEG_1X8 , + { + .mbus_code =MEDIA_BUS_FMT_JPEG_1X8 , + .input_format =SUN6I_CSI_INPUT_FMT_RAW , + }, }; -static bool sun6i_csi_bridge_mbus_code_check (u32 mbus_code) +const struct sun6i_csi_bridge_format * +sun6i_csi_bridge_format_find (u32 mbus_code) {unsigned int i; -for (i =0 ; i <ARRAY_SIZE (sun6i_csi_bridge_mbus_codes); i++) -if (sun6i_csi_bridge_mbus_codes[i] == mbus_code) -return true; +for (i =0 ; i <ARRAY_SIZE (sun6i_csi_bridge_formats); i++) +if (sun6i_csi_bridge_formats[i].mbus_code == mbus_code) +return &sun6i_csi_bridge_formats[i]; -return false; +return NULL ; }/* V4L2 Subdev */
@@ -117,8 +214,8 @@ static const struct v4l2_subdev_video_ops sun6i_csi_bridge_video_ops = {static void sun6i_csi_bridge_mbus_format_prepare (struct v4l2_mbus_framefmt *mbus_format) { -if (!sun6i_csi_bridge_mbus_code_check (mbus_format->code)) - mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; +if (!sun6i_csi_bridge_format_find (mbus_format->code)) + mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; mbus_format->field =V4L2_FIELD_NONE ; mbus_format->colorspace =V4L2_COLORSPACE_RAW ;
@@ -133,7 +230,7 @@ static int sun6i_csi_bridge_init_cfg(struct v4l2_subdev *subdev,struct v4l2_mbus_framefmt *mbus_format =v4l2_subdev_get_try_format (subdev, state, pad); - mbus_format->code = sun6i_csi_bridge_mbus_codes[0 ]; + mbus_format->code = sun6i_csi_bridge_formats[0 ].mbus_code; mbus_format->width =1280 ; mbus_format->height =720 ;
@@ -147,10 +244,10 @@ sun6i_csi_bridge_enum_mbus_code(struct v4l2_subdev *subdev, struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code_enum) { -if (code_enum->index >=ARRAY_SIZE (sun6i_csi_bridge_mbus_codes)) +if (code_enum->index >=ARRAY_SIZE (sun6i_csi_bridge_formats))return -EINVAL ; - code_enum->code = sun6i_csi_bridge_mbus_codes[code_enum->index]; + code_enum->code = sun6i_csi_bridge_formats[code_enum->index].mbus_code;return 0 ; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +12 -0
@@ -20,6 +20,13 @@ enum sun6i_csi_bridge_pad {struct sun6i_csi_device ; +struct sun6i_csi_bridge_format { +u32 mbus_code; +u8 input_format; +u8 input_yuv_seq; +u8 input_yuv_seq_invert; +}; +struct sun6i_csi_bridge_source {struct v4l2_subdev *subdev;struct v4l2_fwnode_endpoint endpoint;
@@ -43,6 +50,11 @@ void sun6i_csi_bridge_dimensions(struct sun6i_csi_device *csi_dev,void sun6i_csi_bridge_format (struct sun6i_csi_device *csi_dev,u32 *mbus_code,u32 *field); +/* Format */ + +const struct sun6i_csi_bridge_format * +sun6i_csi_bridge_format_find (u32 mbus_code); +/* Bridge */ int sun6i_csi_bridge_setup (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.34.1
PATCH v2 45/66 media: sun6i-csi: Introduce capture format structure, list and helper
In reply to Paul KocialkowskiAdd a table that describes each pixel format and associated output register configuration with necessary tweaks. It will be used later on to configure the hardware.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 199 ++++++++++++++---- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 12 ++ 2 files changed, 175 insertions(+), 36 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +163 -36
@@ -60,45 +60,171 @@ sun6i_csi_capture_remote_subdev(struct sun6i_csi_capture *capture, u32 *pad)/* Format */ -static const u32 sun6i_csi_capture_formats[] = { -V4L2_PIX_FMT_SBGGR8 , -V4L2_PIX_FMT_SGBRG8 , -V4L2_PIX_FMT_SGRBG8 , -V4L2_PIX_FMT_SRGGB8 , -V4L2_PIX_FMT_SBGGR10 , -V4L2_PIX_FMT_SGBRG10 , -V4L2_PIX_FMT_SGRBG10 , -V4L2_PIX_FMT_SRGGB10 , -V4L2_PIX_FMT_SBGGR12 , -V4L2_PIX_FMT_SGBRG12 , -V4L2_PIX_FMT_SGRBG12 , -V4L2_PIX_FMT_SRGGB12 , -V4L2_PIX_FMT_YUYV , -V4L2_PIX_FMT_YVYU , -V4L2_PIX_FMT_UYVY , -V4L2_PIX_FMT_VYUY , -V4L2_PIX_FMT_NV12_16L16 , -V4L2_PIX_FMT_NV12 , -V4L2_PIX_FMT_NV21 , -V4L2_PIX_FMT_YUV420 , -V4L2_PIX_FMT_YVU420 , -V4L2_PIX_FMT_NV16 , -V4L2_PIX_FMT_NV61 , -V4L2_PIX_FMT_YUV422P , -V4L2_PIX_FMT_RGB565 , -V4L2_PIX_FMT_RGB565X , -V4L2_PIX_FMT_JPEG , +static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = { +/* Bayer */ + { + .pixelformat =V4L2_PIX_FMT_SBGGR8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB8 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB10 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_10 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_12 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_12 , + }, +/* RGB */ + { + .pixelformat =V4L2_PIX_FMT_RGB565 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RGB565 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RGB565 , + }, + { + .pixelformat =V4L2_PIX_FMT_RGB565X , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RGB565 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RGB565 , + }, +/* YUV422 */ + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + .input_format_raw = true, + .hsize_len_factor =2 , + }, + { + .pixelformat =V4L2_PIX_FMT_NV16 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422SP , + }, + { + .pixelformat =V4L2_PIX_FMT_NV61 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422SP , + .input_yuv_seq_invert = true, + }, + { + .pixelformat =V4L2_PIX_FMT_YUV422P , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV422P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV422P , + }, +/* YUV420 */ + { + .pixelformat =V4L2_PIX_FMT_NV12_16L16 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420MB , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420MB , + }, + { + .pixelformat =V4L2_PIX_FMT_NV12 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420SP , + }, + { + .pixelformat =V4L2_PIX_FMT_NV21 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420SP , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420SP , + .input_yuv_seq_invert = true, + }, + + { + .pixelformat =V4L2_PIX_FMT_YUV420 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420P , + }, + { + .pixelformat =V4L2_PIX_FMT_YVU420 , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_YUV420P , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_YUV420P , + .input_yuv_seq_invert = true, + }, +/* Compressed */ + { + .pixelformat =V4L2_PIX_FMT_JPEG , + .output_format_frame =SUN6I_CSI_OUTPUT_FMT_FRAME_RAW_8 , + .output_format_field =SUN6I_CSI_OUTPUT_FMT_FIELD_RAW_8 , + }, }; -static bool sun6i_csi_capture_format_check (u32 format) +const +struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat) {unsigned int i;for (i =0 ; i <ARRAY_SIZE (sun6i_csi_capture_formats); i++) -if (sun6i_csi_capture_formats[i] == format) -return true; +if (sun6i_csi_capture_formats[i].pixelformat == pixelformat) +return &sun6i_csi_capture_formats[i]; -return false; +return NULL ; }/* Capture */
@@ -820,8 +946,9 @@ static void sun6i_csi_capture_format_prepare(struct v4l2_format *format) &pix_format->height,SUN6I_CSI_CAPTURE_HEIGHT_MIN , SUN6I_CSI_CAPTURE_HEIGHT_MAX, 1, 0); -if (!sun6i_csi_capture_format_check (pix_format->pixelformat)) - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; +if (!sun6i_csi_capture_format_find (pix_format->pixelformat)) + pix_format->pixelformat = + sun6i_csi_capture_formats[0 ].pixelformat; width = pix_format->width; height = pix_format->height;
@@ -872,7 +999,7 @@ static int sun6i_csi_capture_enum_fmt(struct file *file, void *private,if (index >=ARRAY_SIZE (sun6i_csi_capture_formats))return -EINVAL ; - fmtdesc->pixelformat = sun6i_csi_capture_formats[index]; + fmtdesc->pixelformat = sun6i_csi_capture_formats[index].pixelformat;return 0 ; }
@@ -1144,7 +1271,7 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Format */ format->type = queue->type; - pix_format->pixelformat = sun6i_csi_capture_formats[0 ]; + pix_format->pixelformat = sun6i_csi_capture_formats[0 ].pixelformat; pix_format->width =1280 ; pix_format->height =720 ; pix_format->field =V4L2_FIELD_NONE ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +12 -0
@@ -18,6 +18,15 @@struct sun6i_csi_device ; +struct sun6i_csi_capture_format { +u32 pixelformat; +u8 output_format_field; +u8 output_format_frame; +bool input_yuv_seq_invert; +bool input_format_raw; +u32 hsize_len_factor; +}; +#undef currentstruct sun6i_csi_capture_state {struct list_head queue;
@@ -46,6 +55,9 @@ void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev,u32 *pixelformat,u32 *field); +const +struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.34.1
PATCH v2 46/66 media: sun6i-csi: Configure registers from format tables
In reply to Paul KocialkowskiSwitch over to using the static format table descriptions to configure registers. Rework the hardware configuration helpers to leverage information from the format structures and benefit from their logic. Remove the previous dedicated helpers.
The intention is to make the interaction between the different formats and the hardware side more visible and clear.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 210 +++--------------- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 55 ----- 2 files changed, 36 insertions(+), 229 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +36 -174
@@ -319,163 +319,6 @@ sun6i_csi_capture_buffer_configure(struct sun6i_csi_device *csi_dev, } } -static enum csi_input_fmt get_csi_input_format (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* non-YUV */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return CSI_INPUT_FORMAT_RAW ; - -switch (pixformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return CSI_INPUT_FORMAT_RAW ; -default : -break ; - } - -/* not support YUV420 input format yet */ -dev_dbg (csi_dev->dev,"Select YUV422 as default input format of CSI.\n" ); -return CSI_INPUT_FORMAT_YUV422 ; -} - -static enum csi_output_fmt -get_csi_output_format (struct sun6i_csi_device *csi_dev,u32 pixformat, -u32 field) -{ -bool buf_interlaced = false; - -if (field ==V4L2_FIELD_INTERLACED - || field ==V4L2_FIELD_INTERLACED_TB - || field ==V4L2_FIELD_INTERLACED_BT ) - buf_interlaced = true; - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; -case V4L2_PIX_FMT_SBGGR10 : -case V4L2_PIX_FMT_SGBRG10 : -case V4L2_PIX_FMT_SGRBG10 : -case V4L2_PIX_FMT_SRGGB10 : -return buf_interlaced ?CSI_FRAME_RAW_10 :CSI_FIELD_RAW_10 ; -case V4L2_PIX_FMT_SBGGR12 : -case V4L2_PIX_FMT_SGBRG12 : -case V4L2_PIX_FMT_SGRBG12 : -case V4L2_PIX_FMT_SRGGB12 : -return buf_interlaced ?CSI_FRAME_RAW_12 :CSI_FIELD_RAW_12 ; - -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -case V4L2_PIX_FMT_NV12_16L16 : -return buf_interlaced ?CSI_FRAME_MB_YUV420 : -CSI_FIELD_MB_YUV420 ; -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV420 : -CSI_FIELD_UV_CB_YUV420 ; -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV420 : -CSI_FIELD_PLANAR_YUV420 ; -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -return buf_interlaced ?CSI_FRAME_UV_CB_YUV422 : -CSI_FIELD_UV_CB_YUV422 ; -case V4L2_PIX_FMT_YUV422P : -return buf_interlaced ?CSI_FRAME_PLANAR_YUV422 : -CSI_FIELD_PLANAR_YUV422 ; - -case V4L2_PIX_FMT_RGB565 : -case V4L2_PIX_FMT_RGB565X : -return buf_interlaced ?CSI_FRAME_RGB565 :CSI_FIELD_RGB565 ; - -case V4L2_PIX_FMT_JPEG : -return buf_interlaced ?CSI_FRAME_RAW_8 :CSI_FIELD_RAW_8 ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , pixformat); -break ; - } - -return CSI_FIELD_RAW_8 ; -} - -static enum csi_input_seq get_csi_input_seq (struct sun6i_csi_device *csi_dev, -u32 mbus_code,u32 pixformat) -{ -/* Input sequence does not apply to non-YUV formats */ -if ((mbus_code &0xF000 ) !=0x2000 ) -return 0 ; - -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YUYV ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YVYU ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YVU420 : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -return CSI_INPUT_SEQ_VYUY ; -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -return CSI_INPUT_SEQ_UYVY ; -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -return CSI_INPUT_SEQ_YVYU ; -case MEDIA_BUS_FMT_YVYU8_1X16 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return CSI_INPUT_SEQ_YUYV ; -default : -dev_warn (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_YUYV : -return CSI_INPUT_SEQ_YUYV ; - -default : -dev_warn (csi_dev->dev,"Unsupported pixformat: 0x%x, defaulting to YUYV\n" , - pixformat); -break ; - } - -return CSI_INPUT_SEQ_YUYV ; -} -static void sun6i_csi_capture_configure_interface (struct sun6i_csi_device *csi_dev) {
@@ -570,6 +413,8 @@ sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_format (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_bridge_format *bridge_format; +const struct sun6i_csi_capture_format *capture_format;u32 mbus_code, pixelformat, field;u8 input_format, input_yuv_seq, output_format;u32 value =0 ;
@@ -577,9 +422,29 @@ static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev)sun6i_csi_capture_format (csi_dev, &pixelformat, &field);sun6i_csi_bridge_format (csi_dev, &mbus_code,NULL ); - input_format =get_csi_input_format (csi_dev, mbus_code, pixelformat); - input_yuv_seq =get_csi_input_seq (csi_dev, mbus_code, pixelformat); - output_format =get_csi_output_format (csi_dev, pixelformat, field); + bridge_format =sun6i_csi_bridge_format_find (mbus_code); +if (WARN_ON (!bridge_format)) +return ; + + input_format = bridge_format->input_format; + input_yuv_seq = bridge_format->input_yuv_seq; + + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; + +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; + +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format);
@@ -598,6 +463,7 @@ static void sun6i_csi_capture_configure_format(struct sun6i_csi_device *csi_dev)static void sun6i_csi_capture_configure_window (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_capture_format *format;const struct v4l2_format_info *info;u32 hsize_len, vsize_len;u32 luma_line, chroma_line =0 ;
@@ -607,23 +473,19 @@ static void sun6i_csi_capture_configure_window(struct sun6i_csi_device *csi_dev)sun6i_csi_capture_dimensions (csi_dev, &width, &height);sun6i_csi_capture_format (csi_dev, &pixelformat, &field); + format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!format)) +return ; + hsize_len = width; vsize_len = height; -switch (pixelformat) { -case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_YVYU : -case V4L2_PIX_FMT_UYVY : -case V4L2_PIX_FMT_VYUY : -/* -* Horizontal length should be 2 times of width for packed -* YUV formats. -*/ - hsize_len *=2 ; -break ; -default : -break ; - } +/* +* When using 8-bit raw input/output (for packed YUV), we need to adapt +* the width to account for the difference in bpp when it's not 8-bit. +*/ +if (format->hsize_len_factor) + hsize_len *= format->hsize_len_factor; regmap_write(regmap, SUN6I_CSI_CH_HSIZE_REG, SUN6I_CSI_CH_HSIZE_LEN(hsize_len) |
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +0 -55
59 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 47/66 media: sun6i-csi: Introduce format match structure, list and helper
In reply to Paul KocialkowskiIntroduce a list of mbus/pixel format combinations that need an exact match between the two sides. This is the case when using raw input configuration. The list will be used to replace the sun6i_csi_is_format_supported combinatory helper.
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 117 ++++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.h | 5 + 2 files changed, 122 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +117 -0
@@ -227,6 +227,123 @@ struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 pixelformat)return NULL ; } +/* RAW formats need an exact match between pixel and mbus formats. */ +static const +struct sun6i_csi_capture_format_match sun6i_csi_capture_format_matches[] = { +/* YUV420 */ + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .mbus_code =MEDIA_BUS_FMT_YUYV8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_YUYV , + .mbus_code =MEDIA_BUS_FMT_YUYV8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .mbus_code =MEDIA_BUS_FMT_YVYU8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_YVYU , + .mbus_code =MEDIA_BUS_FMT_YVYU8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .mbus_code =MEDIA_BUS_FMT_UYVY8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_UYVY , + .mbus_code =MEDIA_BUS_FMT_UYVY8_1X16 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .mbus_code =MEDIA_BUS_FMT_VYUY8_2X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_VYUY , + .mbus_code =MEDIA_BUS_FMT_VYUY8_1X16 , + }, +/* RGB */ + { + .pixelformat =V4L2_PIX_FMT_RGB565 , + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_LE , + }, + { + .pixelformat =V4L2_PIX_FMT_RGB565X , + .mbus_code =MEDIA_BUS_FMT_RGB565_2X8_BE , + }, +/* Bayer */ + { + .pixelformat =V4L2_PIX_FMT_SBGGR8 , + .mbus_code =MEDIA_BUS_FMT_SBGGR8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG8 , + .mbus_code =MEDIA_BUS_FMT_SGBRG8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG8 , + .mbus_code =MEDIA_BUS_FMT_SGRBG8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB8 , + .mbus_code =MEDIA_BUS_FMT_SRGGB8_1X8 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR10 , + .mbus_code =MEDIA_BUS_FMT_SBGGR10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG10 , + .mbus_code =MEDIA_BUS_FMT_SGBRG10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG10 , + .mbus_code =MEDIA_BUS_FMT_SGRBG10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB10 , + .mbus_code =MEDIA_BUS_FMT_SRGGB10_1X10 , + }, + { + .pixelformat =V4L2_PIX_FMT_SBGGR12 , + .mbus_code =MEDIA_BUS_FMT_SBGGR12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGBRG12 , + .mbus_code =MEDIA_BUS_FMT_SGBRG12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SGRBG12 , + .mbus_code =MEDIA_BUS_FMT_SGRBG12_1X12 , + }, + { + .pixelformat =V4L2_PIX_FMT_SRGGB12 , + .mbus_code =MEDIA_BUS_FMT_SRGGB12_1X12 , + }, +/* Compressed */ + { + .pixelformat =V4L2_PIX_FMT_JPEG , + .mbus_code =MEDIA_BUS_FMT_JPEG_1X8 , + }, +}; + +static bool sun6i_csi_capture_format_match (u32 pixelformat,u32 mbus_code) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (sun6i_csi_capture_format_matches); i++) { +const struct sun6i_csi_capture_format_match *match = + &sun6i_csi_capture_format_matches[i]; + +if (match->pixelformat == pixelformat && + match->mbus_code == mbus_code) +return true; + } + +return false; +} +/* Capture */ static void sun6i_csi_capture_irq_enable (struct sun6i_csi_device *csi_dev)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +5 -0
@@ -27,6 +27,11 @@ struct sun6i_csi_capture_format {u32 hsize_len_factor; }; +struct sun6i_csi_capture_format_match { +u32 pixelformat; +u32 mbus_code; +}; +#undef currentstruct sun6i_csi_capture_state {struct list_head queue;
Signature · 1 line
2.34.1
PATCH v2 48/66 media: sun6i-csi: Implement capture link validation with logic
In reply to Paul KocialkowskiRework the capture link validate implementation with actual logic that reflects the possibilities of the device instead of the combinatory helper functions, using the match list when needed.
Remove the previous dedicated helper.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 120 ------------------ .../platform/sunxi/sun6i-csi/sun6i_csi.h | 9 -- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 106 +++++++++------- 3 files changed, 62 insertions(+), 173 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -120
@@ -28,126 +28,6 @@#include "sun6i_csi.h" #include "sun6i_csi_reg.h" -/* Helpers */ - -/* TODO add 10&12 bit YUV, RGB support */ -bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, -u32 pixformat,u32 mbus_code) -{ -struct v4l2_fwnode_endpoint *endpoint = - &csi_dev->bridge.source->endpoint; - -/* -* Some video receivers have the ability to be compatible with -* 8bit and 16bit bus width. -* Identify the media bus format from device tree. -*/ -if ((endpoint->bus_type ==V4L2_MBUS_PARALLEL - || endpoint->bus_type ==V4L2_MBUS_BT656 ) - && endpoint->bus.parallel.bus_width ==16 ) { -switch (pixformat) { -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_1X16 : -case MEDIA_BUS_FMT_VYUY8_1X16 : -case MEDIA_BUS_FMT_YUYV8_1X16 : -case MEDIA_BUS_FMT_YVYU8_1X16 : -return true; -default : -dev_dbg (csi_dev->dev, -"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; -default : -dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , - pixformat); -break ; - } -return false; - } - -switch (pixformat) { -case V4L2_PIX_FMT_SBGGR8 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR8_1X8 ); -case V4L2_PIX_FMT_SGBRG8 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG8_1X8 ); -case V4L2_PIX_FMT_SGRBG8 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG8_1X8 ); -case V4L2_PIX_FMT_SRGGB8 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB8_1X8 ); -case V4L2_PIX_FMT_SBGGR10 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR10_1X10 ); -case V4L2_PIX_FMT_SGBRG10 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG10_1X10 ); -case V4L2_PIX_FMT_SGRBG10 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG10_1X10 ); -case V4L2_PIX_FMT_SRGGB10 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB10_1X10 ); -case V4L2_PIX_FMT_SBGGR12 : -return (mbus_code ==MEDIA_BUS_FMT_SBGGR12_1X12 ); -case V4L2_PIX_FMT_SGBRG12 : -return (mbus_code ==MEDIA_BUS_FMT_SGBRG12_1X12 ); -case V4L2_PIX_FMT_SGRBG12 : -return (mbus_code ==MEDIA_BUS_FMT_SGRBG12_1X12 ); -case V4L2_PIX_FMT_SRGGB12 : -return (mbus_code ==MEDIA_BUS_FMT_SRGGB12_1X12 ); - -case V4L2_PIX_FMT_YUYV : -return (mbus_code ==MEDIA_BUS_FMT_YUYV8_2X8 ); -case V4L2_PIX_FMT_YVYU : -return (mbus_code ==MEDIA_BUS_FMT_YVYU8_2X8 ); -case V4L2_PIX_FMT_UYVY : -return (mbus_code ==MEDIA_BUS_FMT_UYVY8_2X8 ); -case V4L2_PIX_FMT_VYUY : -return (mbus_code ==MEDIA_BUS_FMT_VYUY8_2X8 ); - -case V4L2_PIX_FMT_NV12_16L16 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_YVU420 : -case V4L2_PIX_FMT_YUV422P : -switch (mbus_code) { -case MEDIA_BUS_FMT_UYVY8_2X8 : -case MEDIA_BUS_FMT_VYUY8_2X8 : -case MEDIA_BUS_FMT_YUYV8_2X8 : -case MEDIA_BUS_FMT_YVYU8_2X8 : -return true; -default : -dev_dbg (csi_dev->dev,"Unsupported mbus code: 0x%x\n" , - mbus_code); -break ; - } -break ; - -case V4L2_PIX_FMT_RGB565 : -return (mbus_code ==MEDIA_BUS_FMT_RGB565_2X8_LE ); -case V4L2_PIX_FMT_RGB565X : -return (mbus_code ==MEDIA_BUS_FMT_RGB565_2X8_BE ); - -case V4L2_PIX_FMT_JPEG : -return (mbus_code ==MEDIA_BUS_FMT_JPEG_1X8 ); - -default : -dev_dbg (csi_dev->dev,"Unsupported pixformat: 0x%x\n" , - pixformat); -break ; - } - -return false; -} -/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -9
@@ -48,15 +48,6 @@ struct sun6i_csi_device { struct reset_control *reset; }; -/** -* sun6i_csi_is_format_supported() - check if the format supported by csi -* @csi: pointer to the csi -* @pixformat: v4l2 pixel format (V4L2_PIX_FMT_*) -* @mbus_code: media bus format code (MEDIA_BUS_FMT_*) -*/ -bool sun6i_csi_is_format_supported (struct sun6i_csi_device *csi_dev, -u32 pixformat,u32 mbus_code); -int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev);#endif /* __SUN6I_CSI_H__ */
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +62 -44
125 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 49/66 media: sun6i-csi: Get bridge subdev directly in capture stream ops
In reply to Paul KocialkowskiThe remote subdev connected to the capture video device is always our bridge, so get the bridge subdev directly instead of using a dedicated helper (which is removed by this commit).
--- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +3 -27
@@ -42,22 +42,6 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, *field = csi_dev->capture.format.fmt.pix.field; } -static struct v4l2_subdev * -sun6i_csi_capture_remote_subdev (struct sun6i_csi_capture *capture,u32 *pad) -{ -struct media_pad *remote; - - remote =media_entity_remote_pad (&capture->pad); - -if (!remote || !is_media_entity_v4l2_subdev (remote->entity)) -return NULL ; - -if (pad) - *pad = remote->index; - -return media_entity_to_v4l2_subdev (remote->entity); -} -/* Format */ static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = {
@@ -822,8 +806,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,struct sun6i_csi_capture *capture = &csi_dev->capture;struct sun6i_csi_capture_state *state = &capture->state;struct video_device *video_dev = &capture->video_dev; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;struct device *dev = csi_dev->dev; -struct v4l2_subdev *subdev;int ret; state->sequence =0 ;
@@ -832,12 +816,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; - subdev =sun6i_csi_capture_remote_subdev (capture,NULL ); -if (!subdev) { - ret = -EINVAL ; - goto error_media_pipeline; - } -/* PM */ ret =pm_runtime_resume_and_get (dev);
@@ -886,12 +864,10 @@ static void sun6i_csi_capture_stop_streaming(struct vb2_queue *queue) {struct sun6i_csi_device *csi_dev =vb2_get_drv_priv (queue);struct sun6i_csi_capture *capture = &csi_dev->capture; +struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;struct device *dev = csi_dev->dev; -struct v4l2_subdev *subdev; - subdev =sun6i_csi_capture_remote_subdev (capture,NULL ); -if (subdev) -v4l2_subdev_call (subdev, video, s_stream,0 ); +v4l2_subdev_call (subdev, video, s_stream,0 );sun6i_csi_capture_disable (csi_dev);sun6i_csi_capture_irq_disable (csi_dev);
Signature · 1 line
2.34.1
PATCH v2 50/66 media: sun6i-csi: Move hardware control to the bridge
In reply to Paul KocialkowskiIn order to support the isp workflow, we need to be able to configure the hardware from the bridge when the capture device is not used.
As a result, move all hardware configuration calls from capture to the bridge. Only the window configuration part (which is specific to using capture) remains there.
This effectively opens the way for hooking the bridge to the isp in the future.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 229 ++++++++++++++++ .../sunxi/sun6i-csi/sun6i_csi_capture.c | 249 +----------------- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 3 + 3 files changed, 239 insertions(+), 242 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +229 -0
@@ -174,11 +174,211 @@ sun6i_csi_bridge_format_find(u32 mbus_code)return NULL ; } +/* Bridge */ + +static void sun6i_csi_bridge_irq_enable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG , +SUN6I_CSI_CH_INT_EN_VS | +SUN6I_CSI_CH_INT_EN_HB_OF | +SUN6I_CSI_CH_INT_EN_FIFO2_OF | +SUN6I_CSI_CH_INT_EN_FIFO1_OF | +SUN6I_CSI_CH_INT_EN_FIFO0_OF | +SUN6I_CSI_CH_INT_EN_FD | +SUN6I_CSI_CH_INT_EN_CD ); +} + +static void sun6i_csi_bridge_irq_disable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); +} + +static void sun6i_csi_bridge_irq_clear (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_write (regmap,SUN6I_CSI_CH_INT_EN_REG ,0 ); +regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , +SUN6I_CSI_CH_INT_STA_CLEAR ); +} + +static void sun6i_csi_bridge_enable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN , +SUN6I_CSI_EN_CSI_EN ); + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON , +SUN6I_CSI_CAP_VCAP_ON ); +} + +static void sun6i_csi_bridge_disable (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; + +regmap_update_bits (regmap,SUN6I_CSI_CAP_REG ,SUN6I_CSI_CAP_VCAP_ON ,0 ); +regmap_update_bits (regmap,SUN6I_CSI_EN_REG ,SUN6I_CSI_EN_CSI_EN ,0 ); +} + +static void +sun6i_csi_bridge_configure_interface (struct sun6i_csi_device *csi_dev) +{ +struct device *dev = csi_dev->dev; +struct regmap *regmap = csi_dev->regmap; +struct v4l2_fwnode_endpoint *endpoint = + &csi_dev->bridge.source->endpoint; +unsigned char bus_width = endpoint->bus.parallel.bus_width; +unsigned int flags = endpoint->bus.parallel.flags; +u32 field; +u32 value =SUN6I_CSI_IF_CFG_IF_CSI ; + +sun6i_csi_bridge_format (csi_dev,NULL , &field); + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED | +SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT (1 ) | +SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC ; +else + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; + +switch (endpoint->bus_type) { +case V4L2_MBUS_PARALLEL : +if (bus_width ==16 ) + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED ; +else + value |=SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW ; + +if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + +if (flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ) + value |=SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE ; + +if (flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ) + value |=SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE ; + +if (flags &V4L2_MBUS_PCLK_SAMPLE_RISING ) + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; +break ; +case V4L2_MBUS_BT656 : +if (bus_width ==16 ) + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT1120 ; +else + value |=SUN6I_CSI_IF_CFG_IF_CSI_BT656 ; + +if (flags &V4L2_MBUS_FIELD_EVEN_LOW ) + value |=SUN6I_CSI_IF_CFG_FIELD_NEGATIVE ; +else + value |=SUN6I_CSI_IF_CFG_FIELD_POSITIVE ; + +if (flags &V4L2_MBUS_PCLK_SAMPLE_FALLING ) + value |=SUN6I_CSI_IF_CFG_CLK_POL_RISING ; +else + value |=SUN6I_CSI_IF_CFG_CLK_POL_FALLING ; +break ; +default : +dev_warn (dev,"unsupported bus type: %d\n" , endpoint->bus_type); +break ; + } + +switch (bus_width) { +case 8 : +/* 16-bit YUV formats use a doubled width in 8-bit mode. */ +case 16 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_8 ; +break ; +case 10 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_10 ; +break ; +case 12 : + value |=SUN6I_CSI_IF_CFG_DATA_WIDTH_12 ; +break ; +default : +dev_warn (dev,"unsupported bus width: %u\n" , bus_width); +break ; + } + +regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); +} + +static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; +const struct sun6i_csi_bridge_format *bridge_format; +const struct sun6i_csi_capture_format *capture_format; +u32 mbus_code, field, pixelformat; +u8 input_format, input_yuv_seq, output_format; +u32 value =0 ; + +sun6i_csi_bridge_format (csi_dev, &mbus_code, &field); + + bridge_format =sun6i_csi_bridge_format_find (mbus_code); +if (WARN_ON (!bridge_format)) +return ; + + input_format = bridge_format->input_format; + input_yuv_seq = bridge_format->input_yuv_seq; + +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); + + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; + +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; + +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; + + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); + value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq); + +if (field ==V4L2_FIELD_TOP ) + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0 ; +else if (field ==V4L2_FIELD_BOTTOM ) + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1 ; +else + value |=SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER ; + +regmap_write (regmap,SUN6I_CSI_CH_CFG_REG , value); +} + +static void sun6i_csi_bridge_configure (struct sun6i_csi_device *csi_dev) +{ +sun6i_csi_bridge_configure_interface (csi_dev); +sun6i_csi_bridge_configure_format (csi_dev); +} +/* V4L2 Subdev */ static int sun6i_csi_bridge_s_stream (struct v4l2_subdev *subdev,int on) {struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +struct device *dev = csi_dev->dev;struct v4l2_subdev *source_subdev;/* Initialize to 0 to use both in disable label (ret != 0) and off. */ int ret =0 ;
@@ -195,6 +395,30 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on) goto disable; } +/* PM */ + + ret =pm_runtime_resume_and_get (dev); +if (ret <0 ) +return ret; + +/* Clear */ + +sun6i_csi_bridge_irq_clear (csi_dev); + +/* Configure */ + +sun6i_csi_bridge_configure (csi_dev); +sun6i_csi_capture_configure (csi_dev); + +/* State Update */ + +sun6i_csi_capture_state_update (csi_dev); + +/* Enable */ + +sun6i_csi_bridge_irq_enable (csi_dev); +sun6i_csi_bridge_enable (csi_dev); + ret =v4l2_subdev_call (source_subdev, video, s_stream,1 );if (ret && ret != -ENOIOCTLCMD ) goto disable;
@@ -202,8 +426,13 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)return 0 ; disable: +sun6i_csi_bridge_irq_disable (csi_dev); +sun6i_csi_bridge_disable (csi_dev); + csi_dev->bridge.source =NULL ; +pm_runtime_put (dev); +return ret; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +7 -242
307 lines not on this page · raw message
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +3 -0
@@ -63,6 +63,9 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev,const struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_state_update (struct sun6i_csi_device *csi_dev); +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev);
Signature · 1 line
2.34.1
PATCH v2 51/66 media: sun6i-csi: Unset bridge source on capture streamon fail
In reply to Paul KocialkowskiIn cases where the media pipeline start fails but our bridge has already registered a source, the source remains set and the bridge code is not called.
Clean it in capture streamon error handler to avoid the issue.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +2 -0
@@ -628,6 +628,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, error_state:sun6i_csi_capture_state_cleanup (csi_dev, false); + csi_dev->bridge.source =NULL ; +return ret; }
Signature · 1 line
2.34.1
PATCH v2 52/66 media: sun6i-csi: Rename the capture video device to sun6i-csi-capture
In reply to Paul KocialkowskiNow that the driver is properly split between bridge and capture, rename the video device to highlight its role and be in line with the bridge entity naming.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 3 ++- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +2 -1
@@ -1020,7 +1020,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)/* Video Device */ -strscpy (video_dev->name,SUN6I_CSI_NAME ,sizeof (video_dev->name)); +strscpy (video_dev->name,SUN6I_CSI_CAPTURE_NAME , +sizeof (video_dev->name)); video_dev->device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_STREAMING ; video_dev->vfl_dir =VFL_DIR_RX ; video_dev->release = video_device_release_empty;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +2 -0
@@ -11,6 +11,8 @@#include <media/v4l2-dev.h> #include <media/videobuf2-core.h> +#define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture" +#define SUN6I_CSI_CAPTURE_WIDTH_MIN 32#define SUN6I_CSI_CAPTURE_WIDTH_MAX 4800#define SUN6I_CSI_CAPTURE_HEIGHT_MIN 32
Signature · 1 line
2.34.1
PATCH v2 53/66 media: sun6i-csi: Cleanup headers and includes, update copyright lines
In reply to Paul KocialkowskiCleanup includes, update copyright lines and some cosmetic changes.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 17 ++++++-------- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 12 +++++----- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 4 ++-- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 22 ++++++++++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 9 ++++---- 5 files changed, 37 insertions(+), 27 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +7 -10
@@ -1,31 +1,27 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ #include <linux/clk.h> -#include <linux/delay.h> -#include <linux/dma-mapping.h> #include <linux/err.h> -#include <linux/fs.h> #include <linux/interrupt.h> -#include <linux/io.h> -#include <linux/ioctl.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/reset.h> -#include <linux/sched.h> -#include <linux/sizes.h> -#include <linux/slab.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> #include <media/v4l2-mc.h> #include "sun6i_csi.h" +#include "sun6i_csi_bridge.h" +#include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" /* Media */
@@ -390,4 +386,5 @@ module_platform_driver(sun6i_csi_platform_driver);MODULE_DESCRIPTION ("Allwinner A31 Camera Sensor Interface driver" );MODULE_AUTHOR ("Yong Deng <[email protected]>" ); +MODULE_AUTHOR ("Paul Kocialkowski <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +7 -5
@@ -1,16 +1,16 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CSI_H__ -#define __SUN6I_CSI_H__ +#ifndef _SUN6I_CSI_H_ +#define _SUN6I_CSI_H_#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> -#include <media/v4l2-fwnode.h> #include <media/videobuf2-v4l2.h> #include "sun6i_csi_bridge.h"
@@ -48,6 +48,8 @@ struct sun6i_csi_device { struct reset_control *reset; }; +/* V4L2 */ +int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_CSI_H__ */ +#endif
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +2 -2
@@ -1,13 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ #include <linux/of.h> #include <linux/regmap.h> -#include <media/v4l2-device.h> #include <media/v4l2-event.h> #include <media/v4l2-ioctl.h>
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +16 -6
@@ -1,15 +1,15 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CAPTURE_H__ -#define __SUN6I_CAPTURE_H__ +#ifndef _SUN6I_CAPTURE_H_ +#define _SUN6I_CAPTURE_H_ -#include <media/v4l2-dev.h> -#include <media/videobuf2-core.h> +#include <media/v4l2-device.h> #define SUN6I_CSI_CAPTURE_NAME "sun6i-csi-capture"
@@ -57,21 +57,31 @@ struct sun6i_csi_capture { struct v4l2_format format; }; +/* Helpers */ +void sun6i_csi_capture_dimensions (struct sun6i_csi_device *csi_dev,unsigned int *width,unsigned int *height);void sun6i_csi_capture_format (struct sun6i_csi_device *csi_dev,u32 *pixelformat,u32 *field); +/* Format */ +const struct sun6i_csi_capture_format *sun6i_csi_capture_format_find (u32 pixelformat); +/* Capture */ +void sun6i_csi_capture_configure (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_state_update (struct sun6i_csi_device *csi_dev); +/* State */ +void sun6i_csi_capture_sync (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_frame_done (struct sun6i_csi_device *csi_dev); +/* Capture */ +int sun6i_csi_capture_setup (struct sun6i_csi_device *csi_dev);void sun6i_csi_capture_cleanup (struct sun6i_csi_device *csi_dev); -#endif /* __SUN6I_CAPTURE_H__ */ +#endif
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +5 -4
@@ -1,12 +1,13 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing) -* All rights reserved. * Author: Yong Deng <[email protected]> +* Copyright 2021-2022 Bootlin +* Author: Paul Kocialkowski <[email protected]> */ -#ifndef __SUN6I_CSI_REG_H__ -#define __SUN6I_CSI_REG_H__ +#ifndef _SUN6I_CSI_REG_H_ +#define _SUN6I_CSI_REG_H_#include <linux/kernel.h>
@@ -180,4 +181,4 @@#define SUN6I_CSI_CH_FIFO_STAT_REG 0x98#define SUN6I_CSI_CH_PCLK_STAT_REG 0x9c -#endif /* __SUN6I_CSI_REG_H__ */ +#endif
Signature · 1 line
2.34.1
PATCH v2 54/66 media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code
In reply to Paul KocialkowskiIntroduce MIPI CSI-2 support to the bridge with a new port, source and hardware configuration helper.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 1 + .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 35 +++++++++++++++++-- .../sunxi/sun6i-csi/sun6i_csi_bridge.h | 1 + 3 files changed, 35 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +1 -0
@@ -21,6 +21,7 @@enum sun6i_csi_port {SUN6I_CSI_PORT_PARALLEL =0 , +SUN6I_CSI_PORT_MIPI_CSI2 =1 , };struct sun6i_csi_buffer {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +33 -2
@@ -226,7 +226,7 @@ static void sun6i_csi_bridge_disable(struct sun6i_csi_device *csi_dev) }static void -sun6i_csi_bridge_configure_interface (struct sun6i_csi_device *csi_dev) +sun6i_csi_bridge_configure_parallel (struct sun6i_csi_device *csi_dev) {struct device *dev = csi_dev->dev;struct regmap *regmap = csi_dev->regmap;
@@ -316,6 +316,25 @@ sun6i_csi_bridge_configure_interface(struct sun6i_csi_device *csi_dev)regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); } +static void +sun6i_csi_bridge_configure_mipi_csi2 (struct sun6i_csi_device *csi_dev) +{ +struct regmap *regmap = csi_dev->regmap; +u32 value =SUN6I_CSI_IF_CFG_IF_MIPI ; +u32 field; + +sun6i_csi_bridge_format (csi_dev,NULL , &field); + +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED ; +else + value |=SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE ; + +regmap_write (regmap,SUN6I_CSI_IF_CFG_REG , value); +} +static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap;
@@ -369,7 +388,11 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev)static void sun6i_csi_bridge_configure (struct sun6i_csi_device *csi_dev) { -sun6i_csi_bridge_configure_interface (csi_dev); +if (csi_dev->bridge.source == &csi_dev->bridge.source_parallel) +sun6i_csi_bridge_configure_parallel (csi_dev); +else if (csi_dev->bridge.source == &csi_dev->bridge.source_mipi_csi2) +sun6i_csi_bridge_configure_mipi_csi2 (csi_dev); +sun6i_csi_bridge_configure_format (csi_dev); }
@@ -552,6 +575,8 @@ static int sun6i_csi_bridge_link_validate(struct media_link *link)if (source_subdev == bridge->source_parallel.subdev) bridge->source = &bridge->source_parallel; +else if (source_subdev == bridge->source_mipi_csi2.subdev) + bridge->source = &bridge->source_mipi_csi2;else return -EINVAL ;
@@ -638,6 +663,10 @@ sun6i_csi_bridge_notifier_bound(struct v4l2_async_notifier *notifier, source = &bridge->source_parallel; enabled = true;break ; +case SUN6I_CSI_PORT_MIPI_CSI2 : + source = &bridge->source_mipi_csi2; + enabled = !bridge->source_parallel.expected; +break ;default :break ; }
@@ -784,6 +813,8 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_parallel,SUN6I_CSI_PORT_PARALLEL , parallel_mbus_types); +sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_mipi_csi2, +SUN6I_CSI_PORT_MIPI_CSI2 ,NULL ); ret =v4l2_async_nf_register (v4l2_dev, notifier);if (ret) {
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h +1 -0
@@ -40,6 +40,7 @@ struct sun6i_csi_bridge {struct v4l2_mbus_framefmt mbus_format;struct sun6i_csi_bridge_source source_parallel; +struct sun6i_csi_bridge_source source_mipi_csi2;struct sun6i_csi_bridge_source *source; };
Signature · 1 line
2.34.1
PATCH v2 55/66 media: sun6i-csi: Only configure capture when streaming
In reply to Paul KocialkowskiAdd a streaming element to the capture state structure to know if the capture device is used or not. Only configure things related to output when streaming, including the output format, irq, state (dma buffer) and window configuration registers.
After this change, it becomes possible to use the bridge without the capture device, which will be the case in the isp media flow.
--- .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 50 ++++++++++++------- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 11 +++- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +31 -19
@@ -338,6 +338,7 @@ sun6i_csi_bridge_configure_mipi_csi2(struct sun6i_csi_device *csi_dev)static void sun6i_csi_bridge_configure_format (struct sun6i_csi_device *csi_dev) {struct regmap *regmap = csi_dev->regmap; +bool capture_streaming = csi_dev->capture.state.streaming;const struct sun6i_csi_bridge_format *bridge_format;const struct sun6i_csi_capture_format *capture_format;u32 mbus_code, field, pixelformat;
@@ -353,26 +354,29 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev) input_format = bridge_format->input_format; input_yuv_seq = bridge_format->input_yuv_seq; -sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); +if (capture_streaming) { +sun6i_csi_capture_format (csi_dev, &pixelformat,NULL ); - capture_format =sun6i_csi_capture_format_find (pixelformat); -if (WARN_ON (!capture_format)) -return ; + capture_format =sun6i_csi_capture_format_find (pixelformat); +if (WARN_ON (!capture_format)) +return ; -if (capture_format->input_format_raw) - input_format =SUN6I_CSI_INPUT_FMT_RAW ; +if (capture_format->input_format_raw) + input_format =SUN6I_CSI_INPUT_FMT_RAW ; -if (capture_format->input_yuv_seq_invert) - input_yuv_seq = bridge_format->input_yuv_seq_invert; +if (capture_format->input_yuv_seq_invert) + input_yuv_seq = bridge_format->input_yuv_seq_invert; -if (field ==V4L2_FIELD_INTERLACED || - field ==V4L2_FIELD_INTERLACED_TB || - field ==V4L2_FIELD_INTERLACED_BT ) - output_format = capture_format->output_format_field; -else - output_format = capture_format->output_format_frame; +if (field ==V4L2_FIELD_INTERLACED || + field ==V4L2_FIELD_INTERLACED_TB || + field ==V4L2_FIELD_INTERLACED_BT ) + output_format = capture_format->output_format_field; +else + output_format = capture_format->output_format_frame; + + value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); + } - value |=SUN6I_CSI_CH_CFG_OUTPUT_FMT (output_format); value |=SUN6I_CSI_CH_CFG_INPUT_FMT (input_format); value |=SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ (input_yuv_seq);
@@ -401,6 +405,7 @@ static void sun6i_csi_bridge_configure(struct sun6i_csi_device *csi_dev)static int sun6i_csi_bridge_s_stream (struct v4l2_subdev *subdev,int on) {struct sun6i_csi_device *csi_dev =v4l2_get_subdevdata (subdev); +bool capture_streaming = csi_dev->capture.state.streaming;struct device *dev = csi_dev->dev;struct v4l2_subdev *source_subdev;/* Initialize to 0 to use both in disable label (ret != 0) and off. */
@@ -431,15 +436,20 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)/* Configure */ sun6i_csi_bridge_configure (csi_dev); -sun6i_csi_capture_configure (csi_dev); + +if (capture_streaming) +sun6i_csi_capture_configure (csi_dev);/* State Update */ -sun6i_csi_capture_state_update (csi_dev); +if (capture_streaming) +sun6i_csi_capture_state_update (csi_dev);/* Enable */ -sun6i_csi_bridge_irq_enable (csi_dev); +if (capture_streaming) +sun6i_csi_bridge_irq_enable (csi_dev); +sun6i_csi_bridge_enable (csi_dev); ret =v4l2_subdev_call (source_subdev, video, s_stream,1 );
@@ -449,7 +459,9 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)return 0 ; disable: -sun6i_csi_bridge_irq_disable (csi_dev); +if (capture_streaming) +sun6i_csi_bridge_irq_disable (csi_dev); +sun6i_csi_bridge_disable (csi_dev); csi_dev->bridge.source =NULL ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +9 -2
@@ -616,13 +616,17 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,if (ret <0 ) goto error_state; + state->streaming = true; + ret =v4l2_subdev_call (subdev, video, s_stream,1 );if (ret && ret != -ENOIOCTLCMD ) - goto error_media_pipeline; + goto error_streaming;return 0 ; -error_media_pipeline: +error_streaming: + state->streaming = false; +media_pipeline_stop (&video_dev->entity); error_state:
@@ -636,11 +640,14 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,static void sun6i_csi_capture_stop_streaming (struct vb2_queue *queue) {struct sun6i_csi_device *csi_dev =vb2_get_drv_priv (queue); +struct sun6i_csi_capture_state *state = &csi_dev->capture.state;struct video_device *video_dev = &csi_dev->capture.video_dev;struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;v4l2_subdev_call (subdev, video, s_stream,0 ); + state->streaming = false; +media_pipeline_stop (&video_dev->entity);sun6i_csi_capture_state_cleanup (csi_dev, true);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +1 -0
@@ -44,6 +44,7 @@ struct sun6i_csi_capture_state {struct sun6i_csi_buffer *complete;unsigned int sequence; +bool streaming; };struct sun6i_csi_capture {
Signature · 1 line
2.34.1
PATCH v2 56/66 media: sun6i-csi: Add extra checks to the interrupt routine
In reply to Paul KocialkowskiCheck against the enabled bits and make sure capture is running before serving an interrupt, to add extra safety in the process.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +7 -2
@@ -111,13 +111,17 @@ static void sun6i_csi_v4l2_cleanup(struct sun6i_csi_device *csi_dev)static irqreturn_t sun6i_csi_isr (int irq,void *private) {struct sun6i_csi_device *csi_dev = private; +bool capture_streaming = csi_dev->capture.state.streaming;struct regmap *regmap = csi_dev->regmap; -u32 status; +u32 status =0 , enable =0 ;regmap_read (regmap,SUN6I_CSI_CH_INT_STA_REG , &status); +regmap_read (regmap,SUN6I_CSI_CH_INT_EN_REG , &enable); -if (!(status &0xFF )) +if (!status)return IRQ_NONE ; +else if (!(status & enable) || !capture_streaming) + goto complete; if ((status & SUN6I_CSI_CH_INT_STA_FIFO0_OF) || (status & SUN6I_CSI_CH_INT_STA_FIFO1_OF) ||
@@ -138,6 +142,7 @@ static irqreturn_t sun6i_csi_isr(int irq, void *private)if (status &SUN6I_CSI_CH_INT_STA_VS )sun6i_csi_capture_sync (csi_dev); +complete:regmap_write (regmap,SUN6I_CSI_CH_INT_STA_REG , status);return IRQ_HANDLED ;
Signature · 1 line
2.34.1
PATCH v2 57/66 media: sun6i-csi: Request a shared interrupt
In reply to Paul KocialkowskiRequest our interrupt shared since it is typically shared with the isp block. The interrupt routine looks good to go for shared irq.
--- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +2 -2
@@ -285,8 +285,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, goto error_clk_rate_exclusive; } - ret =devm_request_irq (dev, irq, sun6i_csi_isr,0 ,SUN6I_CSI_NAME , - csi_dev); + ret =devm_request_irq (dev, irq, sun6i_csi_isr,IRQF_SHARED , +SUN6I_CSI_NAME , csi_dev);if (ret) {dev_err (dev,"failed to request interrupt\n" ); goto error_clk_rate_exclusive;
Signature · 1 line
2.34.1
PATCH v2 58/66 media: sun6i-csi: Detect the availability of the ISP
In reply to Paul KocialkowskiAdd a helper to detect whether the ISP is available and connected and store the indication in a driver-wide variable.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 33 +++++++++++++++++++ .../platform/sunxi/sun6i-csi/sun6i_csi.h | 3 ++ 2 files changed, 36 insertions(+)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +33 -0
@@ -24,6 +24,35 @@#include "sun6i_csi_capture.h" #include "sun6i_csi_reg.h" +/* ISP */ + +static bool sun6i_csi_isp_detect (struct sun6i_csi_device *csi_dev) +{ +struct device *dev = csi_dev->dev; +struct fwnode_handle *handle =NULL ; + +/* ISP is not available if disabled in kernel config. */ +if (!IS_ENABLED (CONFIG_VIDEO_SUN6I_ISP )) +return 0 ; + +/* +* ISP is not available if not connected via fwnode graph. +* This weill also check that the remote parent node is available. +*/ + handle =fwnode_graph_get_endpoint_by_id (dev_fwnode (dev), +SUN6I_CSI_PORT_ISP ,0 , +FWNODE_GRAPH_ENDPOINT_NEXT ); +if (!handle) +return 0 ; + +fwnode_handle_put (handle); + +dev_info (dev,"ISP link is available\n" ); + csi_dev->isp_available = true; + +return 0 ; +} +/* Media */ static const struct media_device_ops sun6i_csi_media_ops = {
@@ -328,6 +357,10 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret)return ret; + ret =sun6i_csi_isp_detect (csi_dev); +if (ret) + goto error_resources; + ret =sun6i_csi_v4l2_setup (csi_dev);if (ret) goto error_resources;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +3 -0
@@ -22,6 +22,7 @@enum sun6i_csi_port {SUN6I_CSI_PORT_PARALLEL =0 ,SUN6I_CSI_PORT_MIPI_CSI2 =1 , +SUN6I_CSI_PORT_ISP =2 , };struct sun6i_csi_buffer {
@@ -47,6 +48,8 @@ struct sun6i_csi_device {struct clk *clk_mod;struct clk *clk_ram;struct reset_control *reset; + +bool isp_available; };/* V4L2 */
Signature · 1 line
2.34.1
PATCH v2 59/66 media: sun6i-csi: Add support for hooking to the isp devices
In reply to Paul KocialkowskiIn order to use the isp and csi together, both devices need to be parented to the same v4l2 and media devices. We use the isp as top-level device and let the csi code hook to its v4l2 and media devices when async subdev registration takes place.
As a result v4l2/media device setup is only called when the ISP is missing and the capture device is registered after the devices are hooked. The bridge subdev and its notifier are registered without any device when the ISP is available. Top-level pointers for the devices are introduced to either redirect to the hooked ones (isp available) or the registered ones (isp missing).
Also keep track of whether the capture node was setup or not to avoid cleaning up resources when it wasn't.
--- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 55 ++++++++++++++----- .../platform/sunxi/sun6i-csi/sun6i_csi.h | 7 +++ .../sunxi/sun6i-csi/sun6i_csi_bridge.c | 31 +++++++++-- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 19 ++++++- .../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 + 5 files changed, 93 insertions(+), 20 deletions(-)
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +42 -13
@@ -26,6 +26,18 @@/* ISP */ +int sun6i_csi_isp_complete (struct sun6i_csi_device *csi_dev, +struct v4l2_device *v4l2_dev) +{ +if (csi_dev->v4l2_dev && csi_dev->v4l2_dev != v4l2_dev) +return -EINVAL ; + + csi_dev->v4l2_dev = v4l2_dev; + csi_dev->media_dev = v4l2_dev->mdev; + +return sun6i_csi_capture_setup (csi_dev); +} +static bool sun6i_csi_isp_detect (struct sun6i_csi_device *csi_dev) {struct device *dev = csi_dev->dev;
@@ -64,8 +76,17 @@ static const struct media_device_ops sun6i_csi_media_ops = {int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev) {struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +int ret; + + ret =v4l2_device_register_subdev_nodes (v4l2_dev); +if (ret) +return ret; -return v4l2_device_register_subdev_nodes (v4l2_dev); + ret =sun6i_csi_capture_setup (csi_dev); +if (ret) +return ret; + +return 0 ; }static int sun6i_csi_v4l2_setup (struct sun6i_csi_device *csi_dev)
@@ -113,6 +134,9 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) goto error_v4l2_ctrl; } + csi_dev->v4l2_dev = v4l2_dev; + csi_dev->media_dev = media_dev; +return 0 ; error_v4l2_ctrl:
@@ -361,25 +385,27 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)if (ret) goto error_resources; - ret =sun6i_csi_v4l2_setup (csi_dev); -if (ret) - goto error_resources; +/* +* Register our own v4l2 and media devices when there is no ISP around. +* Otherwise the ISP will use async subdev registration with our bridge, +* which will provide v4l2 and media devices that are used to register +* the video interface. +*/ +if (!csi_dev->isp_available) { + ret =sun6i_csi_v4l2_setup (csi_dev); +if (ret) + goto error_resources; + } ret =sun6i_csi_bridge_setup (csi_dev);if (ret) goto error_v4l2; - ret =sun6i_csi_capture_setup (csi_dev); -if (ret) - goto error_bridge; -return 0 ; -error_bridge: -sun6i_csi_bridge_cleanup (csi_dev); - error_v4l2: -sun6i_csi_v4l2_cleanup (csi_dev); +if (!csi_dev->isp_available) +sun6i_csi_v4l2_cleanup (csi_dev); error_resources:sun6i_csi_resources_cleanup (csi_dev);
@@ -393,7 +419,10 @@ static int sun6i_csi_remove(struct platform_device *pdev)sun6i_csi_capture_cleanup (csi_dev);sun6i_csi_bridge_cleanup (csi_dev); -sun6i_csi_v4l2_cleanup (csi_dev); + +if (!csi_dev->isp_available) +sun6i_csi_v4l2_cleanup (csi_dev); +sun6i_csi_resources_cleanup (csi_dev);return 0 ;
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +7 -0
@@ -38,6 +38,8 @@ struct sun6i_csi_v4l2 {struct sun6i_csi_device {struct device *dev; +struct v4l2_device *v4l2_dev; +struct media_device *media_dev;struct sun6i_csi_v4l2 v4l2;struct sun6i_csi_bridge bridge;
@@ -52,6 +54,11 @@ struct sun6i_csi_device {bool isp_available; }; +/* ISP */ + +int sun6i_csi_isp_complete (struct sun6i_csi_device *csi_dev, +struct v4l2_device *v4l2_dev); +/* V4L2 */ int sun6i_csi_v4l2_complete (struct sun6i_csi_device *csi_dev);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +27 -4
@@ -692,6 +692,16 @@ sun6i_csi_bridge_notifier_bound(struct v4l2_async_notifier *notifier, source->subdev = remote_subdev; +if (csi_dev->isp_available) { +/* +* Hook to the first available remote subdev to get v4l2 and +* media devices and register the capture device then. +*/ + ret =sun6i_csi_isp_complete (csi_dev, remote_subdev->v4l2_dev); +if (ret) +return ret; + } +return sun6i_csi_bridge_link (csi_dev,SUN6I_CSI_BRIDGE_PAD_SINK , remote_subdev, enabled); }
@@ -703,6 +713,9 @@ sun6i_csi_bridge_notifier_complete(struct v4l2_async_notifier *notifier) container_of(notifier, struct sun6i_csi_device, bridge.notifier); +if (csi_dev->isp_available) +return 0 ; +return sun6i_csi_v4l2_complete (csi_dev); }
@@ -772,7 +785,7 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev) {struct device *dev = csi_dev->dev;struct sun6i_csi_bridge *bridge = &csi_dev->bridge; -struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev;struct v4l2_subdev *subdev = &bridge->subdev;struct v4l2_async_notifier *notifier = &bridge->notifier;struct media_pad *pads = bridge->pads;
@@ -811,7 +824,11 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)/* V4L2 Subdev */ - ret =v4l2_device_register_subdev (v4l2_dev, subdev); +if (csi_dev->isp_available) + ret =v4l2_async_register_subdev (subdev); +else + ret =v4l2_device_register_subdev (v4l2_dev, subdev); +if (ret) {dev_err (dev,"failed to register v4l2 subdev: %d\n" , ret); goto error_media_entity;
@@ -828,7 +845,10 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)sun6i_csi_bridge_source_setup (csi_dev, &bridge->source_mipi_csi2,SUN6I_CSI_PORT_MIPI_CSI2 ,NULL ); - ret =v4l2_async_nf_register (v4l2_dev, notifier); +if (csi_dev->isp_available) + ret =v4l2_async_subdev_nf_register (subdev, notifier); +else + ret =v4l2_async_nf_register (v4l2_dev, notifier);if (ret) {dev_err (dev,"failed to register v4l2 async notifier: %d\n" , ret);
@@ -840,7 +860,10 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev) error_v4l2_async_notifier:v4l2_async_nf_cleanup (notifier); -v4l2_device_unregister_subdev (subdev); +if (csi_dev->isp_available) +v4l2_async_unregister_subdev (subdev); +else +v4l2_device_unregister_subdev (subdev); error_media_entity:media_entity_cleanup (&subdev->entity);
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +16 -3
@@ -570,7 +570,7 @@ static int sun6i_csi_capture_buffer_prepare(struct vb2_buffer *buffer) {struct sun6i_csi_device *csi_dev =vb2_get_drv_priv (buffer->vb2_queue);struct sun6i_csi_capture *capture = &csi_dev->capture; -struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev;struct vb2_v4l2_buffer *v4l2_buffer =to_vb2_v4l2_buffer (buffer);unsigned long size = capture->format.fmt.pix.sizeimage;
@@ -886,7 +886,7 @@ static int sun6i_csi_capture_link_validate(struct media_link *link)struct video_device *video_dev =media_entity_to_video_device (link->sink->entity);struct sun6i_csi_device *csi_dev =video_get_drvdata (video_dev); -struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev;const struct sun6i_csi_capture_format *capture_format;const struct sun6i_csi_bridge_format *bridge_format;unsigned int capture_width, capture_height;
@@ -968,7 +968,7 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) {struct sun6i_csi_capture *capture = &csi_dev->capture;struct sun6i_csi_capture_state *state = &capture->state; -struct v4l2_device *v4l2_dev = &csi_dev->v4l2.v4l2_dev; +struct v4l2_device *v4l2_dev = csi_dev->v4l2_dev;struct v4l2_subdev *bridge_subdev = &csi_dev->bridge.subdev;struct video_device *video_dev = &capture->video_dev;struct vb2_queue *queue = &capture->queue;
@@ -977,6 +977,10 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev)struct v4l2_pix_format *pix_format = &format->fmt.pix;int ret; +/* This may happen with multiple bridge notifier bound calls. */ +if (state->setup) +return 0 ; +/* State */ INIT_LIST_HEAD (&state->queue);
@@ -1055,6 +1059,7 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) ret =media_create_pad_link (&bridge_subdev->entity,SUN6I_CSI_BRIDGE_PAD_SOURCE , &video_dev->entity,0 , + csi_dev->isp_available ?0 :MEDIA_LNK_FL_ENABLED |MEDIA_LNK_FL_IMMUTABLE );if (ret <0 ) {
@@ -1065,6 +1070,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) goto error_video_device; } + state->setup = true; +return 0 ; error_video_device:
@@ -1083,7 +1090,13 @@ void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev)struct sun6i_csi_capture *capture = &csi_dev->capture;struct video_device *video_dev = &capture->video_dev; +/* This may happen if async registration failed to complete. */ +if (!capture->state.setup) +return ; +vb2_video_unregister_device (video_dev);media_entity_cleanup (&video_dev->entity);mutex_destroy (&capture->lock); + + capture->state.setup = false; }
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h +1 -0
@@ -45,6 +45,7 @@ struct sun6i_csi_capture_state {unsigned int sequence;bool streaming; +bool setup; };struct sun6i_csi_capture {
Signature · 1 line
2.34.1
PATCH v2 60/66 MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry
In reply to Paul KocialkowskiGiven the substantial rework of the driver that I carried out and the knowledge acquired about the hardware along the way, make myself a maintainer of the sun6i-csi driver.
Also rename and move the entry while at it since the driver is not specific to the V3s.
--- MAINTAINERS | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
MAINTAINERS +9 -8
@@ -751,6 +751,15 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml F: drivers/media/platform/sunxi/sun4i-csi/ +ALLWINNER A31 CSI DRIVER +M: Yong Deng <[email protected]> +M: Paul Kocialkowski <[email protected]> +L: [email protected] +S: Maintained +T: git git://linuxtv.org/media_tree.git +F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml +F: drivers/media/platform/sunxi/sun6i-csi/ + ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVER M: Paul Kocialkowski <[email protected]> L: [email protected]
@@ -5064,14 +5073,6 @@ M: Jaya Kumar <[email protected]> S: Maintained F: sound/pci/cs5535audio/ -CSI DRIVERS FOR ALLWINNER V3s -M: Yong Deng <[email protected]> -L: [email protected] -S: Maintained -T: git git://linuxtv.org/media_tree.git -F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml -F: drivers/media/platform/sunxi/sun6i-csi/ - CW1200 WLAN driver M: Solomon Peachy <[email protected]> S: Maintained
Signature · 1 line
2.34.1
PATCH v2 61/66 dt-bindings: media: Add Allwinner A31 ISP bindings documentation
In reply to Paul KocialkowskiThis introduces YAML bindings documentation for the Allwinner A31 Image Signal Processor (ISP).
--- .../media/allwinner,sun6i-a31-isp.yaml | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +117 -0
@@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-isp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 Image Signal Processor Driver (ISP) Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + enum: + - allwinner,sun6i-a31-isp + - allwinner,sun8i-v3s-isp + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + - description: DRAM Clock + + clock-names: + items: + - const: bus + - const: mod + - const: ram + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI0 input port + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI1 input port + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-v3s-ccu.h> + #include <dt-bindings/reset/sun8i-v3s-ccu.h> + + isp: isp@1cb8000 { + compatible = "allwinner,sun8i-v3s-isp"; + reg = <0x01cb8000 0x1000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>, + <&ccu CLK_DRAM_CSI>; + clock-names = "bus", "mod", "ram"; + resets = <&ccu RST_BUS_CSI>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + isp_in_csi0: endpoint { + remote-endpoint = <&csi0_out_isp>; + }; + }; + }; + }; + +...
Signature · 1 line
2.34.1
Re: [PATCH v2 61/66] dt-bindings: media: Add Allwinner A31 ISP bindings documentation
Hi Paul,
Thank you for the patch.
Quoted 33 lines · Paul Kocialkowski
This introduces YAML bindings documentation for the Allwinner A31 Image Signal Processor (ISP).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../media/allwinner,sun6i-a31-isp.yaml | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yamlDocumentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +18
-0@@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-isp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 Image Signal Processor Driver (ISP) Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + enum: + - allwinner,sun6i-a31-isp + - allwinner,sun8i-v3s-isp + + reg:
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 28
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + - description: DRAM Clock
That's interesting, does the ISP have a dedicated DRAM ?
Quoted 15 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +15
-0+ + clock-names: + items: + - const: bus + - const: mod + - const: ram + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0:
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 53
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI0 input port + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false
If no other property than remote-endpoint are allowed, I'd write
endpoint:
$ref: video-interfaces.yaml#
remote-endpoint: true
additionalProperties: false
Same below.
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 63
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ + additionalProperties: false + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI1 input port + + properties: + reg: + const: 0
This should be 1.
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 75
Quoted 12 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +12
-0+ + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: false + + additionalProperties: false + + anyOf: + - required: + - port@0 + - required: + - port@1
As ports are an intrinsic property of the ISP, both should be required, but they don't have to be connected.
By the way, how do you select at runtime which CSI-2 RX the ISP gets its image stream from ? Is it configured through registers of the ISP ?
Quoted 42 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +42
-0+ +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/sun8i-v3s-ccu.h> + #include <dt-bindings/reset/sun8i-v3s-ccu.h> + + isp: isp@1cb8000 { + compatible = "allwinner,sun8i-v3s-isp"; + reg = <0x01cb8000 0x1000>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CSI>, + <&ccu CLK_CSI1_SCLK>, + <&ccu CLK_DRAM_CSI>; + clock-names = "bus", "mod", "ram"; + resets = <&ccu RST_BUS_CSI>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + isp_in_csi0: endpoint { + remote-endpoint = <&csi0_out_isp>; + }; + }; + }; + }; + +...
Signature · 3 lines
Regards, Laurent Pinchart
Rob Herring
maintainerRe: [PATCH v2 61/66] dt-bindings: media: Add Allwinner A31 ISP bindings documentation
Quoted 79 lines · Laurent Pinchart
Hi Paul,
Thank you for the patch.
Quoted 33 lines · Paul Kocialkowski
This introduces YAML bindings documentation for the Allwinner A31 Image Signal Processor (ISP).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../media/allwinner,sun6i-a31-isp.yaml | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yamlDocumentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +18
-0@@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-isp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 Image Signal Processor Driver (ISP) Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + enum: + - allwinner,sun6i-a31-isp + - allwinner,sun8i-v3s-isp + + reg:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 28
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + - description: DRAM ClockThat's interesting, does the ISP have a dedicated DRAM ?
Quoted 15 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +15
-0+ + clock-names: + items: + - const: bus + - const: mod + - const: ram + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 53
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI0 input port + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: falseIf no other property than remote-endpoint are allowed, I'd write
Quoted 3 lines
endpoint:
$ref: video-interfaces.yaml#
remote-endpoint: true
You just mixed a node and a property...
'remote-endpoint' is always allowed, so need to put it here and every other user. So 'unevaluatedProperties' is correct. But it would be good to define what properties from video-interfaces.yaml are used here.
Rob
Re: [PATCH v2 61/66] dt-bindings: media: Add Allwinner A31 ISP bindings documentation
Hi Rob,
Quoted 76 lines · Rob Herring
Quoted 75 lines · Laurent Pinchart
Quoted 33 lines · Paul Kocialkowski
This introduces YAML bindings documentation for the Allwinner A31 Image Signal Processor (ISP).
Signed-off-by Paul Kocialkowski <[email protected]>--- .../media/allwinner,sun6i-a31-isp.yaml | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yamlDocumentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +18
-0@@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/allwinner,sun6i-a31-isp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 Image Signal Processor Driver (ISP) Device Tree Bindings + +maintainers: + - Paul Kocialkowski <[email protected]> + +properties: + compatible: + enum: + - allwinner,sun6i-a31-isp + - allwinner,sun8i-v3s-isp + + reg:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 28
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + - description: DRAM ClockThat's interesting, does the ISP have a dedicated DRAM ?
Quoted 15 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +15
-0+ + clock-names: + items: + - const: bus + - const: mod + - const: ram + + resets: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml line 53
Quoted 10 lines
Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml new file +10
-0+ $ref: /schemas/graph.yaml#/$defs/port-base + description: CSI0 input port + + properties: + reg: + const: 0 + + endpoint: + $ref: video-interfaces.yaml# + unevaluatedProperties: falseIf no other property than remote-endpoint are allowed, I'd write
Quoted 5 lines
Quoted 3 lines
endpoint:
$ref: video-interfaces.yaml#
remote-endpoint: trueYou just mixed a node and a property...
Yes, I meant
endpoint:
$ref: video-interfaces.yaml#
properties:
remote-endpoint: true
and actually add
additionalProperties: false
Quoted 3 lines
'remote-endpoint' is always allowed, so need to put it here and every other user. So 'unevaluatedProperties' is correct. But it would be good to define what properties from
video-interfaces.yamlare used here.
I've been looking at this recently. The usual pattern is to write
endpoint:
$ref: video-interfaces.yaml#
unevaluatedProperties: false
properties:
hsync-polarity: true
vsync-polarity: true
to express that the hsync-polarity and vsync-polarity properties are used. However, this will still validate fine if, for instance, data-lanes was specified in the device tree. Shouldn't we use additionalProperties instead of unevaluatedProperties here ? If so, specifying remote-endpoint: true seems needed.
Signature · 3 lines
Regards, Laurent Pinchart