fix compilation of msm_camera
Subsystems (4)
PATCH 1/6 fix compilation of msm_camera
Add pieces neccessary for compilation of msm_camera.
Signed-off-by Pavel Machek <[email protected]>
arch/arm/mach-msm/include/mach/board.h +36 -0
@@ -35,4 +35,40 @@ void __init msm_init_irq(void);void __init msm_init_gpio (void );void __init msm_clock_init (void ); +struct msm_camera_io_ext { +uint32_t mdcphy; +uint32_t mdcsz; +uint32_t appphy; +uint32_t appsz; +}; + +struct msm_camera_device_platform_data { +void (*camera_gpio_on) (void ); +void (*camera_gpio_off)(void ); +struct msm_camera_io_ext ioext; +}; + +#ifdef CONFIG_SENSORS_MT9T013 +struct msm_camera_legacy_device_platform_data { +int sensor_reset; +int sensor_pwd; +int vcm_pwd; +void (*config_gpio_on) (void ); +void (*config_gpio_off)(void ); +}; +#endif + +#define MSM_CAMERA_FLASH_NONE 0 +#define MSM_CAMERA_FLASH_LED 1 + +struct msm_camera_sensor_info { +const char *sensor_name; +int sensor_reset; +int sensor_pwd; +int vcm_pwd; +int mclk; +int flash_type; +struct msm_camera_device_platform_data *pdata; +}; +#endif
arch/arm/mach-msm/include/mach/camera.h new file +279 -0
279 lines not on this page · raw message
arch/arm/mach-msm/include/mach/gpio.h new file +47 -0
47 lines not on this page · raw message
arch/arm/mach-msm/include/mach/msm_adsp.h new file +112 -0
112 lines not on this page · raw message
drivers/staging/dream/camera/msm_camera.c +0 -6
@@ -1597,7 +1597,6 @@ static int __msm_release(struct msm_sync *sync)MSM_DRAIN_QUEUE (sync, pict_frame_q); sync->sctrl.s_release (); -wake_unlock (&sync->wake_lock); sync->apps_id =NULL ;CDBG ("msm_release completed!\n" );
@@ -1806,7 +1805,6 @@ static int __msm_open(struct msm_sync *sync, const char *const apps_id) sync->apps_id = apps_id;if (!sync->opencnt) { -wake_lock (&sync->wake_lock);msm_camvfe_fn_init (&sync->vfefn, sync);if (sync->vfefn.vfe_init) {
@@ -2044,8 +2042,6 @@ static int msm_sync_init(struct msm_sync *sync,INIT_LIST_HEAD (&sync->pict_frame_q);init_waitqueue_head (&sync->pict_frame_wait); -wake_lock_init (&sync->wake_lock,WAKE_LOCK_IDLE ,"msm_camera" ); - rc =msm_camio_probe_on (pdev);if (rc <0 )return rc;
@@ -2058,7 +2054,6 @@ static int msm_sync_init(struct msm_sync *sync,if (rc <0 ) {pr_err ("msm_camera: failed to initialize %s\n" , sync->sdata->sensor_name); -wake_lock_destroy (&sync->wake_lock);return rc; }
@@ -2070,7 +2065,6 @@ static int msm_sync_init(struct msm_sync *sync,static int msm_sync_destroy (struct msm_sync *sync) { -wake_lock_destroy (&sync->wake_lock);return 0 ; }
include/linux/android_pmem.h new file +80 -0
80 lines not on this page · raw message
include/linux/msm_adsp.h new file +84 -0
84 lines not on this page · raw message
include/media/msm_camera.h new file +388 -0
388 lines not on this page · raw message
Signature · 8 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ----- End forwarded message ----- -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html