From patchwork Tue Oct 20 19:00:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 11847669 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 378FE15E6 for ; Tue, 20 Oct 2020 19:01:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 066012225D for ; Tue, 20 Oct 2020 19:01:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YtjkFdY8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437890AbgJTTBe (ORCPT ); Tue, 20 Oct 2020 15:01:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390864AbgJTTBd (ORCPT ); Tue, 20 Oct 2020 15:01:33 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 510A9C0613CE; Tue, 20 Oct 2020 12:01:32 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id n6so3542964wrm.13; Tue, 20 Oct 2020 12:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ugm6/vQLOS9NE/9xqZYIqQtzl6U+6a3UdZf0AL0JY0c=; b=YtjkFdY8ubQ657apeQgei589CxXwKcSYwQEOG+IV9UQsWWObsivpw93Q83idAsHoMz uenJl2DC78SXYYBXTJwY/aRXNX9E/eSHNrWRIAdFKevSntwoAgZOcd9awaXMlvMoxiDC /tE8dg0A0Ec6CvWsHgpt+ih3iQ6T+tbGXefLofef7VMfTQLXfFWxxtpF9nCEgWyAmV7H mdLfLLjDRN9b3pljP3t34IoxIsXJbvXo3puh/83ykXtW3sKLiIwpMcoVXjMVUpEjqOMs fNwWD6ZZChBdi+lAIoBiYSbZOZRGcr5gcOamzVuD75FVDr/GQXn8yNypvhodppEn5Ila xOdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ugm6/vQLOS9NE/9xqZYIqQtzl6U+6a3UdZf0AL0JY0c=; b=cdKG0Rym9yRJzqbuXRE0tWw5sJCFwbJM7RQMhAX8u5Ks7vSX4CwHbP67iFbH4hOWgs 9LuWmJ8FYN3vnGv++DUF8eZg8+femsxC04Gmr6FROSvSHspuRSDHCaR5dCqrxmfg0UyM XFJjn+s/BY5VlwRanXCez8BQMq9Zjg4900KOWSb9cWld9TdcfI/AbqiS+ZWzVZhGj6TP 8qu5TZVNWcqwZGkBGdJs6TWaxp0xZA5OnLGZqgbK4VN+EYkQWLdC3vNp/L6kk3wHDGXp zjnSnCKqPdvl94xuncrmuiNcO/NFDkmQGY7syUV3PQ561ADjD0Hl/587cMr9Dv3R/8Uf 36fg== X-Gm-Message-State: AOAM532Zi+m885z4UzypPE3rIItiHyIGAzG0dg8Q5n01nH5Fq77/F1r0 wARafXf73bA+Za3duSWO670= X-Google-Smtp-Source: ABdhPJz6gOMWd9X3csb6phvaypV8roqO4gfXYwxpjp0pi2r2K4FgxaD2H2cgyTpxEcMqLdjYnWW+zQ== X-Received: by 2002:a5d:678d:: with SMTP id v13mr5247860wru.148.1603220491043; Tue, 20 Oct 2020 12:01:31 -0700 (PDT) Received: from arch-thunder.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id c18sm4279289wrq.5.2020.10.20.12.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 12:01:30 -0700 (PDT) From: Rui Miguel Silva To: Rob Herring , sakari.ailus@linux.intel.com, Hans Verkuil , Jacopo Mondi Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Rui Miguel Silva , Jacopo Mondi Subject: [PATCH v5 1/3] dt-bindings: ov2680: convert bindings to yaml Date: Tue, 20 Oct 2020 20:00:49 +0100 Message-Id: <20201020190051.1852778-2-rmfrfs@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020190051.1852778-1-rmfrfs@gmail.com> References: <20201020190051.1852778-1-rmfrfs@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Convert ov2680 sensor bindings documentation to yaml schema, remove the textual bindings document and update MAINTAINERS entry. Signed-off-by: Rui Miguel Silva Reviewed-by: Jacopo Mondi --- .../devicetree/bindings/media/i2c/ov2680.txt | 46 --------- .../bindings/media/i2c/ovti,ov2680.yaml | 99 +++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 100 insertions(+), 47 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov2680.txt create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml diff --git a/Documentation/devicetree/bindings/media/i2c/ov2680.txt b/Documentation/devicetree/bindings/media/i2c/ov2680.txt deleted file mode 100644 index 11e925ed9dad..000000000000 --- a/Documentation/devicetree/bindings/media/i2c/ov2680.txt +++ /dev/null @@ -1,46 +0,0 @@ -* Omnivision OV2680 MIPI CSI-2 sensor - -Required Properties: -- compatible: should be "ovti,ov2680". -- clocks: reference to the xvclk input clock. -- clock-names: should be "xvclk". -- DOVDD-supply: Digital I/O voltage supply. -- DVDD-supply: Digital core voltage supply. -- AVDD-supply: Analog voltage supply. - -Optional Properties: -- reset-gpios: reference to the GPIO connected to the powerdown/reset pin, - if any. This is an active low signal to the OV2680. - -The device node must contain one 'port' child node for its digital output -video port, and this port must have a single endpoint in accordance with - the video interface bindings defined in -Documentation/devicetree/bindings/media/video-interfaces.txt. - -Endpoint node required properties for CSI-2 connection are: -- remote-endpoint: a phandle to the bus receiver's endpoint node. -- clock-lanes: should be set to <0> (clock lane on hardware lane 0). -- data-lanes: should be set to <1> (one CSI-2 lane supported). - -Example: - -&i2c2 { - ov2680: camera-sensor@36 { - compatible = "ovti,ov2680"; - reg = <0x36>; - clocks = <&osc>; - clock-names = "xvclk"; - reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; - DOVDD-supply = <&sw2_reg>; - DVDD-supply = <&sw2_reg>; - AVDD-supply = <®_peri_3p15v>; - - port { - ov2680_to_mipi: endpoint { - remote-endpoint = <&mipi_from_sensor>; - clock-lanes = <0>; - data-lanes = <1>; - }; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml new file mode 100644 index 000000000000..43bf749807e1 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml @@ -0,0 +1,99 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/i2c/ovti,ov2680.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Omnivision OV2680 CMOS Sensor + +maintainers: + - Rui Miguel Silva + +description: |- + The OV2680 color sensor is a low voltage, high performance 1/5 inch UXGA (2 + megapixel) CMOS image sensor that provides a single-chip UXGA (1600 x 1200) + camera. It provides full-frame, sub-sampled, or windowed 10-bit images in + various formats via the control of the Serial Camera Control Bus (SCCB) + interface. The OV2680 has an image array capable of operating at up to 30 + frames per second (fps) in UXGA resolution. + +properties: + compatible: + const: ovti,ov2680 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + const: xvclk + + reset-gpios: + description: + The phandle and specifier for the GPIO that controls sensor reset. + This corresponds to the hardware pin XSHUTDOWN which is physically + active low. + maxItems: 1 + + dovdd-supply: + description: + Definition of the regulator used as interface power supply. + + avdd-supply: + description: + Definition of the regulator used as analog power supply. + + dvdd-supply: + description: + Definition of the regulator used as digital power supply. + + port: + type: object + description: + A node containing an output port node with an endpoint definition + as documented in + Documentation/devicetree/bindings/media/video-interfaces.txt + +required: + - compatible + - reg + - clocks + - clock-names + - dovdd-supply + - avdd-supply + - dvdd-supply + - reset-gpios + - port + +additionalProperties: false + +examples: + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ov2680: camera-sensor@36 { + compatible = "ovti,ov2680"; + reg = <0x36>; + clocks = <&osc>; + clock-names = "xvclk"; + reset-gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + + dovdd-supply = <&sw2_reg>; + dvdd-supply = <&sw2_reg>; + avdd-supply = <®_peri_3p15v>; + + port { + ov2680_to_mipi: endpoint { + remote-endpoint = <&mipi_from_sensor>; + }; + }; + }; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index f2757c6068e3..2cb2a5c60a1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12781,7 +12781,7 @@ M: Rui Miguel Silva L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git -F: Documentation/devicetree/bindings/media/i2c/ov2680.txt +F: Documentation/devicetree/bindings/media/i2c/ov2680.yaml F: drivers/media/i2c/ov2680.c OMNIVISION OV2685 SENSOR DRIVER From patchwork Tue Oct 20 19:00:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 11847671 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 74CE114B4 for ; Tue, 20 Oct 2020 19:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E67F2225F for ; Tue, 20 Oct 2020 19:01:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VN+AL05H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437913AbgJTTBf (ORCPT ); Tue, 20 Oct 2020 15:01:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390864AbgJTTBf (ORCPT ); Tue, 20 Oct 2020 15:01:35 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A07CCC0613CE; Tue, 20 Oct 2020 12:01:34 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id y12so3561108wrp.6; Tue, 20 Oct 2020 12:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=grGm9RnPrgjuYxcel2QgBtgp0qVpOagR72abqGZuq0s=; b=VN+AL05Hi98bj6gN6OStd1f4kdxwSNcwyLgPCPqyvfedA5ayM1joP/UE1UrMzGEBxR 8SvtQPLhPugALbqOlv8PshZynBPSz1NwXB6iXuVcg6SWSlgJ2mfJS3PTz1vL1Ve0gQCV D/qqRGjKWAx1L74nxbqcZT8OU5HmMSfDpTIaCD14qlT0WzKyDIEni5wUqAVoo3+3iqnd unXmeuPgq6nPNcdt2twocOYBC/E3hVN04FB9cwSpmYLAzfO0d0vQJh1jMrzX8VVlC8dh vI3eDazcvg/0cL2CqwodvAeNWfKlL/SizQhv6u+LNA592aT7QHn5Lz1uVPc4qaIvjzae KGBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=grGm9RnPrgjuYxcel2QgBtgp0qVpOagR72abqGZuq0s=; b=h1Whx/m3qeyZlk4nd3sc/JTRJsG8K/IWy3uH0gtIf/g1vBAdYMlfz1aQAwocYdC3Aj 2rbfdl/4eEfrUsuqSyibaeDtgYJ2RrYBBmvuOcP/GpjiNZWRwdyM4yxlwrDzdyVkvMYO Mf8rGIWm6U63G224r9Y6ZrGdDzjVCfp5bcj3g9v49vnV5+Bdy6oV2AN2o0Tr5LfQqhEN iEuoB+yePco70loW9upwrzsnxNLzKokNiniCyGG/643T50ob+XgiaetOgIVAC226Pvw6 eJqXd23coBjq5wRUQyp4fycnMwRytpXcQJscJ3jRdQoWrf4lwNjYw3WL2DAgV+YyzVpj iheA== X-Gm-Message-State: AOAM532eiEVKA4DPJSFD4V/f3q1wR6FSw7SCqkGH1J1mTAzhd2jBuxVk 09iRuB4m+iGPhLCdnSadSZg= X-Google-Smtp-Source: ABdhPJwEeDWRZ6qzORbusR8f6kwhv247kojQvQaCxBIiNALL89N8gptmhpiERapgMEgREjrS9pgp7A== X-Received: by 2002:adf:bc0f:: with SMTP id s15mr5161730wrg.83.1603220493334; Tue, 20 Oct 2020 12:01:33 -0700 (PDT) Received: from arch-thunder.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id c18sm4279289wrq.5.2020.10.20.12.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 12:01:32 -0700 (PDT) From: Rui Miguel Silva To: Rob Herring , sakari.ailus@linux.intel.com, Hans Verkuil , Jacopo Mondi Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Rui Miguel Silva , Jacopo Mondi Subject: [PATCH v5 2/3] dt-bindings: imx7-csi: convert bindings to yaml Date: Tue, 20 Oct 2020 20:00:50 +0100 Message-Id: <20201020190051.1852778-3-rmfrfs@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020190051.1852778-1-rmfrfs@gmail.com> References: <20201020190051.1852778-1-rmfrfs@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Convert imx7-csi bindings documentation to yaml schema, remove the textual bindings document and update MAINTAINERS entry. Signed-off-by: Rui Miguel Silva Reviewed-by: Jacopo Mondi --- .../devicetree/bindings/media/imx7-csi.txt | 42 ----------- .../bindings/media/nxp,imx7-csi.yaml | 71 +++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 72 insertions(+), 43 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/imx7-csi.txt create mode 100644 Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt deleted file mode 100644 index d80ceefa0c00..000000000000 --- a/Documentation/devicetree/bindings/media/imx7-csi.txt +++ /dev/null @@ -1,42 +0,0 @@ -Freescale i.MX7 CMOS Sensor Interface -===================================== - -csi node --------- - -This is device node for the CMOS Sensor Interface (CSI) which enables the chip -to connect directly to external CMOS image sensors. - -Required properties: - -- compatible : "fsl,imx7-csi" or "fsl,imx6ul-csi"; -- reg : base address and length of the register set for the device; -- interrupts : should contain CSI interrupt; -- clocks : list of clock specifiers, see - Documentation/devicetree/bindings/clock/clock-bindings.txt for details; -- clock-names : must contain "mclk"; - -The device node shall contain one 'port' child node with one child 'endpoint' -node, according to the bindings defined in: -Documentation/devicetree/bindings/media/video-interfaces.txt. - -In the following example a remote endpoint is a video multiplexer. - -example: - - csi: csi@30710000 { - #address-cells = <1>; - #size-cells = <0>; - - compatible = "fsl,imx7-csi"; - reg = <0x30710000 0x10000>; - interrupts = ; - clocks = <&clks IMX7D_CSI_MCLK_ROOT_CLK>; - clock-names = "mclk"; - - port { - csi_from_csi_mux: endpoint { - remote-endpoint = <&csi_mux_to_csi>; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml b/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml new file mode 100644 index 000000000000..4e81a47e60ac --- /dev/null +++ b/Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/nxp,imx7-csi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: i.MX7 CMOS Sensor Interface + +maintainers: + - Rui Miguel Silva + +description: | + This is device node for the CMOS Sensor Interface (CSI) which enables the + chip to connect directly to external CMOS image sensors. + +properties: + compatible: + enum: + - fsl,imx7-csi + - fsl,imx6ul-csi + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: mclk + + port: + type: object + description: + A node containing input port nodes with endpoint definitions as documented + in Documentation/devicetree/bindings/media/video-interfaces.txt + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - port + +additionalProperties: false + +examples: + - | + #include + #include + #include + + csi: csi@30710000 { + compatible = "fsl,imx7-csi"; + reg = <0x30710000 0x10000>; + interrupts = ; + clocks = <&clks IMX7D_CSI_MCLK_ROOT_CLK>; + clock-names = "mclk"; + + port { + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index 2cb2a5c60a1d..557713b3ee95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10779,8 +10779,8 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/admin-guide/media/imx7.rst -F: Documentation/devicetree/bindings/media/imx7-csi.txt F: Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt +F: Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml F: drivers/staging/media/imx/imx7-media-csi.c F: drivers/staging/media/imx/imx7-mipi-csis.c From patchwork Tue Oct 20 19:00:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 11847673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF10B15E6 for ; Tue, 20 Oct 2020 19:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CC6C223BF for ; Tue, 20 Oct 2020 19:01:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WDd66w/u" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437919AbgJTTBh (ORCPT ); Tue, 20 Oct 2020 15:01:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390864AbgJTTBh (ORCPT ); Tue, 20 Oct 2020 15:01:37 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A5D0C0613CE; Tue, 20 Oct 2020 12:01:37 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j7so3540739wrt.9; Tue, 20 Oct 2020 12:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U4wNI9JFpYvzYb3idIIZ8E1r/6Vwfi1UxqOJWcIgtWs=; b=WDd66w/uQBLRZzdw2jq38ZihbY64DXF72lZd1T9I7volW4/JxFBE3iCwh5LO704Rf6 d3WHRctuQ4Cj2HkwsTfzb25WtE6SGcC3tIwXtoCu1Beed32AgeoKYMMG4voLYQBzld3g d5mk/29juIO6GTteX/u71VroXl/Dy6HU4ifIvPHoauUIpUq2DewhR0E3aprCapHkjsSX kb40h5WBaTYWSjbDRRDPqxijzUGfa/3Woc2kgJWi01+BGSdpguOY9kBYbukgnzLhOy5z P+VgkplwE5DVlo4JM5XH/9hPth8uncBKv5zyC7/K+rG+W6fWM1uUt3VvQ3CEQzs791DZ I4+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U4wNI9JFpYvzYb3idIIZ8E1r/6Vwfi1UxqOJWcIgtWs=; b=BvvaexSO5gHZWgldVZo6lNZXvDh3+1UXx26iWmOPujk5LdBTlIi3e21lMlGrjlL0VX goWHFa7w8dEmyI9r3dvTlrQI/bDBNn1w6UVSP/lrXk124/9+tDCpUm6IeWRjasRAEWGt pjK44jtuG70xhVXdhSBHGvidla6xy26ZikWumxzXUyI5j3svQYh4zKtMw7zLTlKi+wXr sFlvJ/a1G2fYI47jNMrTUwThIZe53sYAqGqurAnDPaSWKghaBxLn0lBLFqzW/nvcxAz+ MmauUpUg2ybnHy7dlHY+VMAZAov81fmtJJiF0eP0Op5YQ/axtvGt9cRY2XKwtwKTqh8k xKnA== X-Gm-Message-State: AOAM530DVuBawOAUPjBo9E3isUi6EnyAjWC6+gxoGZOMdvNHNzGmLyKI lY0Xy+1jG+l4O5yXvrrTLGU= X-Google-Smtp-Source: ABdhPJzpp2X1mvSTTYp8zN9i9Xngrqt8k/fvTsLLKfL0uoMT+r5Mba4cuK81ubXJtukJG+n078Ld0w== X-Received: by 2002:a5d:458c:: with SMTP id p12mr5043552wrq.329.1603220495709; Tue, 20 Oct 2020 12:01:35 -0700 (PDT) Received: from arch-thunder.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id c18sm4279289wrq.5.2020.10.20.12.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 12:01:35 -0700 (PDT) From: Rui Miguel Silva To: Rob Herring , sakari.ailus@linux.intel.com, Hans Verkuil , Jacopo Mondi Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, Rui Miguel Silva Subject: [PATCH v5 3/3] dt-bindings: imx7-mipi-csi2: convert bindings to yaml Date: Tue, 20 Oct 2020 20:00:51 +0100 Message-Id: <20201020190051.1852778-4-rmfrfs@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020190051.1852778-1-rmfrfs@gmail.com> References: <20201020190051.1852778-1-rmfrfs@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Convert imx7 mipi csi2 bindings documentation to yaml schema, remove the textual document and update MAINTAINERS entry. Signed-off-by: Rui Miguel Silva Reviewed-by: Jacopo Mondi Reviewed-by: Jacopo Mondi --- v4 -> v5: Rob Herring: https://lore.kernel.org/linux-media/20201020153044.GA875273@bogus/ - fix indentation of oneOf items const .../bindings/media/imx7-mipi-csi2.txt | 90 --------- .../bindings/media/nxp,imx7-mipi-csi2.yaml | 172 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 173 insertions(+), 91 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt create mode 100644 Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml diff --git a/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt b/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt deleted file mode 100644 index 71fd74ed3ec8..000000000000 --- a/Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt +++ /dev/null @@ -1,90 +0,0 @@ -Freescale i.MX7 Mipi CSI2 -========================= - -mipi_csi2 node --------------- - -This is the device node for the MIPI CSI-2 receiver core in i.MX7 SoC. It is -compatible with previous version of Samsung D-phy. - -Required properties: - -- compatible : "fsl,imx7-mipi-csi2"; -- reg : base address and length of the register set for the device; -- interrupts : should contain MIPI CSIS interrupt; -- clocks : list of clock specifiers, see - Documentation/devicetree/bindings/clock/clock-bindings.txt for details; -- clock-names : must contain "pclk", "wrap" and "phy" entries, matching - entries in the clock property; -- power-domains : a phandle to the power domain, see - Documentation/devicetree/bindings/power/power_domain.txt for details. -- reset-names : should include following entry "mrst"; -- resets : a list of phandle, should contain reset entry of - reset-names; -- phy-supply : from the generic phy bindings, a phandle to a regulator that - provides power to MIPI CSIS core; - -Optional properties: - -- clock-frequency : The IP's main (system bus) clock frequency in Hz, default - value when this property is not specified is 166 MHz; -- fsl,csis-hs-settle : differential receiver (HS-RX) settle time; - -The device node should contain two 'port' child nodes with one child 'endpoint' -node, according to the bindings defined in: - Documentation/devicetree/bindings/ media/video-interfaces.txt. - The following are properties specific to those nodes. - -port node ---------- - -- reg : (required) can take the values 0 or 1, where 0 shall be - related to the sink port and port 1 shall be the source - one; - -endpoint node -------------- - -- data-lanes : (required) an array specifying active physical MIPI-CSI2 - data input lanes and their mapping to logical lanes; this - shall only be applied to port 0 (sink port), the array's - content is unused only its length is meaningful, - in this case the maximum length supported is 2; - -example: - - mipi_csi: mipi-csi@30750000 { - #address-cells = <1>; - #size-cells = <0>; - - compatible = "fsl,imx7-mipi-csi2"; - reg = <0x30750000 0x10000>; - interrupts = ; - clocks = <&clks IMX7D_IPG_ROOT_CLK>, - <&clks IMX7D_MIPI_CSI_ROOT_CLK>, - <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; - clock-names = "pclk", "wrap", "phy"; - clock-frequency = <166000000>; - power-domains = <&pgc_mipi_phy>; - phy-supply = <®_1p0d>; - resets = <&src IMX7_RESET_MIPI_PHY_MRST>; - reset-names = "mrst"; - fsl,csis-hs-settle = <3>; - - port@0 { - reg = <0>; - - mipi_from_sensor: endpoint { - remote-endpoint = <&ov2680_to_mipi>; - data-lanes = <1>; - }; - }; - - port@1 { - reg = <1>; - - mipi_vc0_to_csi_mux: endpoint { - remote-endpoint = <&csi_mux_from_mipi_vc0>; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml b/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml new file mode 100644 index 000000000000..309af5805d74 --- /dev/null +++ b/Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml @@ -0,0 +1,172 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/nxp,imx7-mipi-csi2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: NXP i.MX7 Mipi CSI2 + +maintainers: + - Rui Miguel Silva + +description: | + This is the device node for the mipi csi-2 receiver core in i.mx7 soc. It is + compatible with previous version of samsung d-phy. + +properties: + compatible: + const: fsl,imx7-mipi-csi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 3 + + clock-names: + items: + - const: pclk + - const: wrap + - const: phy + + power-domains: + maxItems: 1 + + phy-supply: + description: + Phandle to a regulator that provides power to the PHY. This + regulator will be managed during the PHY power on/off sequence. + + resets: + maxItems: 1 + + reset-names: + const: mrst + + clock-frequency: + description: + The IP main (system bus) clock frequency in Hertz + default: 166000000 + + fsl,csis-hs-settle: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Differential receiver (HS-RX) settle time + + ports: + type: object + description: + A node containing input and output port nodes with endpoint definitions + as documented in + Documentation/devicetree/bindings/media/video-interfaces.txt + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + port@0: + type: object + description: + Input port node, single endpoint describing the CSI-2 transmitter. + + properties: + reg: + const: 0 + + endpoint: + type: object + + properties: + data-lanes: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: See ../video-interfaces.txt + oneOf: + - items: + - const: 1 + - items: + - const: 1 + - const: 2 + + remote-endpoint: true + + required: + - data-lanes + - remote-endpoint + + additionalProperties: false + + additionalProperties: false + + port@1: + type: object + description: + Output port node + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - power-domains + - phy-supply + - resets + - reset-names + - ports + +additionalProperties: false + +examples: + - | + #include + #include + #include + #include + + mipi_csi: mipi-csi@30750000 { + compatible = "fsl,imx7-mipi-csi2"; + reg = <0x30750000 0x10000>; + interrupts = ; + + clocks = <&clks IMX7D_IPG_ROOT_CLK>, + <&clks IMX7D_MIPI_CSI_ROOT_CLK>, + <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; + clock-names = "pclk", "wrap", "phy"; + clock-frequency = <166000000>; + + power-domains = <&pgc_mipi_phy>; + phy-supply = <®_1p0d>; + resets = <&src IMX7_RESET_MIPI_PHY_MRST>; + reset-names = "mrst"; + fsl,csis-hs-settle = <3>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mipi_from_sensor: endpoint { + remote-endpoint = <&ov2680_to_mipi>; + data-lanes = <1>; + }; + }; + + port@1 { + reg = <1>; + + mipi_vc0_to_csi_mux: endpoint { + remote-endpoint = <&csi_mux_from_mipi_vc0>; + }; + }; + }; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index 557713b3ee95..34e53a1570aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10779,8 +10779,8 @@ L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git F: Documentation/admin-guide/media/imx7.rst -F: Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt F: Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml +F: Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml F: drivers/staging/media/imx/imx7-media-csi.c F: drivers/staging/media/imx/imx7-mipi-csis.c