From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39F6AC433F5 for ; Thu, 7 Apr 2022 13:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238358AbiDGNxb (ORCPT ); Thu, 7 Apr 2022 09:53:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233540AbiDGNxa (ORCPT ); Thu, 7 Apr 2022 09:53:30 -0400 Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50487DB2F9; Thu, 7 Apr 2022 06:51:27 -0700 (PDT) Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 237Apvew000610; Thu, 7 Apr 2022 15:50:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=DeX3F7rQwgZttJ4OMZBXInnYsmGXSs5NIMQvoJGc/JM=; b=vGfzWyyvQWd5kmNdsQm1GVP2POpJAbdtBBuyzhokMsaOPnssnRMYG6Hol/dn7H15VRYP a7KW+CTm1I458Wimuxy45Mz/K0sQGH87ymPnBxQ0bfTjr6TIi4CwXi/wrRAQsoJTmuos N311Noklf8IJ3o9nqqvEgX9RdVVBy3Xr6GGDWvPaL/TXOaNZLokxdp/Nz8qoIkFhqZlB R2WhLoJQwBuWQnkPPPziSCcxCM42jNpJDb59uNRQ0+92hMJ1s2TjsT0XF6CPMDCMdxo3 zm56fvkuLW5xznQJa+U0pdLeTZoxIR4KWUMKDfsTpXy2jqtE6kLBAZMzbJsgxuX5436q +Q== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3f9wr7hdwg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Apr 2022 15:50:52 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 25DA210002A; Thu, 7 Apr 2022 15:50:50 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id BC581215133; Thu, 7 Apr 2022 15:50:50 +0200 (CEST) Received: from [10.48.0.142] (10.75.127.44) by SHFDAG1NODE1.st.com (10.75.129.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Thu, 7 Apr 2022 15:50:50 +0200 Message-ID: Date: Thu, 7 Apr 2022 15:50:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v2 3/3] ARM: dts: Use new media bus type macros Content-Language: en-US To: Laurent Pinchart CC: , , , , Rob Herring , Sakari Ailus , Jacopo Mondi , Eugen Hristev , Hugues Fruchet , Maxime Coquelin , Lad Prabhakar , Fabio Estevam , Shawn Guo References: <20220306173905.22990-1-laurent.pinchart@ideasonboard.com> <20220306173905.22990-4-laurent.pinchart@ideasonboard.com> <6824a158-9837-c61d-cbf9-c8a2ca46110e@foss.st.com> From: Alexandre TORGUE In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.44] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SHFDAG1NODE1.st.com (10.75.129.69) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.850,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-04-07_02,2022-04-07_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 4/7/22 15:31, Laurent Pinchart wrote: > Hi Alexandre, > > On Thu, Apr 07, 2022 at 02:41:58PM +0200, Alexandre TORGUE wrote: >> On 3/6/22 18:39, Laurent Pinchart wrote: >>> Now that a header exists with macros for the media interface bus-type >>> values, replace hardcoding numerical constants with the corresponding >>> macros in the DT sources. >>> >>> Signed-off-by: Laurent Pinchart >>> --- >>> arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 +++- >>> arch/arm/boot/dts/omap3-n900.dts | 5 +++-- >>> arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 11 +++++++---- >>> .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 4 +++- >>> .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 4 +++- >>> arch/arm/boot/dts/stm32429i-eval.dts | 3 ++- >>> arch/arm/boot/dts/stm32mp157c-ev1.dts | 3 ++- >>> 7 files changed, 23 insertions(+), 11 deletions(-) >> >> sorry for this late answer. Is it possible to split ARM DT patches by >> vendor ? > > Sure. Is that only to ease backporting, or do you want the ST part to be > merged through a different tree ? I usually take all STM32 DT patches in my stm32-next branch. It's to avoid merge issue at arm-soc maintainer level. thanks alex >>> diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi >>> index a3fde3316c73..89234bbd02f4 100644 >>> --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi >>> +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi >>> @@ -2,6 +2,8 @@ >>> // >>> // Copyright (C) 2015 Freescale Semiconductor, Inc. >>> >>> +#include >>> + >>> / { >>> chosen { >>> stdout-path = &uart1; >>> @@ -170,7 +172,7 @@ &csi { >>> port { >>> parallel_from_ov5640: endpoint { >>> remote-endpoint = <&ov5640_to_parallel>; >>> - bus-type = <5>; /* Parallel bus */ >>> + bus-type = ; >>> }; >>> }; >>> }; >>> diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts >>> index d40c3d2c4914..9cad9d6a83e2 100644 >>> --- a/arch/arm/boot/dts/omap3-n900.dts >>> +++ b/arch/arm/boot/dts/omap3-n900.dts >>> @@ -9,6 +9,7 @@ >>> #include "omap34xx.dtsi" >>> #include >>> #include >>> +#include >>> >>> /* >>> * Default secure signed bootloader (Nokia X-Loader) does not enable L3 firewall >>> @@ -194,7 +195,7 @@ port@1 { >>> >>> csi_isp: endpoint { >>> remote-endpoint = <&csi_cam1>; >>> - bus-type = <3>; /* CCP2 */ >>> + bus-type = ; >>> clock-lanes = <1>; >>> data-lanes = <0>; >>> lane-polarity = <0 0>; >>> @@ -835,7 +836,7 @@ cam1: camera@3e { >>> >>> port { >>> csi_cam1: endpoint { >>> - bus-type = <3>; /* CCP2 */ >>> + bus-type = ; >>> strobe = <1>; >>> clock-inv = <0>; >>> crc = <1>; >>> diff --git a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts >>> index 3c8a7c8b1fdd..1043603fc4a5 100644 >>> --- a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts >>> +++ b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts >>> @@ -7,6 +7,9 @@ >>> */ >>> >>> /dts-v1/; >>> + >>> +#include >>> + >>> #include "r8a7742-iwg21d-q7.dts" >>> >>> / { >>> @@ -242,7 +245,7 @@ port { >>> vin0ep: endpoint { >>> remote-endpoint = <&cam0ep>; >>> bus-width = <8>; >>> - bus-type = <6>; >>> + bus-type = ; >>> }; >>> }; >>> }; >>> @@ -273,7 +276,7 @@ port { >>> vin1ep: endpoint { >>> remote-endpoint = <&cam1ep>; >>> bus-width = <8>; >>> - bus-type = <6>; >>> + bus-type = ; >>> }; >>> }; >>> }; >>> @@ -305,7 +308,7 @@ vin2ep: endpoint { >>> remote-endpoint = <&cam2ep>; >>> bus-width = <8>; >>> data-shift = <8>; >>> - bus-type = <6>; >>> + bus-type = ; >>> }; >>> }; >>> }; >>> @@ -335,7 +338,7 @@ port { >>> vin3ep: endpoint { >>> remote-endpoint = <&cam3ep>; >>> bus-width = <8>; >>> - bus-type = <6>; >>> + bus-type = ; >>> }; >>> }; >>> }; >>> diff --git a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi >>> index 40cef0b1d1e6..c73160df619d 100644 >>> --- a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi >>> +++ b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi >>> @@ -7,6 +7,8 @@ >>> * Copyright (C) 2020 Renesas Electronics Corp. >>> */ >>> >>> +#include >>> + >>> #define CAM_ENABLED 1 >>> >>> &CAM_PARENT_I2C { >>> @@ -26,7 +28,7 @@ port { >>> CAM_EP: endpoint { >>> bus-width = <8>; >>> data-shift = <2>; >>> - bus-type = <6>; >>> + bus-type = ; >>> pclk-sample = <1>; >>> remote-endpoint = <&VIN_EP>; >>> }; >>> diff --git a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi >>> index f5e77f024251..a7f5cfec64b8 100644 >>> --- a/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi >>> +++ b/arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi >>> @@ -7,6 +7,8 @@ >>> * Copyright (C) 2020 Renesas Electronics Corp. >>> */ >>> >>> +#include >>> + >>> #define CAM_ENABLED 1 >>> >>> &CAM_PARENT_I2C { >>> @@ -21,7 +23,7 @@ ov7725@21 { >>> port { >>> CAM_EP: endpoint { >>> bus-width = <8>; >>> - bus-type = <6>; >>> + bus-type = ; >>> remote-endpoint = <&VIN_EP>; >>> }; >>> }; >>> diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts >>> index cb46326a8c75..ecb10613d962 100644 >>> --- a/arch/arm/boot/dts/stm32429i-eval.dts >>> +++ b/arch/arm/boot/dts/stm32429i-eval.dts >>> @@ -50,6 +50,7 @@ >>> #include "stm32f429-pinctrl.dtsi" >>> #include >>> #include >>> +#include >>> >>> / { >>> model = "STMicroelectronics STM32429i-EVAL board"; >>> @@ -186,7 +187,7 @@ &dcmi { >>> port { >>> dcmi_0: endpoint { >>> remote-endpoint = <&ov2640_0>; >>> - bus-type = <5>; >>> + bus-type = ; >>> bus-width = <8>; >>> hsync-active = <0>; >>> vsync-active = <0>; >>> diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts >>> index e222d2d2cb44..24f59f3b15dc 100644 >>> --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts >>> +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts >>> @@ -8,6 +8,7 @@ >>> #include "stm32mp157c-ed1.dts" >>> #include >>> #include >>> +#include >>> >>> / { >>> model = "STMicroelectronics STM32MP157C eval daughter on eval mother"; >>> @@ -90,7 +91,7 @@ &dcmi { >>> port { >>> dcmi_0: endpoint { >>> remote-endpoint = <&ov5640_0>; >>> - bus-type = <5>; >>> + bus-type = ; >>> bus-width = <8>; >>> hsync-active = <0>; >>> vsync-active = <0>; >