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.
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 at ideasonboard.com>
> ---
> 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>
> +
> #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 = <MEDIA_BUS_TYPE_BT656>;
> 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 <dt-bindings/media/video-interfaces.h>
> +
> #define CAM_ENABLED 1
>
> &CAM_PARENT_I2C {
> @@ -21,7 +23,7 @@ ov7725 at 21 {
> port {
> CAM_EP: endpoint {
> bus-width = <8>;
> - bus-type = <6>;
> + bus-type = <MEDIA_BUS_TYPE_BT656>;
> remote-endpoint = <&VIN_EP>;
> };
> };
--
Regards,
Laurent Pinchart