media: fdp1: Support M3N and E3 platforms
authorKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Wed, 15 May 2019 15:39:12 +0000 (11:39 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2019 05:28:24 +0000 (07:28 +0200)
[ Upstream commit 4e8c120de9268fc26f583268b9d22e7d37c4595f ]

New Gen3 R-Car platforms incorporate the FDP1 with an updated version
register. No code change is required to support these targets, but they
will currently report an error stating that the device can not be
identified.

Update the driver to match against the new device types.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/rcar_fdp1.c

index 3245bc45f4a0636581599b01529ec34fae445c44..a889332d5d309e8981aecb54807934e1a3db1111 100644 (file)
@@ -261,6 +261,8 @@ MODULE_PARM_DESC(debug, "activate debug info");
 #define FD1_IP_H3_ES1                  0x02010101
 #define FD1_IP_M3W                     0x02010202
 #define FD1_IP_H3                      0x02010203
+#define FD1_IP_M3N                     0x02010204
+#define FD1_IP_E3                      0x02010205
 
 /* LUTs */
 #define FD1_LUT_DIF_ADJ                        0x1000
@@ -2369,6 +2371,12 @@ static int fdp1_probe(struct platform_device *pdev)
        case FD1_IP_H3:
                dprintk(fdp1, "FDP1 Version R-Car H3\n");
                break;
+       case FD1_IP_M3N:
+               dprintk(fdp1, "FDP1 Version R-Car M3N\n");
+               break;
+       case FD1_IP_E3:
+               dprintk(fdp1, "FDP1 Version R-Car E3\n");
+               break;
        default:
                dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
                                hw_version);