p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] media: am437x-vpfe: match the OF node/i2c addr instead of name 

Instead of matching the subdevs with their name, match
it with OF node/ i2c address and adapter number.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Lad, Prabhakar 2015-03-07 12:30:49 -03:00 committed by Mauro Carvalho Chehab
parent 4eaa3a6cc4
commit d37232390f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/platform/am437x/am437x-vpfe.c
View File

@ -1701,11 +1701,16 @@ static int vpfe_get_app_input_index(struct vpfe_device *vpfe,
{ {
struct vpfe_config *cfg = vpfe->cfg; struct vpfe_config *cfg = vpfe->cfg;
struct vpfe_subdev_info *sdinfo; struct vpfe_subdev_info *sdinfo;
struct i2c_client *client;
struct i2c_client *curr_client;
int i, j = 0; int i, j = 0;
curr_client = v4l2_get_subdevdata(vpfe->current_subdev->sd);
for (i = 0; i < ARRAY_SIZE(vpfe->cfg->asd); i++) { for (i = 0; i < ARRAY_SIZE(vpfe->cfg->asd); i++) {
sdinfo = &cfg->sub_devs[i]; sdinfo = &cfg->sub_devs[i];
if (!strcmp(sdinfo->name, vpfe->current_subdev->name)) { client = v4l2_get_subdevdata(sdinfo->sd);
if (client->addr == curr_client->addr &&
client->adapter->nr == client->adapter->nr) {
if (vpfe->current_input >= 1) if (vpfe->current_input >= 1)
return -1; return -1;
*app_input_index = j + vpfe->current_input; *app_input_index = j + vpfe->current_input;
@ -2297,20 +2302,10 @@ vpfe_async_bound(struct v4l2_async_notifier *notifier,
vpfe_dbg(1, vpfe, "vpfe_async_bound\n"); vpfe_dbg(1, vpfe, "vpfe_async_bound\n");
for (i = 0; i < ARRAY_SIZE(vpfe->cfg->asd); i++) { for (i = 0; i < ARRAY_SIZE(vpfe->cfg->asd); i++) {
sdinfo = &vpfe->cfg->sub_devs[i]; if (vpfe->cfg->asd[i]->match.of.node == asd[i].match.of.node) {
sdinfo = &vpfe->cfg->sub_devs[i];
if (!strcmp(sdinfo->name, subdev->name)) {
vpfe->sd[i] = subdev; vpfe->sd[i] = subdev;
vpfe_info(vpfe, vpfe->sd[i]->grp_id = sdinfo->grp_id;
"v4l2 sub device %s registered\n",
subdev->name);
vpfe->sd[i]->grp_id =
sdinfo->grp_id;
/* update tvnorms from the sub devices */
for (j = 0; j < 1; j++)
vpfe->video_dev->tvnorms |=
sdinfo->inputs[j].std;
found = true; found = true;
break; break;
} }
@ -2321,6 +2316,8 @@ vpfe_async_bound(struct v4l2_async_notifier *notifier,
return -EINVAL; return -EINVAL;
} }
vpfe->video_dev->tvnorms |= sdinfo->inputs[0].std;
/* setup the supported formats & indexes */ /* setup the supported formats & indexes */
for (j = 0, i = 0; ; ++j) { for (j = 0, i = 0; ; ++j) {
struct vpfe_fmt *fmt; struct vpfe_fmt *fmt;
@ -2501,8 +2498,6 @@ vpfe_get_pdata(struct platform_device *pdev)
goto done; goto done;
} }
strncpy(sdinfo->name, rem->name, sizeof(sdinfo->name));
pdata->asd[i] = devm_kzalloc(&pdev->dev, pdata->asd[i] = devm_kzalloc(&pdev->dev,
sizeof(struct v4l2_async_subdev), sizeof(struct v4l2_async_subdev),
GFP_KERNEL); GFP_KERNEL);

1
drivers/media/platform/am437x/am437x-vpfe.h
View File

@ -83,7 +83,6 @@ struct vpfe_route {
}; };
struct vpfe_subdev_info { struct vpfe_subdev_info {
char name[32];
/* Sub device group id */ /* Sub device group id */
int grp_id; int grp_id;
/* inputs available at the sub device */ /* inputs available at the sub device */