Skip to content

Commit

Permalink
msm: camera: Merge tomato camera changes
Browse files Browse the repository at this point in the history
Merge yulong cp8675 camera driver to base camera driver

Change-Id: I876a085d08db5e825393e46daf295a5480931836

msm: camera: add vana/af gpio power sequence dt entry

Change-Id: I6ec11f57d90cf4113d187a2eb848c1f5708ddcec

msm: camera: remove yulong power sequence

- This is done in device tree

Change-Id: Idd7184552b91c4fb7795bc79bb23e235a77a2b91

msm: camera_v2: merge in latest yulong

Change-Id: I9f5b2d1609924fc910adaa3b9f8ab1481b7c4048

camera_v2: Make yulong drivers work with CONFIG_COMPAT

The camera userspace can (and does) send 32bit data, even if it is
64bit. Be prepared for it, or things will go boom.

Change-Id: If72cd19bea0868c5a95265f988bc87f412390fdd

msm: camera: flash: fix build for non-yulong boards

Change-Id: I2667bcfffe70b302fc97cd33ef2dcf6c1a3afd7f

msm: camera: Fix Yulong camera power up/down sequence

Change-Id: I6d106f42a923197dc91515bd35dd03f754859b94

msm: camera: Remove IMX135 driver

Change-Id: I13b5a7c436dd618eb64e0a166bc7ce371a81766c

msm: camera: Remove OV5648 driver

Change-Id: I5aadfe52b4d75e62c4c5b6110a6b37ac792a11b8

msm: camera_v2: add af software powerdown

Change-Id: I4dc7b7fc700301929e755eddce45a8d781b1f612

msm: camera: Add CKT camera ID function

Change-Id: I6cb862626676a334990853d125dbf2624cffdc5f

msm: camera: Fix compilation

* Include subdirectory headers to avoid compilation issues
  when building standalone kernel image.

msm: camera: Add Yulong camera definitions

Change-Id: Id3f3fd96125b9444873c491083a143f79e402aa3
  • Loading branch information
Scott Mertz authored and mikeNG committed Jul 1, 2017
1 parent f8493e0 commit a4bc2c0
Show file tree
Hide file tree
Showing 10 changed files with 820 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ obj-$(CONFIG_MSMB_CAMERA) += adp1660.o
obj-$(CONFIG_MSMB_CAMERA) += bd7710.o
obj-$(CONFIG_MSMB_CAMERA) += msm_led_torch.o
obj-$(CONFIG_MSMB_CAMERA) += msm_flash.o
obj-$(CONFIG_MACH_YULONG) += msm_led_gpio_trigger.o
obj-$(CONFIG_MACH_YULONG) += sgm3780.o
obj-$(CONFIG_MSMB_CAMERA) += lm3642.o
14 changes: 14 additions & 0 deletions drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,18 @@ int msm_flash_led_release(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_off(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_low(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_high(struct msm_led_flash_ctrl_t *fctrl);

#ifdef CONFIG_MACH_YULONG
int msm_flash_gpio_probe(struct platform_device *pdev, const void *data);
int32_t msm_led_gpio_trigger_get_subdev_id(struct msm_led_flash_ctrl_t *fctrl,
void *arg);
int32_t msm_led_gpio_trigger_config(struct msm_led_flash_ctrl_t *fctrl,
void *data);
int msm_flash_led_gpio_init(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_gpio_release(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_gpio_off(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_gpio_low(struct msm_led_flash_ctrl_t *fctrl);
int msm_flash_led_gpio_high(struct msm_led_flash_ctrl_t *fctrl);
#endif

#endif
Loading

0 comments on commit a4bc2c0

Please sign in to comment.