diff options
| author | Charlie Huang <chahuang@nvidia.com> | 2012-09-29 18:46:06 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:04:55 -0700 |
| commit | f611c63f535a460db3e0cb86e5b606ec0cbdb12f (patch) | |
| tree | b264bcf8318460b2808136cff88b18c3da3443a3 /include/media/max77665-flash.h | |
| parent | fbcefc7c3fe4f8b0250e0ddf8cb835accddb10ce (diff) | |
media: video: tegra: max77665 flash updates
fix trigger mode settings, and some code optimizations.
bug 1035551
Change-Id: I92cc0e0e7e9bac9b8cf26b5bba5d10c8dfad49ee
Signed-off-by: Charlie Huang <chahuang@nvidia.com>
(cherry picked from commit 0bafa31093f1ca948c43601a9bffd7dcbe00b136)
Reviewed on: http://git-master/r/#change,139959
Reviewed-on: http://git-master/r/146031
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Philip Breczinski <pbreczinski@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Rebase-Id: R23ae58db2f0619253a4b04e428021dc7d1136ffa
Diffstat (limited to 'include/media/max77665-flash.h')
| -rw-r--r-- | include/media/max77665-flash.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/max77665-flash.h b/include/media/max77665-flash.h index 0913e2e589de..45d1b0251891 100644 --- a/include/media/max77665-flash.h +++ b/include/media/max77665-flash.h @@ -32,8 +32,10 @@ struct max77665_f_power_rail { struct max77665_f_config { u32 led_mask; /* led(s) enabled, 1/2/3 - left/right/both */ - bool torch_on_flash_en; /* true=high level on the flash_en pin will + bool torch_on_flash; /* true=high level on the flash_en pin will turn on torch */ + bool flash_on_torch; /* true=high level on the torch_en pin will + turn on flash */ u16 flash_mode; /* 1=one_shot_mode, flash is triggerred on the rising edge of FLASHEN/TORCHEN/I2C_bit, and terminated based on the flash safety timer |