diff options
author | Josh Wu <josh.wu@atmel.com> | 2014-07-25 06:13:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-30 18:35:06 -0400 |
commit | 3900623bfaffde4eeb93ca0ba0475598a1b0cef5 (patch) | |
tree | 88dcae1db1cb0921a3bcf3812f5f0eef2e6d8295 | |
parent | 47c71bd61b772cd72159dff4aae43734257a485a (diff) |
[media] media: atmel-isi: add v4l2 async probe support
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>
-rw-r--r-- | drivers/media/platform/soc_camera/atmel-isi.c | 5 | ||||
-rw-r--r-- | include/media/atmel-isi.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c index 38c723aca438..c0d46128cad9 100644 --- a/drivers/media/platform/soc_camera/atmel-isi.c +++ b/drivers/media/platform/soc_camera/atmel-isi.c | |||
@@ -980,6 +980,11 @@ static int atmel_isi_probe(struct platform_device *pdev) | |||
980 | soc_host->v4l2_dev.dev = &pdev->dev; | 980 | soc_host->v4l2_dev.dev = &pdev->dev; |
981 | soc_host->nr = pdev->id; | 981 | soc_host->nr = pdev->id; |
982 | 982 | ||
983 | if (isi->pdata.asd_sizes) { | ||
984 | soc_host->asd = isi->pdata.asd; | ||
985 | soc_host->asd_sizes = isi->pdata.asd_sizes; | ||
986 | } | ||
987 | |||
983 | ret = soc_camera_host_register(soc_host); | 988 | ret = soc_camera_host_register(soc_host); |
984 | if (ret) { | 989 | if (ret) { |
985 | dev_err(&pdev->dev, "Unable to register soc camera host\n"); | 990 | dev_err(&pdev->dev, "Unable to register soc camera host\n"); |
diff --git a/include/media/atmel-isi.h b/include/media/atmel-isi.h index 2b023471ac89..c2e570336269 100644 --- a/include/media/atmel-isi.h +++ b/include/media/atmel-isi.h | |||
@@ -106,6 +106,8 @@ | |||
106 | #define ISI_DATAWIDTH_8 0x01 | 106 | #define ISI_DATAWIDTH_8 0x01 |
107 | #define ISI_DATAWIDTH_10 0x02 | 107 | #define ISI_DATAWIDTH_10 0x02 |
108 | 108 | ||
109 | struct v4l2_async_subdev; | ||
110 | |||
109 | struct isi_platform_data { | 111 | struct isi_platform_data { |
110 | u8 has_emb_sync; | 112 | u8 has_emb_sync; |
111 | u8 emb_crc_sync; | 113 | u8 emb_crc_sync; |
@@ -118,6 +120,8 @@ struct isi_platform_data { | |||
118 | u32 frate; | 120 | u32 frate; |
119 | /* Using for ISI_MCK */ | 121 | /* Using for ISI_MCK */ |
120 | u32 mck_hz; | 122 | u32 mck_hz; |
123 | struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ | ||
124 | int *asd_sizes; /* 0-terminated array of asd group sizes */ | ||
121 | }; | 125 | }; |
122 | 126 | ||
123 | #endif /* __ATMEL_ISI_H__ */ | 127 | #endif /* __ATMEL_ISI_H__ */ |