leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2016-09-05 10:56:24 +03:00
parent 6134148f60
commit d455b45f83
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/vsp1/vsp1_drv.c
View File

@ -709,6 +709,14 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
.wpf_count = 1, .wpf_count = 1,
.num_bru_inputs = 5, .num_bru_inputs = 5,
.uapi = true, .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, .version = VI6_IP_VERSION_MODEL_VSPD_GEN3,
.model = "VSP2-D", .model = "VSP2-D",
@ -717,6 +725,22 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
.rpf_count = 5, .rpf_count = 5,
.wpf_count = 2, .wpf_count = 2,
.num_bru_inputs = 5, .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,
}, },
}; };

15
drivers/media/platform/vsp1/vsp1_regs.h
View File

@ -699,9 +699,20 @@
#define VI6_IP_VERSION_MODEL_VSPBD_GEN3 (0x15 << 8) #define VI6_IP_VERSION_MODEL_VSPBD_GEN3 (0x15 << 8)
#define VI6_IP_VERSION_MODEL_VSPBC_GEN3 (0x16 << 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_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_MASK (0xff << 0)
#define VI6_IP_VERSION_SOC_H (0x01 << 0) #define VI6_IP_VERSION_SOC_H2 (0x01 << 0)
#define VI6_IP_VERSION_SOC_M (0x02 << 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 * RPF CLUT Registers