| Message ID | 20220615221410.27459-3-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | c4cfd47eb4acefa593926c185db69eb56a0bc88b |
| Headers | show |
| Series | [v3,1/6] dt-bindings: media: Add macros for video interface bus types | expand |
On Thu, Jun 16, 2022 at 01:14:06AM +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 binding examples. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes since v2: > > - Go back to PARALLEL > > Changes since v1: > > - Rename PARALLEL to BT601 > --- > .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + > Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- > Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- > .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- > Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- > Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- > 6 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > index 35a48515836e..b0e5585f93e2 100644 > --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > @@ -118,6 +118,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/gpio/gpio.h> > + #include <dt-bindings/media/video-interfaces.h> > > i2c0 { > #address-cells = <1>; > diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > index 39395ea8c318..edde4201116f 100644 > --- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > +++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > @@ -104,6 +104,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/gpio/gpio.h> > + #include <dt-bindings/media/video-interfaces.h> > > i2c2 { > #address-cells = <1>; > @@ -124,7 +125,7 @@ examples: > remote-endpoint = <&csi2a_ep>; > link-frequencies = /bits/ 64 <199200000 210000000 > 499200000>; > - bus-type = <4>; > + bus-type = <MEDIA_BUS_TYPE_CSI2_DPHY>; > }; > }; > }; > diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > index 44529425ce3a..161e6d598e1c 100644 > --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > @@ -105,6 +105,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/gpio/gpio.h> > + #include <dt-bindings/media/video-interfaces.h> > > i2c0 { > #address-cells = <1>; > @@ -118,7 +119,7 @@ examples: > > port { > ov772x_0: endpoint { > - bus-type = <5>; > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > vsync-active = <0>; > hsync-active = <0>; > pclk-sample = <0>; > diff --git a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > index b39b84c5f012..0e3478551e13 100644 > --- a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > +++ b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > @@ -68,6 +68,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/clock/marvell,mmp2.h> > + #include <dt-bindings/media/video-interfaces.h> > #include <dt-bindings/power/marvell,mmp2.h> > > camera@d420a000 { > @@ -83,7 +84,7 @@ examples: > port { > camera0_0: endpoint { > remote-endpoint = <&ov7670_0>; > - bus-type = <5>; /* Parallel */ > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > hsync-active = <1>; /* Active high */ > vsync-active = <1>; /* Active high */ > pclk-sample = <0>; /* Falling */ > diff --git a/Documentation/devicetree/bindings/media/microchip,xisc.yaml b/Documentation/devicetree/bindings/media/microchip,xisc.yaml > index 8b37fccab5e2..25f5f79d40ce 100644 > --- a/Documentation/devicetree/bindings/media/microchip,xisc.yaml > +++ b/Documentation/devicetree/bindings/media/microchip,xisc.yaml > @@ -106,6 +106,7 @@ examples: > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/clock/at91.h> > #include <dt-bindings/interrupt-controller/irq.h> > + #include <dt-bindings/media/video-interfaces.h> > > xisc: xisc@e1408000 { > compatible = "microchip,sama7g5-isc"; > @@ -118,7 +119,7 @@ examples: > > port { > xisc_in: endpoint { > - bus-type = <5>; /* Parallel */ > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > remote-endpoint = <&csi2dc_out>; > hsync-active = <1>; > vsync-active = <1>; > diff --git a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > index 9c1262a276b5..285c6075950a 100644 > --- a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > +++ b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > @@ -90,7 +90,9 @@ examples: > - | > #include <dt-bindings/interrupt-controller/arm-gic.h> > #include <dt-bindings/clock/stm32mp1-clks.h> > + #include <dt-bindings/media/video-interfaces.h> > #include <dt-bindings/reset/stm32mp1-resets.h> > + # ? In any case, Reviewed-by: Rob Herring <robh@kernel.org> > dcmi: dcmi@4c006000 { > compatible = "st,stm32-dcmi"; > reg = <0x4c006000 0x400>; > @@ -104,7 +106,7 @@ examples: > port { > dcmi_0: endpoint { > remote-endpoint = <&ov5640_0>; > - bus-type = <5>; > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > bus-width = <8>; > hsync-active = <0>; > vsync-active = <0>; > -- > Regards, > > Laurent Pinchart > >
Hi Rob, On Mon, Jun 27, 2022 at 04:16:08PM -0600, Rob Herring wrote: > On Thu, Jun 16, 2022 at 01:14:06AM +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 binding examples. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > Changes since v2: > > > > - Go back to PARALLEL > > > > Changes since v1: > > > > - Rename PARALLEL to BT601 > > --- > > .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + > > Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- > > Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- > > .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- > > Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- > > Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- > > 6 files changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > index 35a48515836e..b0e5585f93e2 100644 > > --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > @@ -118,6 +118,7 @@ additionalProperties: false > > examples: > > - | > > #include <dt-bindings/gpio/gpio.h> > > + #include <dt-bindings/media/video-interfaces.h> > > > > i2c0 { > > #address-cells = <1>; > > diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > > index 39395ea8c318..edde4201116f 100644 > > --- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > > +++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml > > @@ -104,6 +104,7 @@ additionalProperties: false > > examples: > > - | > > #include <dt-bindings/gpio/gpio.h> > > + #include <dt-bindings/media/video-interfaces.h> > > > > i2c2 { > > #address-cells = <1>; > > @@ -124,7 +125,7 @@ examples: > > remote-endpoint = <&csi2a_ep>; > > link-frequencies = /bits/ 64 <199200000 210000000 > > 499200000>; > > - bus-type = <4>; > > + bus-type = <MEDIA_BUS_TYPE_CSI2_DPHY>; > > }; > > }; > > }; > > diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > > index 44529425ce3a..161e6d598e1c 100644 > > --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > > +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml > > @@ -105,6 +105,7 @@ additionalProperties: false > > examples: > > - | > > #include <dt-bindings/gpio/gpio.h> > > + #include <dt-bindings/media/video-interfaces.h> > > > > i2c0 { > > #address-cells = <1>; > > @@ -118,7 +119,7 @@ examples: > > > > port { > > ov772x_0: endpoint { > > - bus-type = <5>; > > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > > vsync-active = <0>; > > hsync-active = <0>; > > pclk-sample = <0>; > > diff --git a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > > index b39b84c5f012..0e3478551e13 100644 > > --- a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > > +++ b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml > > @@ -68,6 +68,7 @@ additionalProperties: false > > examples: > > - | > > #include <dt-bindings/clock/marvell,mmp2.h> > > + #include <dt-bindings/media/video-interfaces.h> > > #include <dt-bindings/power/marvell,mmp2.h> > > > > camera@d420a000 { > > @@ -83,7 +84,7 @@ examples: > > port { > > camera0_0: endpoint { > > remote-endpoint = <&ov7670_0>; > > - bus-type = <5>; /* Parallel */ > > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > > hsync-active = <1>; /* Active high */ > > vsync-active = <1>; /* Active high */ > > pclk-sample = <0>; /* Falling */ > > diff --git a/Documentation/devicetree/bindings/media/microchip,xisc.yaml b/Documentation/devicetree/bindings/media/microchip,xisc.yaml > > index 8b37fccab5e2..25f5f79d40ce 100644 > > --- a/Documentation/devicetree/bindings/media/microchip,xisc.yaml > > +++ b/Documentation/devicetree/bindings/media/microchip,xisc.yaml > > @@ -106,6 +106,7 @@ examples: > > #include <dt-bindings/interrupt-controller/arm-gic.h> > > #include <dt-bindings/clock/at91.h> > > #include <dt-bindings/interrupt-controller/irq.h> > > + #include <dt-bindings/media/video-interfaces.h> > > > > xisc: xisc@e1408000 { > > compatible = "microchip,sama7g5-isc"; > > @@ -118,7 +119,7 @@ examples: > > > > port { > > xisc_in: endpoint { > > - bus-type = <5>; /* Parallel */ > > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > > remote-endpoint = <&csi2dc_out>; > > hsync-active = <1>; > > vsync-active = <1>; > > diff --git a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > > index 9c1262a276b5..285c6075950a 100644 > > --- a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > > +++ b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml > > @@ -90,7 +90,9 @@ examples: > > - | > > #include <dt-bindings/interrupt-controller/arm-gic.h> > > #include <dt-bindings/clock/stm32mp1-clks.h> > > + #include <dt-bindings/media/video-interfaces.h> > > #include <dt-bindings/reset/stm32mp1-resets.h> > > + # > > ? Oops. I'll blame vim :-) I wonder why I didn't catch that when running validation. I'll fix it in any case. > In any case, > > Reviewed-by: Rob Herring <robh@kernel.org> > > > dcmi: dcmi@4c006000 { > > compatible = "st,stm32-dcmi"; > > reg = <0x4c006000 0x400>; > > @@ -104,7 +106,7 @@ examples: > > port { > > dcmi_0: endpoint { > > remote-endpoint = <&ov5640_0>; > > - bus-type = <5>; > > + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; > > bus-width = <8>; > > hsync-active = <0>; > > vsync-active = <0>;
Hi Laurent, On Thu, Jun 16, 2022 at 01:14:06AM +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 binding examples. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes since v2: > > - Go back to PARALLEL > > Changes since v1: > > - Rename PARALLEL to BT601 > --- > .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + > Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- > Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- > .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- > Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- > Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- > 6 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > index 35a48515836e..b0e5585f93e2 100644 > --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > @@ -118,6 +118,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/gpio/gpio.h> > + #include <dt-bindings/media/video-interfaces.h> > > i2c0 { > #address-cells = <1>; The definition doesn't seem to be used here. Is there a need to include this? I could drop this chunk while applying. There's just one trivial change elsewhere in this patch to make.
Hi Sakari, On Sat, Jul 16, 2022 at 12:28:45PM +0300, Sakari Ailus wrote: > On Thu, Jun 16, 2022 at 01:14:06AM +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 binding examples. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > Changes since v2: > > > > - Go back to PARALLEL > > > > Changes since v1: > > > > - Rename PARALLEL to BT601 > > --- > > .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + > > Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- > > Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- > > .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- > > Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- > > Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- > > 6 files changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > index 35a48515836e..b0e5585f93e2 100644 > > --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > @@ -118,6 +118,7 @@ additionalProperties: false > > examples: > > - | > > #include <dt-bindings/gpio/gpio.h> > > + #include <dt-bindings/media/video-interfaces.h> > > > > i2c0 { > > #address-cells = <1>; > > The definition doesn't seem to be used here. Is there a need to include > this? There was, but the change that added bus-type to this binding got reverted in commit 979452fbc430 ("dt-bindings: drm/bridge: anx7625: Revert DPI support") and I forgot to drop the header when rebasing. > I could drop this chunk while applying. There's just one trivial change > elsewhere in this patch to make. Please do :-)
Hi Laurent, On Sat, Jul 16, 2022 at 06:12:05PM +0300, Laurent Pinchart wrote: > Hi Sakari, > > On Sat, Jul 16, 2022 at 12:28:45PM +0300, Sakari Ailus wrote: > > On Thu, Jun 16, 2022 at 01:14:06AM +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 binding examples. > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > --- > > > Changes since v2: > > > > > > - Go back to PARALLEL > > > > > > Changes since v1: > > > > > > - Rename PARALLEL to BT601 > > > --- > > > .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + > > > Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- > > > Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- > > > .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- > > > Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- > > > Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- > > > 6 files changed, 12 insertions(+), 5 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > > index 35a48515836e..b0e5585f93e2 100644 > > > --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > > +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml > > > @@ -118,6 +118,7 @@ additionalProperties: false > > > examples: > > > - | > > > #include <dt-bindings/gpio/gpio.h> > > > + #include <dt-bindings/media/video-interfaces.h> > > > > > > i2c0 { > > > #address-cells = <1>; > > > > The definition doesn't seem to be used here. Is there a need to include > > this? > > There was, but the change that added bus-type to this binding got > reverted in commit 979452fbc430 ("dt-bindings: drm/bridge: anx7625: > Revert DPI support") and I forgot to drop the header when rebasing. > > > I could drop this chunk while applying. There's just one trivial change > > elsewhere in this patch to make. > > Please do :-) Applied with the following diff: diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml index 7fa7a667c764a..4590186c4a0b8 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml @@ -133,7 +133,6 @@ additionalProperties: false examples: - | #include <dt-bindings/gpio/gpio.h> - #include <dt-bindings/media/video-interfaces.h> i2c0 { #address-cells = <1>; diff --git a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml index 285c6075950ad..e80fcdf280f0b 100644 --- a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml +++ b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml @@ -92,7 +92,7 @@ examples: #include <dt-bindings/clock/stm32mp1-clks.h> #include <dt-bindings/media/video-interfaces.h> #include <dt-bindings/reset/stm32mp1-resets.h> - # + dcmi: dcmi@4c006000 { compatible = "st,stm32-dcmi"; reg = <0x4c006000 0x400>; It seems that there's also bus-type 7 that corresponds to MIPI DPI. Could you add a macro for this one as well? :-) In particular it's used by Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml .
diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml index 35a48515836e..b0e5585f93e2 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml @@ -118,6 +118,7 @@ additionalProperties: false examples: - | #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/media/video-interfaces.h> i2c0 { #address-cells = <1>; diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml index 39395ea8c318..edde4201116f 100644 --- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml +++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml @@ -104,6 +104,7 @@ additionalProperties: false examples: - | #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/media/video-interfaces.h> i2c2 { #address-cells = <1>; @@ -124,7 +125,7 @@ examples: remote-endpoint = <&csi2a_ep>; link-frequencies = /bits/ 64 <199200000 210000000 499200000>; - bus-type = <4>; + bus-type = <MEDIA_BUS_TYPE_CSI2_DPHY>; }; }; }; diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml index 44529425ce3a..161e6d598e1c 100644 --- a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml @@ -105,6 +105,7 @@ additionalProperties: false examples: - | #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/media/video-interfaces.h> i2c0 { #address-cells = <1>; @@ -118,7 +119,7 @@ examples: port { ov772x_0: endpoint { - bus-type = <5>; + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; vsync-active = <0>; hsync-active = <0>; pclk-sample = <0>; diff --git a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml index b39b84c5f012..0e3478551e13 100644 --- a/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml +++ b/Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml @@ -68,6 +68,7 @@ additionalProperties: false examples: - | #include <dt-bindings/clock/marvell,mmp2.h> + #include <dt-bindings/media/video-interfaces.h> #include <dt-bindings/power/marvell,mmp2.h> camera@d420a000 { @@ -83,7 +84,7 @@ examples: port { camera0_0: endpoint { remote-endpoint = <&ov7670_0>; - bus-type = <5>; /* Parallel */ + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; hsync-active = <1>; /* Active high */ vsync-active = <1>; /* Active high */ pclk-sample = <0>; /* Falling */ diff --git a/Documentation/devicetree/bindings/media/microchip,xisc.yaml b/Documentation/devicetree/bindings/media/microchip,xisc.yaml index 8b37fccab5e2..25f5f79d40ce 100644 --- a/Documentation/devicetree/bindings/media/microchip,xisc.yaml +++ b/Documentation/devicetree/bindings/media/microchip,xisc.yaml @@ -106,6 +106,7 @@ examples: #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/at91.h> #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/media/video-interfaces.h> xisc: xisc@e1408000 { compatible = "microchip,sama7g5-isc"; @@ -118,7 +119,7 @@ examples: port { xisc_in: endpoint { - bus-type = <5>; /* Parallel */ + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; remote-endpoint = <&csi2dc_out>; hsync-active = <1>; vsync-active = <1>; diff --git a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml index 9c1262a276b5..285c6075950a 100644 --- a/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml +++ b/Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml @@ -90,7 +90,9 @@ examples: - | #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/stm32mp1-clks.h> + #include <dt-bindings/media/video-interfaces.h> #include <dt-bindings/reset/stm32mp1-resets.h> + # dcmi: dcmi@4c006000 { compatible = "st,stm32-dcmi"; reg = <0x4c006000 0x400>; @@ -104,7 +106,7 @@ examples: port { dcmi_0: endpoint { remote-endpoint = <&ov5640_0>; - bus-type = <5>; + bus-type = <MEDIA_BUS_TYPE_PARALLEL>; bus-width = <8>; hsync-active = <0>; vsync-active = <0>;
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 binding examples. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- Changes since v2: - Go back to PARALLEL Changes since v1: - Rename PARALLEL to BT601 --- .../devicetree/bindings/display/bridge/analogix,anx7625.yaml | 1 + Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 ++- Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 ++- .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 3 ++- Documentation/devicetree/bindings/media/microchip,xisc.yaml | 3 ++- Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +++- 6 files changed, 12 insertions(+), 5 deletions(-)