diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2013-01-03 13:06:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 15:35:53 -0400 |
commit | 676d2d4f08ccdfab45867aaf1edeeb923b45bdc1 (patch) | |
tree | 34b7f0667bc93ccc1a5e27f7108e984d0411fea4 /include | |
parent | e09da11da49c6fd625be52d8b60bbbbe225a9db6 (diff) |
[media] sh_mobile_ceu_camera: add asynchronous subdevice probing support
Use the v4l2-async API to support asynchronous subdevice probing,
including the CSI2 subdevice. Synchronous probing is still supported too.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/media/sh_mobile_ceu.h | 2 | ||||
-rw-r--r-- | include/media/sh_mobile_csi2.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h index 6fdb6adf6b2b..8937241e5f37 100644 --- a/include/media/sh_mobile_ceu.h +++ b/include/media/sh_mobile_ceu.h | |||
@@ -22,6 +22,8 @@ struct sh_mobile_ceu_info { | |||
22 | int max_width; | 22 | int max_width; |
23 | int max_height; | 23 | int max_height; |
24 | struct sh_mobile_ceu_companion *csi2; | 24 | struct sh_mobile_ceu_companion *csi2; |
25 | struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ | ||
26 | int *asd_sizes; /* 0-terminated array pf asd group sizes */ | ||
25 | }; | 27 | }; |
26 | 28 | ||
27 | #endif /* __ASM_SH_MOBILE_CEU_H__ */ | 29 | #endif /* __ASM_SH_MOBILE_CEU_H__ */ |
diff --git a/include/media/sh_mobile_csi2.h b/include/media/sh_mobile_csi2.h index c586c4f7f16b..14030db51f13 100644 --- a/include/media/sh_mobile_csi2.h +++ b/include/media/sh_mobile_csi2.h | |||
@@ -33,6 +33,7 @@ struct sh_csi2_client_config { | |||
33 | unsigned char lanes; /* bitmask[3:0] */ | 33 | unsigned char lanes; /* bitmask[3:0] */ |
34 | unsigned char channel; /* 0..3 */ | 34 | unsigned char channel; /* 0..3 */ |
35 | struct platform_device *pdev; /* client platform device */ | 35 | struct platform_device *pdev; /* client platform device */ |
36 | const char *name; /* async matching: client name */ | ||
36 | }; | 37 | }; |
37 | 38 | ||
38 | struct v4l2_device; | 39 | struct v4l2_device; |
@@ -42,7 +43,6 @@ struct sh_csi2_pdata { | |||
42 | unsigned int flags; | 43 | unsigned int flags; |
43 | struct sh_csi2_client_config *clients; | 44 | struct sh_csi2_client_config *clients; |
44 | int num_clients; | 45 | int num_clients; |
45 | struct v4l2_device *v4l2_dev; | ||
46 | }; | 46 | }; |
47 | 47 | ||
48 | #endif | 48 | #endif |