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 <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > >
> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> > >
> > > > > ---
> > > > > 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 <dt-bindings/media/video-interfaces.h>
> > > > > +
> > > > > #include "r8a7742-iwg21d-q7.dts"
> > > > >
> > > > > / {
> > > > > @@ -242,7 +245,7 @@ port {
> > > > > vin0ep: endpoint {
> > > > > remote-endpoint = <&cam0ep>;
> > > > > bus-width = <8>;
> > > > > - bus-type = <6>;
> > > > > + bus-type = <MEDIA_BUS_TYPE_BT656>;
> > > > > };
> > > > > };
> > > > > };
> > > > > @@ -273,7 +276,7 @@ port {
> > > > > vin1ep: endpoint {
> > > > > remote-endpoint = <&cam1ep>;
> > > > > bus-width = <8>;
> > > > > - bus-type = <6>;
> > > > > + bus-type = <MEDIA_BUS_TYPE_BT656>;
> > > > > };
> > > > > };
> > > > > };
> > > > > @@ -305,7 +308,7 @@ vin2ep: endpoint {
> > > > > remote-endpoint = <&cam2ep>;
> > > > > bus-width = <8>;
> > > > > data-shift = <8>;
> > > > > - bus-type = <6>;
> > > > > + bus-type = <MEDIA_BUS_TYPE_BT656>;
> > > > > };
> > > > > };
> > > > > };
> > > > > @@ -335,7 +338,7 @@ port {
> > > > > vin3ep: endpoint {
> > > > > remote-endpoint = <&cam3ep>;
> > > > > bus-width = <8>;
> > > > > - bus-type = <6>;
> > > > > + bus-type = <MEDIA_BUS_TYPE_BT656>;
> > > > > };
> > > > > };
> > > > > };
> > > > > 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 <dt-bindings/media/video-interfaces.h>
> > >
> > > 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
