media: vsp1: Add support for the V3U VSPD

The V3U provides two VSPD instances, with a new update to the version
register to detect the new SoC.

Add the new version and model detection, and detail the features
available in this module.

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+huawei@kernel.org>

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index bb256e36bda493b165a284cfb34cb1003720a7db..c9044785b9032eea30ff5f293d1536d93901e4f2 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -777,6 +777,16 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
                .uif_count = 2,
                .wpf_count = 2,
                .num_bru_inputs = 5,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPD_V3U,
+               .model = "VSP2-D",
+               .gen = 3,
+               .features = VSP1_HAS_BRU | VSP1_HAS_EXT_DL,
+               .lif_count = 1,
+               .rpf_count = 5,
+               .uif_count = 2,
+               .wpf_count = 1,
+               .num_bru_inputs = 5,
        },
 };
 

diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index 97942436868c300baeb96ae711fc3b830e02ca3d..fae7286eb01eb8266775cf738b4e7bd2befce005 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -766,6 +766,8 @@
 #define VI6_IP_VERSION_MODEL_VSPD_V3   (0x18 << 8)
 #define VI6_IP_VERSION_MODEL_VSPDL_GEN3        (0x19 << 8)
 #define VI6_IP_VERSION_MODEL_VSPBS_GEN3        (0x1a << 8)
+#define VI6_IP_VERSION_MODEL_VSPD_V3U  (0x1c << 8)
+
 #define VI6_IP_VERSION_SOC_MASK                (0xff << 0)
 #define VI6_IP_VERSION_SOC_H2          (0x01 << 0)
 #define VI6_IP_VERSION_SOC_V2H         (0x01 << 0)
@@ -777,6 +779,7 @@
 #define VI6_IP_VERSION_SOC_D3          (0x04 << 0)
 #define VI6_IP_VERSION_SOC_M3N         (0x04 << 0)
 #define VI6_IP_VERSION_SOC_E3          (0x04 << 0)
+#define VI6_IP_VERSION_SOC_V3U         (0x05 << 0)
 
 /* -----------------------------------------------------------------------------
  * RPF CLUT Registers