| Message ID | cover.1698666612.git.mehdi.djait@bootlin.com |
|---|---|
| Headers | show |
| Series | media: rockchip: Add a driver for Rockchip's camera interface | expand |
On Mon, Oct 30, 2023 at 01:25:12PM +0100, Mehdi Djait wrote: > Add a documentation for the Rockchip Camera Interface > binding. > > Signed-off-by: Mehdi Djait <mehdi.djait@bootlin.com> > --- > v8=>v9: > dropped the "Reviewed-by: Rob Herring <robh@kernel.org>" > because of the following changes: > - changed the compatible to rk3066-cif: rk3066 is the earliest Rockchip SoC > that uses cif and it is the first model starting the RK30 lineup. Is px30 compatible with rk3066? It's not clear because you didn't add rk3066 support. If not compatible, then add rk3066 when you have a user. If it is compatible, then you should have a fallback for px30. > - adjusted the description > - changed the node name to video-capture > > > .../bindings/media/rockchip,rk3066-cif.yaml | 96 +++++++++++++++++++ > 1 file changed, 96 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3066-cif.yaml > > diff --git a/Documentation/devicetree/bindings/media/rockchip,rk3066-cif.yaml b/Documentation/devicetree/bindings/media/rockchip,rk3066-cif.yaml > new file mode 100644 > index 000000000000..be69e474ed26 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/rockchip,rk3066-cif.yaml > @@ -0,0 +1,96 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/media/rockchip,rk3066-cif.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Rockchip CIF Camera Interface > + > +maintainers: > + - Mehdi Djait <mehdi.djait@bootlin.com> > + > +description: | Don't need '|' > + CIF is a camera interface present on some rockchip SoCs. It > + receives the data from Camera sensor or CCIR656 encoder and > + transfers it into system main memory by AXI bus. Wrap lines at 80. > + > +properties: > + compatible: > + enum: > + - rockchip,rk3066-cif > + - rockchip,px30-vip > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + clocks: > + items: > + - description: ACLK > + - description: HCLK > + - description: PCLK > + > + clock-names: > + items: > + - const: aclk > + - const: hclk > + - const: pclk > + > + resets: > + items: > + - description: AXI > + - description: AHB > + - description: PCLK IN > + > + reset-names: > + items: > + - const: axi > + - const: ahb > + - const: pclkin > + > + power-domains: > + maxItems: 1 > + > + port: > + $ref: /schemas/graph.yaml#/properties/port > + description: A connection to a sensor or decoder > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - port > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + #include <dt-bindings/clock/px30-cru.h> > + #include <dt-bindings/power/px30-power.h> > + > + parent { > + #address-cells = <2>; > + #size-cells = <2>; > + > + video-capture@ff490000 { > + compatible = "rockchip,px30-vip"; > + reg = <0x0 0xff490000 0x0 0x200>; > + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru ACLK_CIF>, <&cru HCLK_CIF>, <&cru PCLK_CIF>; > + clock-names = "aclk", "hclk", "pclk"; > + resets = <&cru SRST_CIF_A>, <&cru SRST_CIF_H>, <&cru SRST_CIF_PCLKIN>; > + reset-names = "axi", "ahb", "pclkin"; > + power-domains = <&power PX30_PD_VI>; > + > + port { > + endpoint { > + remote-endpoint = <&tw9900_out>; > + }; > + }; > + }; > + }; > +... > -- > 2.41.0 >
Le 31/10/2023 à 10:33, Mehdi Djait a écrit : > Hello Christophe, > > On Mon, Oct 30, 2023 at 01:47:17PM +0100, Christophe JAILLET wrote: >>> + /* Create & register platform subdev. */ >>> + ret = cif_register_stream_vdev(cif_dev); >>> + if (ret < 0) >>> + goto err_unreg_media_dev; >>> + >>> + ret = cif_subdev_notifier(cif_dev); >>> + if (ret < 0) { >>> + v4l2_err(&cif_dev->v4l2_dev, >>> + "Failed to register subdev notifier(%d)\n", ret); >>> + cif_unregister_stream_vdev(cif_dev); >>> + goto err_unreg_media_dev; >> >> Should there be another label with cif_unregister_stream_vdev(cif_dev); if >> an error occurs here? >> >> CJ > > cif_subdev_notifier() is the last function call in the probe with error > handling. So it will undo the last successful register: > cif_register_stream_vdev and use the goto to unregister the rest. Ah, I didn't see the cif_unregister_stream_vdev() call here. Sorry for the noise. > > I can add a label err_unreg_stream_vdev but it will be only used in the > error handling of cif_subdev_notifier() and I don't see the benefit. The main benefit is to be more consistent in the way the error path is written, and to be more future proof. CJ > > -- > Kind Regards > Mehdi Djait > >>> + } >>> + >>> + cif_set_default_format(cif_dev); >>> + pm_runtime_enable(&pdev->dev); >>> + >>> + return 0; >>> + >>> +err_unreg_media_dev: >>> + media_device_unregister(&cif_dev->media_dev); >>> +err_unreg_v4l2_dev: >>> + v4l2_device_unregister(&cif_dev->v4l2_dev); >>> + return ret; >>> +} >
Hello everyone, V9 for basic support of the Video Input Processor found on the Rockchip PX30 SoC The v6 is based on the v5 of the series introducing the driver: sent 29 Dec 2020 [1] Most of this driver was written following the BSP driver from rockchip, removing the parts that either didn't fit correctly the guidelines, or that couldn't be tested. In the BSP, this driver is known as the "cif" driver, but this was renamed to "vip" to better fit the controller denomination in the datasheet. This version of the driver supports ONLY the parallel interface BT656 and was tested/implemented using an SDTV video decoder media_tree, base-commit: 94e27fbeca27d8c772fc2bc807730aaee5886055 V8 => V9: cif/capture.c cif/dev.c cif/dev.h: as suggested by Paul: - changed the name from "vip" back to "cif" - removed the scratch buffer and added frame dropping - removed mplane, only single plane formats are supported anyway - adjusted the Kconfig - added the match_data to the stream struct - some cosmetics, and error return codes changes as suggested by Michael: - changed the writel and readl helpers to be inline functions and changed the name - fixed typos in the commit message - changed the cif_device struct element "sensor" to "remote" rockchip,rk3066-cif.yaml: - changed the compatible rockchip,px30-vip to rockchip,rk3066-cif: rk3066 is the earliest Rockchip SoC that uses cif and it is the first model starting the RK30 lineup. - changed the node name to video-capture - adjusted the description V7 => V8: vip/capture.c: - fixed a warning: unused variable reported by the kernel test robot V6 => V7: vip/capture.c vip/dev.c vip/dev.h - renamed all struct rk_vip_dev dev => struct rk_vip_dev vip_dev - added some error when rk_vip_get_buffer() returns NULL - removed a WARN_ON - made the irq NOT shared - dropped of_match_ptr - added the rk_vip_get_resource() function rockchip,px30-vip.yaml: - changed filename to match the compatible - dropped the mention of the other rockchip SoC in the dt-binding description and added a more detailed description of VIP - removed unused labels in the example V5[1] => V6: vip/capture.c vip/dev.c vip/dev.h - added a video g_input_status subdev call, V4L2_IN_CAP_STD and the supported stds in rk_vip_enum_input callback - added rk_vip_g_std, rk_vip_s_std and rk_vip_querystd callbacks - added the supported video_device->tvnorms - s_std will now update the format as this depends on the standard NTSC/PAL (as suggested by Hans in [1]) - removed STD_ATSC - moved the colorimetry information to come from the subdev - removed the core s_power subdev calls - dropped cropping in rk_vip_stream struct rockchip-vip.yaml: - fixed a mistake in the name of third clock plckin -> plck - changed the reg maxItems 2 -> 1 [1] https://lore.kernel.org/linux-media/20201229161724.511102-1-maxime.chevallier@bootlin.com/ I used v4l-utils with HEAD: commit 3d6682746de535d1f7aa71b43a30af40d52a539c # v4l2-compliance v4l2-compliance 1.25.0, 64 bits, 64-bit time_t Compliance test for rockchip-cif device /dev/video0: Driver Info: Driver name : rockchip-cif Card type : rockchip-cif Bus info : platform:ff490000.video-capture Driver version : 6.6.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 : rockchip-cif Model : cif Serial : Bus info : platform:ff490000.video-capture Media version : 6.6.0 Hardware revision: 0x00000000 (0) Driver version : 6.6.0 Interface Info: ID : 0x03000003 Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : rockchip_cif Function : V4L2 I/O Pad 0x01000002 : 0: Sink Link 0x02000009: from remote pad 0x1000006 of entity 'tw9900 2-0044' (Digital Video Decoder): Data, Enabled Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK test invalid ioctls: OK Allow for multiple opens: test second /dev/video0 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) 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 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 (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls (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 (Not Supported) 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 rockchip-cif device /dev/video0: 46, Succeeded: 46, Failed: 0, Warnings: 0 Mehdi Djait (3): media: dt-bindings: media: add bindings for Rockchip CIF media: rockchip: Add a driver for Rockchip's camera interface arm64: dts: rockchip: Add the camera interface .../bindings/media/rockchip,rk3066-cif.yaml | 96 ++ MAINTAINERS | 7 + arch/arm64/boot/dts/rockchip/px30.dtsi | 12 + drivers/media/platform/rockchip/Kconfig | 1 + drivers/media/platform/rockchip/Makefile | 1 + drivers/media/platform/rockchip/cif/Kconfig | 13 + drivers/media/platform/rockchip/cif/Makefile | 3 + drivers/media/platform/rockchip/cif/capture.c | 1156 +++++++++++++++++ drivers/media/platform/rockchip/cif/dev.c | 293 +++++ drivers/media/platform/rockchip/cif/dev.h | 142 ++ drivers/media/platform/rockchip/cif/regs.h | 192 +++ 11 files changed, 1916 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3066-cif.yaml create mode 100644 drivers/media/platform/rockchip/cif/Kconfig create mode 100644 drivers/media/platform/rockchip/cif/Makefile create mode 100644 drivers/media/platform/rockchip/cif/capture.c create mode 100644 drivers/media/platform/rockchip/cif/dev.c create mode 100644 drivers/media/platform/rockchip/cif/dev.h create mode 100644 drivers/media/platform/rockchip/cif/regs.h