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 096F2C677F1 for ; Mon, 16 Jan 2023 10:49:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbjAPKt0 (ORCPT ); Mon, 16 Jan 2023 05:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjAPKtY (ORCPT ); Mon, 16 Jan 2023 05:49:24 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B187D1714B; Mon, 16 Jan 2023 02:49:22 -0800 (PST) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EBE04802; Mon, 16 Jan 2023 11:49:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1673866161; bh=QPKbaBg15FIAAfwmoECrnTKED2vhulpywKn1lrKXHwQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rsA5uz9qrZPSpxqp6TK4pQviMeiZZ0RpR5R1xNmbXmObdIByNf0plUQnAoTpzwGNj PSQE1Fh0fK1GjZ0oR+CAEnITmGOsbwrgs//zvN3ENei9t61JeVVqe5LDRgR0Lhi2q6 4Gf4QXelvSnd430RTAICZbhE6AiPNRTrr/9NhjDY= Date: Mon, 16 Jan 2023 12:49:21 +0200 From: Laurent Pinchart To: Geert Uytterhoeven Cc: devicetree@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Rob Herring , Sakari Ailus , Jacopo Mondi , Eugen Hristev , Hugues Fruchet , Maxime Coquelin , Alexandre Torgue , Lad Prabhakar , Fabio Estevam , Shawn Guo , Linux-Renesas Subject: Re: [PATCH v3 5/6] ARM: dts: renesas: Use new media bus type macros Message-ID: References: <20220615221410.27459-1-laurent.pinchart@ideasonboard.com> <20220615221410.27459-6-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Mon, Jan 16, 2023 at 11:44:13AM +0100, Geert Uytterhoeven wrote: > On Mon, Jan 16, 2023 at 11:38 AM Laurent Pinchart wrote: > > On Mon, Jan 16, 2023 at 11:24:10AM +0100, Geert Uytterhoeven wrote: > > > On Sat, Jan 14, 2023 at 4:26 PM Laurent Pinchart wrote: > > > > Geert, could you please take this in your tree for v6.3 ? The two > > > > patches that the DT changes depend on have been merged in v6.2. > > > > > > Thank you, I had missed these. > > > > > > > On Thu, Jun 16, 2022 at 01:14:09AM +0300, 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 > > > > > > Reviewed-by: Geert Uytterhoeven > > > > > > > > --- > > > > > 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 +++- > > > > > 3 files changed, 13 insertions(+), 6 deletions(-) > > > > > > > > > > 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 4e58c54cde17..33ac4bd1e63b 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 > > > > > > This .dtsi file is only intended to be included by > > > arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts, which already has > > > the include. Hence if you don't mind, I would like to drop this part > > > while applying and queuing in renesas-devel for v6.3. > > > > Isn't it better to include headers as needed to avoid depending on > > indirect includes ? > > In general, I agree. > In this particular case, (the multiple inclusions of) the > r8a7742-iwg21d-q7-dbcm-ov*-single.dtsi files are tied very intimately > to r8a7742-iwg21d-q7-dbcm-ca.dts. I'd still prefer keeping the #include here, but you're the maintainer :-) -- Regards, Laurent Pinchart