iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] v4l: vsp1: Make the BRU optional

Browse Source 
Not all VSP instances have a BRU on R-Car Gen3, make it optional. Set
the feature unconditionally for now, this will be fixed when adding Gen3
support.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2015-08-14 13:53:45 -03:00 committed by Mauro Carvalho Chehab
parent a96c5fa450
commit f74be41221
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/vsp1/vsp1.h
View File

@ -42,6 +42,7 @@ struct vsp1_uds;
#define VSP1_HAS_LIF (1 << 0) #define VSP1_HAS_LIF (1 << 0)
#define VSP1_HAS_LUT (1 << 1) #define VSP1_HAS_LUT (1 << 1)
#define VSP1_HAS_SRU (1 << 2) #define VSP1_HAS_SRU (1 << 2)
#define VSP1_HAS_BRU (1 << 3)
struct vsp1_platform_data { struct vsp1_platform_data {
unsigned int features; unsigned int features;

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

@ -220,13 +220,15 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
} }
/* Instantiate all the entities. */ /* Instantiate all the entities. */
vsp1->bru = vsp1_bru_create(vsp1); if (vsp1->pdata.features & VSP1_HAS_BRU) {
if (IS_ERR(vsp1->bru)) { vsp1->bru = vsp1_bru_create(vsp1);
ret = PTR_ERR(vsp1->bru); if (IS_ERR(vsp1->bru)) {
goto done; ret = PTR_ERR(vsp1->bru);
} goto done;
}
list_add_tail(&vsp1->bru->entity.list_dev, &vsp1->entities); list_add_tail(&vsp1->bru->entity.list_dev, &vsp1->entities);
}
vsp1->hsi = vsp1_hsit_create(vsp1, true); vsp1->hsi = vsp1_hsit_create(vsp1, true);
if (IS_ERR(vsp1->hsi)) { if (IS_ERR(vsp1->hsi)) {
@ -541,6 +543,7 @@ static int vsp1_parse_dt(struct vsp1_device *vsp1)
return -EINVAL; return -EINVAL;
} }
pdata->features |= VSP1_HAS_BRU;
pdata->num_bru_inputs = 4; pdata->num_bru_inputs = 4;
return 0; return 0;