On Sun, Mar 10, 2019 at 02:06:11PM +0100, Niklas Söderlund wrote:
> The compatible value renesas,rcar-gen3-csi2 was used while prototyping
> the R-Car CSI-2 driver but was removed before the driver was merged.
>
> Fixes: e961ab42e034d469 ("arm64: dts: renesas: r8a774c0: Add VIN and CSI-2 device nodes")
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> ---
>
> Hi Simon,
>
> The commit introducing the issue is not yet upstream and the patch is
> based on your renesas/next branch.
>
> Best Regards,
> Niklas
Thanks Niklas,
I've applied this for v5.2.
It looks like the commit it fixes will be included in v5.1.
But I don't think we need to fastrack fixing this problem in that release.
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> index 1ea684af99c4a19b..8571cc7e64ef2a21 100644
> --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> @@ -1740,8 +1740,7 @@
> };
>
> csi40: csi2@feaa0000 {
> - compatible = "renesas,r8a774c0-csi2",
> - "renesas,rcar-gen3-csi2";
> + compatible = "renesas,r8a774c0-csi2";
> reg = <0 0xfeaa0000 0 0x10000>;
> interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&cpg CPG_MOD 716>;
> --
> 2.21.0
>
