From patchwork Fri Jul 17 13:28:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11670183 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 84995159A for ; Fri, 17 Jul 2020 13:25:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 708C62067D for ; Fri, 17 Jul 2020 13:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726617AbgGQNZv (ORCPT ); Fri, 17 Jul 2020 09:25:51 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:41171 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726201AbgGQNZv (ORCPT ); Fri, 17 Jul 2020 09:25:51 -0400 X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 9746A1C000D; Fri, 17 Jul 2020 13:25:42 +0000 (UTC) From: Jacopo Mondi To: robh+dt@kernel.org, devicetree@vger.kernel.org Cc: Jacopo Mondi , slongerbeam@gmail.com, linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, linux-renesas-soc@vger.kernel.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , linux-omap@vger.kernel.org, Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com (moderated list:ARM/STM32 ARCHITECTURE), Maxime Ripard , Chen-Yu Tsai , Andy Gross , Bjorn Andersson , Tero Kristo , Nishanth Menon Subject: [PATCH 05/13] dt-bindings: media: ov5640: Make bus-type mandatory Date: Fri, 17 Jul 2020 15:28:51 +0200 Message-Id: <20200717132859.237120-6-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717132859.237120-1-jacopo+renesas@jmondi.org> References: <20200717132859.237120-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The ov5640 driver supports both a parallel data interface and a CSI-2 serial data interface. Depending on which interface is in use, the required endpoint properties are different. In order to be able to validate if a device node is compliant with the dt-schema bindings, start by making the bus-type a mandatory property, and add it to all the existing users of ov5640 in mainline DTS. On top of this, endpoint properties validation will be implemented, conditionally to the reported bus type. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- Documentation/devicetree/bindings/media/i2c/ov5640.yaml | 6 ++++++ arch/arm/boot/dts/dra72-evm-common.dtsi | 1 + arch/arm/boot/dts/dra76-evm.dts | 1 + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 1 + arch/arm/boot/dts/imx6qdl-icore.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 + arch/arm/boot/dts/stm32mp157c-ev1.dts | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts | 1 + arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 1 + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 + 12 files changed, 17 insertions(+) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/media/i2c/ov5640.yaml b/Documentation/devicetree/bindings/media/i2c/ov5640.yaml index 503f8b78615c..16e6c2dc629a 100644 --- a/Documentation/devicetree/bindings/media/i2c/ov5640.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ov5640.yaml @@ -73,6 +73,9 @@ properties: remote-endpoint: description: A phandle to the bus receiver's endpoint node. + bus-type: + enum: [4, 5] + clock-lanes: const: 0 @@ -109,6 +112,7 @@ properties: required: - remote-endpoint + - bus-type additionalProperties: false @@ -146,6 +150,7 @@ examples: port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_from_ov5640>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; @@ -172,6 +177,7 @@ examples: port { ov5640_to_parallel: endpoint { remote-endpoint = <¶llel_from_ov5640>; + bus-type = <5>; bus-width = <10>; }; }; diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi index c84b63bf0fc8..aba7eb55525d 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -287,6 +287,7 @@ ov5640@3c { port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts index 820a0ece20d4..ddf16e65ec7f 100644 --- a/arch/arm/boot/dts/dra76-evm.dts +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -420,6 +420,7 @@ ov5640@3c { port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi index 9e027b9a5f91..dd5765778e87 100644 --- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi +++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi @@ -274,6 +274,7 @@ ov5640: camera@10 { port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi index 756f3a9f1b4f..2b1f275b8cc4 100644 --- a/arch/arm/boot/dts/imx6qdl-icore.dtsi +++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi @@ -213,6 +213,7 @@ ov5640: camera@3c { port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index 8468216dae9b..5752abb48e68 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -382,6 +382,7 @@ ov5640: camera@40 { port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 28b35ccb3757..990f4cc345da 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -313,6 +313,7 @@ rev B board is VGEN5 */ port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts index b19056557ef0..613ede73b65b 100644 --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts @@ -190,6 +190,7 @@ ov5640: camera@3c { port { ov5640_0: endpoint { remote-endpoint = <&dcmi_0>; + bus-type = <5>; bus-width = <8>; data-shift = <2>; /* lines 9:2 are used */ hsync-active = <0>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts index c7bd73f35ed8..6ef528bb5564 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts @@ -46,6 +46,7 @@ ov5640: camera@3c { port { ov5640_ep: endpoint { remote-endpoint = <&csi_ep>; + bus-type = <5>; bus-width = <8>; hsync-active = <1>; /* Active high */ vsync-active = <0>; /* Active low */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts index dc4ab6b434f9..8ebd6547786e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts @@ -61,6 +61,7 @@ ov5640: camera@3c { port { ov5640_ep: endpoint { remote-endpoint = <&csi_ep>; + bus-type = <5>; bus-width = <8>; hsync-active = <1>; /* Active high */ vsync-active = <0>; /* Active low */ diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index fe6613676e45..5c79ad5e7b5d 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -627,6 +627,7 @@ camera_rear@3b { port { ov5640_ep: endpoint { + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; remote-endpoint = <&csiphy0_ep>; diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts index 2f3d3316a1cf..33f4eceffbe5 100644 --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts @@ -254,6 +254,7 @@ ov5640@3c { port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; + bus-type = <4>; clock-lanes = <0>; data-lanes = <1 2>; }; From patchwork Fri Jul 17 13:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11670189 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 ECC91159A for ; Fri, 17 Jul 2020 13:25:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA3212076D for ; Fri, 17 Jul 2020 13:25:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726694AbgGQNZ4 (ORCPT ); Fri, 17 Jul 2020 09:25:56 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:56803 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726580AbgGQNZ4 (ORCPT ); Fri, 17 Jul 2020 09:25:56 -0400 X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 0DDAB1C000C; Fri, 17 Jul 2020 13:25:49 +0000 (UTC) From: Jacopo Mondi To: robh+dt@kernel.org, devicetree@vger.kernel.org Cc: Jacopo Mondi , slongerbeam@gmail.com, linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, linux-renesas-soc@vger.kernel.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Tony Lindgren , linux-omap@vger.kernel.org, Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com (moderated list:ARM/STM32 ARCHITECTURE), Maxime Ripard , Chen-Yu Tsai , Andy Gross , Bjorn Andersson , Tero Kristo , Nishanth Menon Subject: [PATCH 07/13] dt-bindings: media: ov5640: Remove clock-lanes Date: Fri, 17 Jul 2020 15:28:53 +0200 Message-Id: <20200717132859.237120-8-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717132859.237120-1-jacopo+renesas@jmondi.org> References: <20200717132859.237120-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The ov5640 does not support routing the clock signal to a different lane, and the property has value fixed to 0. Remove the property from the bindings and update its users accordingly. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/media/i2c/ov5640.yaml | 6 ------ arch/arm/boot/dts/dra72-evm-common.dtsi | 1 - arch/arm/boot/dts/dra76-evm.dts | 1 - arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 1 - arch/arm/boot/dts/imx6qdl-icore.dtsi | 1 - arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 - arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 - arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 - arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 - 9 files changed, 14 deletions(-) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/media/i2c/ov5640.yaml b/Documentation/devicetree/bindings/media/i2c/ov5640.yaml index 8fd54575a1db..5e1662e848bd 100644 --- a/Documentation/devicetree/bindings/media/i2c/ov5640.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ov5640.yaml @@ -76,9 +76,6 @@ properties: bus-type: enum: [4, 5] - clock-lanes: - const: 0 - data-lanes: description: | Should be set to <1> or <1 2> (one or two CSI-2 lanes supported). @@ -125,7 +122,6 @@ properties: required: - remote-endpoint - bus-type - - clock-lanes - data-lanes - if: @@ -134,7 +130,6 @@ properties: const: 5 then: properties: - clock-lanes: false data-lanes: false required: - remote-endpoint @@ -182,7 +177,6 @@ examples: ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_from_ov5640>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi index aba7eb55525d..b5b31dc927d4 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -288,7 +288,6 @@ port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts index ddf16e65ec7f..6fcb96abc41d 100644 --- a/arch/arm/boot/dts/dra76-evm.dts +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -421,7 +421,6 @@ port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi index dd5765778e87..a12d80a2403e 100644 --- a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi +++ b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi @@ -275,7 +275,6 @@ port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi index 2b1f275b8cc4..05bd332f527b 100644 --- a/arch/arm/boot/dts/imx6qdl-icore.dtsi +++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi @@ -214,7 +214,6 @@ port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index 5752abb48e68..5eb7fbf33069 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -383,7 +383,6 @@ port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 990f4cc345da..02f78b46a8fd 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -314,7 +314,6 @@ port { ov5640_to_mipi_csi2: endpoint { remote-endpoint = <&mipi_csi2_in>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 5c79ad5e7b5d..8c24fd468a22 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -628,7 +628,6 @@ camera_rear@3b { port { ov5640_ep: endpoint { bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; remote-endpoint = <&csiphy0_ep>; }; diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts index 33f4eceffbe5..dd6a636ba3af 100644 --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts @@ -255,7 +255,6 @@ port { csi2_cam0: endpoint { remote-endpoint = <&csi2_phy0>; bus-type = <4>; - clock-lanes = <0>; data-lanes = <1 2>; }; };