Skip to content

Commit

Permalink
[media] media: atmel-isi: add v4l2 async probe support
Browse files Browse the repository at this point in the history
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
  • Loading branch information
Josh Wu authored and Mauro Carvalho Chehab committed Jul 30, 2014
1 parent 47c71bd commit 3900623
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/media/platform/soc_camera/atmel-isi.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,11 @@ static int atmel_isi_probe(struct platform_device *pdev)
soc_host->v4l2_dev.dev = &pdev->dev;
soc_host->nr = pdev->id;

if (isi->pdata.asd_sizes) {
soc_host->asd = isi->pdata.asd;
soc_host->asd_sizes = isi->pdata.asd_sizes;
}

ret = soc_camera_host_register(soc_host);
if (ret) {
dev_err(&pdev->dev, "Unable to register soc camera host\n");
Expand Down
4 changes: 4 additions & 0 deletions include/media/atmel-isi.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
#define ISI_DATAWIDTH_8 0x01
#define ISI_DATAWIDTH_10 0x02

struct v4l2_async_subdev;

struct isi_platform_data {
u8 has_emb_sync;
u8 emb_crc_sync;
Expand All @@ -118,6 +120,8 @@ struct isi_platform_data {
u32 frate;
/* Using for ISI_MCK */
u32 mck_hz;
struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
int *asd_sizes; /* 0-terminated array of asd group sizes */
};

#endif /* __ATMEL_ISI_H__ */

0 comments on commit 3900623

Please sign in to comment.