[media] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support

This adds R-Car M2 (R8A7791) VIN support. Both H2 and M2
variants look the same from the driver's point of view,
so use GEN2 id for both.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[g.liakhovetski@gmx.de: removed changelog from commit message]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 6866bb4fbebc0d553fc27fdb3f72e8d2f6791f9c..3b1c05a72d00cf16ab7a5f070aa09da12b35d00a 100644 (file)
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -106,7 +106,7 @@
 #define VIN_MAX_HEIGHT         2048
 
 enum chip_id {
-       RCAR_H2,
+       RCAR_GEN2,
        RCAR_H1,
        RCAR_M1,
        RCAR_E1,
@@ -302,7 +302,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
                dmr = 0;
                break;
        case V4L2_PIX_FMT_RGB32:
-               if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
+               if (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 ||
                    priv->chip == RCAR_E1) {
                        dmr = VNDMR_EXRGB;
                        break;
@@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
 };
 
 static struct platform_device_id rcar_vin_id_table[] = {
-       { "r8a7790-vin",  RCAR_H2 },
+       { "r8a7791-vin",  RCAR_GEN2 },
+       { "r8a7790-vin",  RCAR_GEN2 },
        { "r8a7779-vin",  RCAR_H1 },
        { "r8a7778-vin",  RCAR_M1 },
        { "uPD35004-vin", RCAR_E1 },