diff options
| author | Eric Anholt <eric@anholt.net> | 2018-05-10 12:42:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-11 12:02:05 +0200 |
| commit | 4bebb0312ea93cc4391f49d40eea86476f2cdf29 (patch) | |
| tree | b7b38ada850506e136b67203f51ff9d6ab17d944 /drivers/staging/vc04_services/bcm2835-camera | |
| parent | 37b7b3087a2f183325502e8dae7fbb9cf987f221 (diff) | |
staging/bcm2835-camera: Set ourselves up as a platform driver.
This allows bcm2835-camera to automatically probe after VCHI has
loaded, rather than only successfully probing if the arbitrary probe
order chooses us after VCHI.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services/bcm2835-camera')
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/TODO | 11 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 18 |
2 files changed, 14 insertions, 15 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/TODO b/drivers/staging/vc04_services/bcm2835-camera/TODO index 0ab9e88d769a..cefce72d814f 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/TODO +++ b/drivers/staging/vc04_services/bcm2835-camera/TODO @@ -21,14 +21,3 @@ less copy it needed to do. The bulk_receive() does some manual cache flushing that are 32-bit ARM only, which we should convert to proper cross-platform APIs. -4) Convert to be a platform driver. - -Right now when the module probes, it tries to initialize VCHI and -errors out if it wasn't ready yet. If bcm2835-v4l2 was built in, then -VCHI generally isn't ready because it depends on both the firmware and -mailbox drivers having already loaded. - -We should have VCHI create a platform device once it's initialized, -and have this driver bind to it, so that we automatically load the -v4l2 module after VCHI loads. - diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index d2262275a870..aac876c35dea 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -23,6 +23,7 @@ #include <media/v4l2-event.h> #include <media/v4l2-common.h> #include <linux/delay.h> +#include <linux/platform_device.h> #include "mmal-common.h" #include "mmal-encodings.h" @@ -1803,7 +1804,7 @@ static struct v4l2_format default_v4l2_format = { .fmt.pix.sizeimage = 1024 * 768, }; -static int __init bm2835_mmal_init(void) +static int __init bcm2835_mmal_probe(struct platform_device *pdev) { int ret; struct bm2835_mmal_dev *dev; @@ -1923,7 +1924,7 @@ cleanup_gdev: return ret; } -static void __exit bm2835_mmal_exit(void) +static int bcm2835_mmal_remove(struct platform_device *pdev) { int camera; struct vchiq_mmal_instance *instance = gdev[0]->instance; @@ -1933,7 +1934,16 @@ static void __exit bm2835_mmal_exit(void) gdev[camera] = NULL; } vchiq_mmal_finalise(instance); + + return 0; } -module_init(bm2835_mmal_init); -module_exit(bm2835_mmal_exit); +static struct platform_driver bcm2835_camera_driver = { + .probe = bcm2835_mmal_probe, + .remove = bcm2835_mmal_remove, + .driver = { + .name = "bcm2835-camera", + }, +}; + +module_platform_driver(bcm2835_camera_driver) |