Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: media: convert imx.txt to yaml format

Convert binding doc imx.txt to yaml format. Create two yaml files:
fsl,imx6-mipi-csi2.yaml and fsl,imx-capture-subsystem.yaml.

Additional changes:
- add example for fsl,imx6-mipi-csi2
- add irq err1 and err2 description
- update MAINTAINERS

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
[hverkuil: drop empty line at the end of the yaml files]

authored by

Frank Li and committed by
Hans Verkuil
48dbb76c 108955cd

+181 -54
+37
Documentation/devicetree/bindings/media/fsl,imx-capture-subsystem.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/media/fsl,imx-capture-subsystem.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Freescale i.MX Media Video Device 8 + 9 + description: 10 + This is the media controller node for video capture support. It is a 11 + virtual device that lists the camera serial interface nodes that the 12 + media device will control 13 + 14 + maintainers: 15 + - Frank Li <Frank.Li@nxp.com> 16 + 17 + properties: 18 + compatible: 19 + const: fsl,imx-capture-subsystem 20 + 21 + ports: 22 + $ref: /schemas/types.yaml#/definitions/phandle-array 23 + description: 24 + Should contain a list of phandles pointing to camera 25 + sensor interface ports of IPU devices. 26 + 27 + required: 28 + - compatible 29 + 30 + additionalProperties: false 31 + 32 + examples: 33 + - | 34 + capture-subsystem { 35 + compatible = "fsl,imx-capture-subsystem"; 36 + ports = <&ipu1_csi0>, <&ipu1_csi1>; 37 + };
+143
Documentation/devicetree/bindings/media/fsl,imx6-mipi-csi2.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/media/fsl,imx6-mipi-csi2.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: MIPI CSI-2 Receiver core in the i.MX SoC 8 + 9 + description: 10 + This is the device node for the MIPI CSI-2 Receiver core in the i.MX 11 + SoC. This is a Synopsys Designware MIPI CSI-2 host controller core 12 + combined with a D-PHY core mixed into the same register block. In 13 + addition this device consists of an i.MX-specific "CSI2IPU gasket" 14 + glue logic, also controlled from the same register block. The CSI2IPU 15 + gasket demultiplexes the four virtual channel streams from the host 16 + controller's 32-bit output image bus onto four 16-bit parallel busses 17 + to the i.MX IPU CSIs. 18 + 19 + maintainers: 20 + - Frank Li <Frank.Li@nxp.com> 21 + 22 + properties: 23 + compatible: 24 + const: fsl,imx6-mipi-csi2 25 + 26 + reg: 27 + maxItems: 1 28 + 29 + clocks: 30 + items: 31 + - description: hsi_tx (the D-PHY clock) 32 + - description: video_27m (D-PHY PLL reference clock) 33 + - description: eim_podf; 34 + 35 + clock-names: 36 + items: 37 + - const: dphy 38 + - const: ref 39 + - const: pix 40 + 41 + interrupts: 42 + items: 43 + - description: CSI-2 ERR1 irq 44 + - description: CSI-2 ERR2 irq 45 + 46 + '#address-cells': 47 + const: 1 48 + 49 + '#size-cells': 50 + const: 0 51 + 52 + port@0: 53 + $ref: /schemas/graph.yaml#/$defs/port-base 54 + unevaluatedProperties: false 55 + description: 56 + Input port node, single endpoint describing the CSI-2 transmitter. 57 + 58 + properties: 59 + endpoint: 60 + $ref: video-interfaces.yaml# 61 + unevaluatedProperties: false 62 + 63 + properties: 64 + clock-lanes: 65 + const: 0 66 + 67 + data-lanes: 68 + minItems: 1 69 + items: 70 + - const: 1 71 + - const: 2 72 + - const: 3 73 + - const: 4 74 + 75 + required: 76 + - data-lanes 77 + 78 + patternProperties: 79 + '^port@[1-4]$': 80 + $ref: /schemas/graph.yaml#/$defs/port-base 81 + unevaluatedProperties: false 82 + description: 83 + ports 1 through 4 are output ports connecting with parallel bus sink 84 + endpoint nodes and correspond to the four MIPI CSI-2 virtual channel 85 + outputs. 86 + 87 + properties: 88 + endpoint@0: 89 + $ref: video-interfaces.yaml# 90 + unevaluatedProperties: false 91 + 92 + endpoint@1: 93 + $ref: video-interfaces.yaml# 94 + unevaluatedProperties: false 95 + 96 + required: 97 + - compatible 98 + - reg 99 + - clocks 100 + - clock-names 101 + 102 + additionalProperties: false 103 + 104 + examples: 105 + - | 106 + #include <dt-bindings/clock/imx6qdl-clock.h> 107 + 108 + mipi@21dc000 { 109 + compatible = "fsl,imx6-mipi-csi2"; 110 + reg = <0x021dc000 0x4000>; 111 + #address-cells = <1>; 112 + #size-cells = <0>; 113 + clocks = <&clks IMX6QDL_CLK_HSI_TX>, 114 + <&clks IMX6QDL_CLK_VIDEO_27M>, 115 + <&clks IMX6QDL_CLK_EIM_PODF>; 116 + clock-names = "dphy", "ref", "pix"; 117 + 118 + port@0 { 119 + reg = <0>; 120 + 121 + endpoint { 122 + remote-endpoint = <&ov5640_to_mipi_csi2>; 123 + clock-lanes = <0>; 124 + data-lanes = <1 2>; 125 + }; 126 + }; 127 + 128 + port@1 { 129 + reg = <1>; 130 + #address-cells = <1>; 131 + #size-cells = <0>; 132 + 133 + endpoint@0 { 134 + reg = <0>; 135 + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; 136 + }; 137 + 138 + endpoint@1 { 139 + reg = <1>; 140 + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>; 141 + }; 142 + }; 143 + };
-53
Documentation/devicetree/bindings/media/imx.txt
··· 1 - Freescale i.MX Media Video Device 2 - ================================= 3 - 4 - Video Media Controller node 5 - --------------------------- 6 - 7 - This is the media controller node for video capture support. It is a 8 - virtual device that lists the camera serial interface nodes that the 9 - media device will control. 10 - 11 - Required properties: 12 - - compatible : "fsl,imx-capture-subsystem"; 13 - - ports : Should contain a list of phandles pointing to camera 14 - sensor interface ports of IPU devices 15 - 16 - example: 17 - 18 - capture-subsystem { 19 - compatible = "fsl,imx-capture-subsystem"; 20 - ports = <&ipu1_csi0>, <&ipu1_csi1>; 21 - }; 22 - 23 - 24 - mipi_csi2 node 25 - -------------- 26 - 27 - This is the device node for the MIPI CSI-2 Receiver core in the i.MX 28 - SoC. This is a Synopsys Designware MIPI CSI-2 host controller core 29 - combined with a D-PHY core mixed into the same register block. In 30 - addition this device consists of an i.MX-specific "CSI2IPU gasket" 31 - glue logic, also controlled from the same register block. The CSI2IPU 32 - gasket demultiplexes the four virtual channel streams from the host 33 - controller's 32-bit output image bus onto four 16-bit parallel busses 34 - to the i.MX IPU CSIs. 35 - 36 - Required properties: 37 - - compatible : "fsl,imx6-mipi-csi2"; 38 - - reg : physical base address and length of the register set; 39 - - clocks : the MIPI CSI-2 receiver requires three clocks: hsi_tx 40 - (the D-PHY clock), video_27m (D-PHY PLL reference 41 - clock), and eim_podf; 42 - - clock-names : must contain "dphy", "ref", "pix"; 43 - - port@* : five port nodes must exist, containing endpoints 44 - connecting to the source and sink devices according to 45 - of_graph bindings. The first port is an input port, 46 - connecting with a MIPI CSI-2 source, and ports 1 47 - through 4 are output ports connecting with parallel 48 - bus sink endpoint nodes and correspond to the four 49 - MIPI CSI-2 virtual channel outputs. 50 - 51 - Optional properties: 52 - - interrupts : must contain two level-triggered interrupts, 53 - in order: 100 and 101;
+1 -1
MAINTAINERS
··· 14776 14776 S: Maintained 14777 14777 T: git git://linuxtv.org/media.git 14778 14778 F: Documentation/admin-guide/media/imx.rst 14779 - F: Documentation/devicetree/bindings/media/imx.txt 14779 + F: Documentation/devicetree/bindings/media/fsl,imx6-mipi-csi2.yaml 14780 14780 F: drivers/staging/media/imx/ 14781 14781 F: include/linux/imx-media.h 14782 14782 F: include/media/imx.h