v4l: vsp1: Add support for new VSP2-BS, VSP2-DL and VSP2-D instances

New Gen3 SoCs come with two new VSP2 variants names VSP2-BS and VSP2-DL,
as well as a new VSP2-D variant on V3M and V3H SoCs. Add new entries for
them in the VSP device info table.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index 6a9aeb71aedfba0eb1026f08c6e60b0219e450c4..d1682a9719af8468589403e75c02b0849e413427 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -709,6 +709,14 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
                .wpf_count = 1,
                .num_bru_inputs = 5,
                .uapi = true,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPBS_GEN3,
+               .model = "VSP2-BS",
+               .gen = 3,
+               .features = VSP1_HAS_BRS | VSP1_HAS_WPF_VFLIP,
+               .rpf_count = 2,
+               .wpf_count = 1,
+               .uapi = true,
        }, {
                .version = VI6_IP_VERSION_MODEL_VSPD_GEN3,
                .model = "VSP2-D",
@@ -717,6 +725,22 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
                .rpf_count = 5,
                .wpf_count = 2,
                .num_bru_inputs = 5,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPD_V3,
+               .model = "VSP2-D",
+               .gen = 3,
+               .features = VSP1_HAS_BRS | VSP1_HAS_BRU | VSP1_HAS_LIF,
+               .rpf_count = 5,
+               .wpf_count = 1,
+               .num_bru_inputs = 5,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPDL_GEN3,
+               .model = "VSP2-DL",
+               .gen = 3,
+               .features = VSP1_HAS_BRS | VSP1_HAS_BRU | VSP1_HAS_LIF,
+               .rpf_count = 5,
+               .wpf_count = 2,
+               .num_bru_inputs = 5,
        },
 };
 

diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
index 744217e020b956047ec339b492c6b537badb926a..ab439a60a1007f3d2d3315ae95952c472619e485 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_regs.h
+++ b/drivers/media/platform/vsp1/vsp1_regs.h
@@ -699,9 +699,20 @@
 #define VI6_IP_VERSION_MODEL_VSPBD_GEN3        (0x15 << 8)
 #define VI6_IP_VERSION_MODEL_VSPBC_GEN3        (0x16 << 8)
 #define VI6_IP_VERSION_MODEL_VSPD_GEN3 (0x17 << 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_SOC_MASK                (0xff << 0)
-#define VI6_IP_VERSION_SOC_H           (0x01 << 0)
-#define VI6_IP_VERSION_SOC_M           (0x02 << 0)
+#define VI6_IP_VERSION_SOC_H2          (0x01 << 0)
+#define VI6_IP_VERSION_SOC_V2H         (0x01 << 0)
+#define VI6_IP_VERSION_SOC_V3M         (0x01 << 0)
+#define VI6_IP_VERSION_SOC_M2          (0x02 << 0)
+#define VI6_IP_VERSION_SOC_M3W         (0x02 << 0)
+#define VI6_IP_VERSION_SOC_V3H         (0x02 << 0)
+#define VI6_IP_VERSION_SOC_H3          (0x03 << 0)
+#define VI6_IP_VERSION_SOC_D3          (0x04 << 0)
+#define VI6_IP_VERSION_SOC_M3N         (0x04 << 0)
+#define VI6_IP_VERSION_SOC_E3          (0x04 << 0)
 
 /* -----------------------------------------------------------------------------
  * RPF CLUT Registers