media: rockchip: Introduce driver for Rockchip's camera interface
Subsystems (3)
v4 cover media: rockchip: Introduce driver for Rockchip's camera interface
Hi everyone,
This is the fourth iteration of the series introducing a driver for the PX30 camera interface.
This was previously known as the "cif" driver in other iterations, but was renamed to "vip" following Ezequiel's advices to match the datasheet name.
This is based on a BSP driver, and I'm not fully familiar with the media and V4L2 frameworks, so I guess some review is still needed.
On top of the previous series, this series addresses most of the reviews by Ezequiel (Thanks again), and was tested on a PX30 chip.
Maxime
Maxime Chevallier (3):
media: dt-bindings: media: Document Rockchip VIP bindings
media: rockchip: Introduce driver for Rockhip's camera interface
arm64: dts: rockchip: Add the camera interface description of the PX30
.../bindings/media/rockchip-vip.yaml | 94 ++ arch/arm64/boot/dts/rockchip/px30.dtsi | 12 + drivers/media/platform/Kconfig | 15 + drivers/media/platform/Makefile | 1 + drivers/media/platform/rockchip/vip/Makefile | 3 + drivers/media/platform/rockchip/vip/capture.c | 1148 +++++++++++++++++ drivers/media/platform/rockchip/vip/dev.c | 333 +++++ drivers/media/platform/rockchip/vip/dev.h | 203 +++ drivers/media/platform/rockchip/vip/regs.h | 260 ++++ 9 files changed, 2069 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rockchip-vip.yaml create mode 100644 drivers/media/platform/rockchip/vip/Makefile create mode 100644 drivers/media/platform/rockchip/vip/capture.c create mode 100644 drivers/media/platform/rockchip/vip/dev.c create mode 100644 drivers/media/platform/rockchip/vip/dev.h create mode 100644 drivers/media/platform/rockchip/vip/regs.h
Signature · 1 line
2.25.4
PATCH v4 1/3 media: dt-bindings: media: Document Rockchip VIP bindings
Add a documentation for the Rockchip Camera Interface controller binding.
This controller can be found on platforms such as the PX30 or the RK3288, the PX30 being the only platform supported so far.
---
v3: Renmed the controller to "vip"
v4: fixed the binding to get a compiling example
.../bindings/media/rockchip-vip.yaml | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rockchip-vip.yaml
Documentation/devicetree/bindings/media/rockchip-vip.yaml new file +94 -0
@@ -0,0 +1,94 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/rockchip-vip.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip VIP Camera Interface + +maintainers: + - Maxime Chevallier <[email protected]> + +description: |- + Camera Interface for Rockcip platforms + +properties: + compatible: + const: rockchip,px30-vip + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: ACLK + - description: HCLK + - description: PCLK IN + + clock-names: + items: + - const: aclk + - const: hclkf + - const: pclkin + + resets: + items: + - description: AXI + - description: AHB + - description: PCLK IN + + reset-names: + items: + - const: axi + - const: ahb + - const: pclkin + + power-domains: + maxItems: 1 + + # See ./video-interfaces.txt for details + port: + type: object + additionalProperties: false + description: A connection to a sensor or decoder + + properties: + remote-endpoint: true + + required: + - remote-endpoint + +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> + + vip: vip@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>, <&cru SCLK_CIF_OUT>; + clock-names = "aclk", "hclk", "pclkin"; + 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 { + vip_in: endpoint { + remote-endpoint = <&tw9900_out>; + }; + }; + }; +...
Signature · 1 line
2.25.4
Rob Herring
maintainerRe: [PATCH v4 1/3] media: dt-bindings: media: Document Rockchip VIP bindings
Quoted 7 lines · Maxime Chevallier
Add a documentation for the Rockchip Camera Interface controller binding.
This controller can be found on platforms such as the PX30 or the RK3288, the PX30 being the only platform supported so far.
Signed-off-by Maxime Chevallier <[email protected]>
Quoted 9 lines
---
v3: Renmed the controller to "vip"v4: fixed the binding to get a compiling example
.../bindings/media/rockchip-vip.yaml | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rockchip-vip.yaml
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:./Documentation/devicetree/bindings/media/rockchip-vip.yaml:59:9: [warning] wrong indentation: expected 6 but found 8 (indentation)
dtschema/dtc warnings/errors:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/media/rockchip-vip.yaml: properties:port:properties:required: ['remote-endpoint'] is not of type 'object', 'boolean'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/media/rockchip-vip.yaml: properties:port:properties: {'enum': ['$ref', 'additionalItems', 'additionalProperties', 'allOf', 'anyOf', 'const', 'contains', 'default', 'dependencies', 'deprecated', 'description', 'else', 'enum', 'if', 'items', 'maxItems', 'maximum', 'minItems', 'minimum', 'multipleOf', 'not', 'oneOf', 'pattern', 'patternProperties', 'properties', 'propertyNames', 'required', 'then', 'unevaluatedProperties']} is not allowed for 'required' /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/media/rockchip-vip.yaml: ignoring, error in schema: properties: port: properties: required
warning: no schema found in file: ./Documentation/devicetree/bindings/media/rockchip-vip.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/media/rockchip-vip.example.dt.yaml: example-0: vip@ff490000:reg:0: [0, 4282974208, 0, 512] is too long
From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
See https://patchwork.ozlabs.org/patch/1412765
The base for the patch is generally the last rc1. Any dependencies should be noted.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
PATCH v4 2/3 media: rockchip: Introduce driver for Rockhip's camera interface
In reply to Maxime ChevallierIntroduce a driver for the camera interface on some Rockchip platforms.
This controller supports CSI2 and BT656 interfaces, but for now only the BT656 interface could be tested, hence it's the only one that's supported in the first version of this driver.
This controller can be fond on PX30, RK1808, RK3128, RK3288 and RK3288, but for now it's only be tested on PX30.
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 basic version doesn't support cropping nor scaling, and is only designed with one sensor being attached to it a any time.
This version uses the "pingpong" mode of the controller, which is a double-buffering mechanism.
---
V3:
- renamed the driver
- Took Hans, Robin and Ezequiel's reviews into account
- Implemented the ouble-buffering mode
v4:
- Took Ezequiel's reviews into account
- Reworked the imagesize computation
- Fixed the bulk API use for clks and rsts
drivers/media/platform/Kconfig | 15 + drivers/media/platform/Makefile | 1 + drivers/media/platform/rockchip/vip/Makefile | 3 + drivers/media/platform/rockchip/vip/capture.c | 1148 +++++++++++++++++ drivers/media/platform/rockchip/vip/dev.c | 333 +++++ drivers/media/platform/rockchip/vip/dev.h | 203 +++ drivers/media/platform/rockchip/vip/regs.h | 260 ++++ 7 files changed, 1963 insertions(+) create mode 100644 drivers/media/platform/rockchip/vip/Makefile create mode 100644 drivers/media/platform/rockchip/vip/capture.c create mode 100644 drivers/media/platform/rockchip/vip/dev.c create mode 100644 drivers/media/platform/rockchip/vip/dev.h create mode 100644 drivers/media/platform/rockchip/vip/regs.h
drivers/media/platform/Kconfig +15 -0
@@ -462,6 +462,21 @@ config VIDEO_ROCKCHIP_RGA To compile this driver as a module choose m here. +config VIDEO_ROCKCHIP_VIP + tristate "Rockchip VIP (Video InPut) Camera Interface" + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_ROCKCHIP || COMPILE_TEST + select VIDEOBUF2_DMA_SG + select VIDEOBUF2_DMA_CONTIG + select V4L2_FWNODE + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Rockchip SOC Camera interface. It supports + BT.656 and CSI2 inputs. + + To compile this driver as a module choose m here : the module will + be called video_rkvip. + config VIDEO_TI_VPE tristate "TI VPE (Video Processing Engine) driver" depends on VIDEO_DEV && VIDEO_V4L2
drivers/media/platform/Makefile +1 -0
@@ -53,6 +53,7 @@ obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/ +obj-$(CONFIG_VIDEO_ROCKCHIP_VIP) += rockchip/vip/ obj-y += omap/
drivers/media/platform/rockchip/vip/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_VIDEO_ROCKCHIP_VIP) += video_rkvip.o +video_rkvip-objs += dev.o capture.o
drivers/media/platform/rockchip/vip/capture.c new file +1148 -0
1,148 lines not on this page · raw message
drivers/media/platform/rockchip/vip/dev.c new file +333 -0
333 lines not on this page · raw message
drivers/media/platform/rockchip/vip/dev.h new file +203 -0
203 lines not on this page · raw message
drivers/media/platform/rockchip/vip/regs.h new file +260 -0
260 lines not on this page · raw message
Signature · 1 line
2.25.4
kernel test robot
build botRe: [PATCH v4 2/3] media: rockchip: Introduce driver for Rockhip's camera interface
Thank you for the patch! Perhaps something to improve:
Hi Maxime,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on rockchip/for-next]
[also build test WARNING on robh/for-next v5.10-rc7 next-20201209] [cannot apply to linuxtv-media/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Maxime-Chevallier/media-rockchip-Introduce-driver-for-Rockchip-s-camera-interface/20201209-002715 base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next config: arc-randconfig-r032-20201209 (attached as .config) compiler: arceb-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/8c74146ec237f44d2b5f26a38765e1d2948035d3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Maxime-Chevallier/media-rockchip-Introduce-driver-for-Rockchip-s-camera-interface/20201209-002715 git checkout 8c74146ec237f44d2b5f26a38765e1d2948035d3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/media/platform/rockchip/vip/capture.c: In function 'rk_vip_queue_setup':
>> drivers/media/platform/rockchip/vip/capture.c:397:31: warning: variable 'vip_fmt' set but not used [-Wunused-but-set-variable]
397 | const struct vip_output_fmt *vip_fmt;
| ^~~~~~~vim +/vip_fmt +397 drivers/media/platform/rockchip/vip/capture.c
387
388 static int rk_vip_queue_setup(struct vb2_queue *queue,
389 unsigned int *num_buffers,
390 unsigned int *num_planes,
391 unsigned int sizes[],
392 struct device *alloc_devs[])
393 {
394 struct rk_vip_stream *stream = queue->drv_priv;
395 const struct v4l2_plane_pix_format *plane_fmt;
396 const struct v4l2_pix_format_mplane *pixm;
> 397 const struct vip_output_fmt *vip_fmt; 398
399 pixm = &stream->pixm;
400 vip_fmt = stream->vip_fmt_out;
401
402 if (*num_planes) {
403 if (*num_planes != 1)
404 return -EINVAL;
405
406 if (sizes[0] < pixm->plane_fmt[0].sizeimage)
407 return -EINVAL;
408 return 0;
409 }
410
411 *num_planes = 1;
412
413 plane_fmt = &pixm->plane_fmt[0];
414 sizes[0] = plane_fmt->sizeimage;
415
416 *num_buffers = VIP_REQ_BUFS_MIN;
417
418 return 0;
419 }
420
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v4 3/3 arm64: dts: rockchip: Add the camera interface description of the PX30
In reply to Maxime ChevallierThe PX30 has a camera interface, supporting CSI2 and BT656 modes. Add a DT description for this interface.
---
V3 : Renamed the controlled
V4: Fixed the clock names
arch/arm64/boot/dts/rockchip/px30.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/rockchip/px30.dtsi +12 -0
@@ -1106,6 +1106,18 @@ vopl_mmu: iommu@ff470f00 { status = "disabled"; }; + vip: vip@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>, <&cru SCLK_CIF_OUT>; + clock-names = "aclk", "hclk", "pclk"; + power-domains = <&power PX30_PD_VI>; + resets = <&cru SRST_CIF_A>, <&cru SRST_CIF_H>, <&cru SRST_CIF_PCLKIN>; + reset-names = "axi", "ahb", "pclkin"; + status = "disabled"; + }; + qos_gmac: qos@ff518000 { compatible = "syscon"; reg = <0x0 0xff518000 0x0 0x20>;
Signature · 1 line
2.25.4