diff options
| author | Erik Lilliebjerg <elilliebjerg@nvidia.com> | 2012-03-26 09:40:58 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-05-01 14:01:51 -0700 |
| commit | af226ab03cf17c5bff7d381474346026d14582cc (patch) | |
| tree | 6119a7beec9d570f7b8c518021d1b252214456a4 /include | |
| parent | 8909af307bebd394ab8517ad1dc45bbc925dd9ae (diff) | |
media: video: tegra: sh532u focus driver
- Abort initialization if an I2C error to avoid excessive load on the I2C bus
since it is heavily used during initialization.
- Updated to the latest NVC framework.
- Added feature that allows for the key focus points to be set at runtime
and the relative positions recalculated.
Bug 929133
Bug 938934
Change-Id: Ida4ab885bf35057ae6df131e3ec3587a891a7dc9
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Reviewed-on: http://git-master/r/93944
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/sh532u.h | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/include/media/sh532u.h b/include/media/sh532u.h index 19da2070b70f..e9653e68b21f 100644 --- a/include/media/sh532u.h +++ b/include/media/sh532u.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 NVIDIA Corporation. + * Copyright (C) 2011-2012 NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -19,25 +19,23 @@ #ifndef __SH532U_H__ #define __SH532U_H__ +#include <media/nvc.h> #include <media/nvc_focus.h> +/* See notes in the nvc.h file on the GPIO usage */ +enum sh532u_gpio { + SH532U_GPIO_RESET = 0, + SH532U_GPIO_I2CMUX, + SH532U_GPIO_GP1, + SH532U_GPIO_GP2, + SH532U_GPIO_GP3, +}; -struct sh532u_platform_data { - int cfg; - int num; - int sync; - const char *dev_name; - struct nvc_focus_nvc (*nvc); - struct nvc_focus_cap (*cap); - struct sh532u_pdata_info (*info); - __u8 i2c_addr_rom; - unsigned gpio_reset; -/* Due to a Linux limitation, a GPIO is defined to "enable" the device. This - * workaround is for when the device's power GPIO's are behind an I2C expander. - * The Linux limitation doesn't allow the I2C GPIO expander to be ready for - * use when this device is probed. - */ - unsigned gpio_en; +/* The enumeration must be in the order the regulators are to be enabled */ +/* See Power Requirements note in the driver */ +enum sh532u_vreg { + SH532U_VREG_DVDD = 0, + SH532U_VREG_AVDD, }; struct sh532u_pdata_info { @@ -50,6 +48,18 @@ struct sh532u_pdata_info { __u32 focus_hyper_div; }; +struct sh532u_platform_data { + unsigned cfg; + unsigned num; + unsigned sync; + const char *dev_name; + unsigned gpio_count; /* see nvc.h GPIO notes */ + struct nvc_gpio_pdata *gpio; /* see nvc.h GPIO notes */ + struct nvc_focus_nvc (*nvc); + struct nvc_focus_cap (*cap); + struct sh532u_pdata_info (*info); + __u8 i2c_addr_rom; +}; /* Register Definition : Sany Driver IC */ /* EEPROM addresses */ |