Commit 59a95979 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Hans Verkuil
Browse files

media: renesas: fdp1: Identify R-Car Gen2 versions 



On R-Car M2-W:

    rcar_fdp1 fe940000.fdp1: FDP1 Unidentifiable (0x02010101)
    rcar_fdp1 fe944000.fdp1: FDP1 Unidentifiable (0x02010101)

Although the IP Internal Data Register on R-Car Gen2 is documented to
contain all zeros, the actual register contents seem to match the FDP1
version ID of R-Car H3 ES1.*, which has just been removed.
Fortunately this version is not used for any other purposes yet.

Fix this by re-adding the ID, now using an R-Car Gen2-specific name.

Fixes: af4273b4 ("media: renesas: fdp1: remove R-Car H3 ES1.* handling")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 6c01e6f3

drivers/media/platform/renesas/rcar_fdp1.c

+5 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ MODULE_PARM_DESC(debug, "activate debug info"); 


/* Internal Data (HW Version) */

#define FD1_IP_INTDATA			0x0800

/* R-Car Gen2 HW manual says zero, but actual value matches R-Car H3 ES1.x */

#define FD1_IP_GEN2			0x02010101

#define FD1_IP_M3W			0x02010202

#define FD1_IP_H3			0x02010203

#define FD1_IP_M3N			0x02010204
@@ -2360,6 +2362,9 @@ static int fdp1_probe(struct platform_device *pdev) 


	hw_version = fdp1_read(fdp1, FD1_IP_INTDATA);

	switch (hw_version) {

	case FD1_IP_GEN2:

		dprintk(fdp1, "FDP1 Version R-Car Gen2\n");

		break;

	case FD1_IP_M3W:

		dprintk(fdp1, "FDP1 Version R-Car M3-W\n");

		break;