summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSudhir Vyas <svyas@nvidia.com>2012-06-07 12:42:27 +0530
committerSimone Willett <swillett@nvidia.com>2012-06-07 17:55:18 -0700
commit408859877e6cc97e1648262bfe066f87fec81957 (patch)
treef07745024f966fda3f03c3aeadb4d7cb8260274a /arch
parentff445fc9ec43b59642c0dc81a66146cdbc3adbaf (diff)
ARM: tegra: Set NVC config for cardhu-focusers
* NVC framework provides NVC_CFG_NODEV config for all NVC compliant camera drivers to make sure to delete the device nodes which are not found in I2C probing. This config is not set for all focuser modules on PM269, which introduces the issue. * Earlier only sh532u focuser was suppose to be on cardhu, hence this error condition did not get triggered but newly added focuser has exposed this error. * Set NVC_CFG_NODEV for both sh532u and ad5816 focusers. * Add regulator supply for cam2 ad5816 focuser, it fixes camera crash on first reboot on E1198 cardhu and I2C warnings. Bug 992611 Bug 995072 Change-Id: I3382a896e4e246a0a323bd13ae0889b6701351c7 Signed-off-by: Sudhir vyas <svyas@nvidia.com> Reviewed-on: http://git-master/r/106960 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Prayas Mohanty <pmohanty@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Frank Chen <frankc@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-power.c2
-rw-r--r--arch/arm/mach-tegra/board-cardhu-sensors.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c
index d517d8266204..39975eada203 100644
--- a/arch/arm/mach-tegra/board-cardhu-power.c
+++ b/arch/arm/mach-tegra/board-cardhu-power.c
@@ -610,6 +610,7 @@ static struct regulator_consumer_supply fixed_reg_cam1_ldo_en_supply[] = {
static struct regulator_consumer_supply fixed_reg_cam2_ldo_en_supply[] = {
REGULATOR_SUPPLY("vdd_2v8_cam2", NULL),
REGULATOR_SUPPLY("avdd", "7-0072"),
+ REGULATOR_SUPPLY("vdd", "7-000e"),
};
/* CAM3_LDO_EN from AP GPIO KB_ROW8 S00*/
@@ -650,6 +651,7 @@ static struct regulator_consumer_supply fixed_reg_en_1v8_cam_supply[] = {
REGULATOR_SUPPLY("dvdd", "6-0072"),
REGULATOR_SUPPLY("dvdd", "7-0072"),
REGULATOR_SUPPLY("vdd_i2c", "6-000e"),
+ REGULATOR_SUPPLY("vdd_i2c", "7-000e"),
REGULATOR_SUPPLY("vdd_i2c", "2-0033"),
};
diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c
index 042f740c2935..c907ae95f597 100644
--- a/arch/arm/mach-tegra/board-cardhu-sensors.c
+++ b/arch/arm/mach-tegra/board-cardhu-sensors.c
@@ -576,7 +576,7 @@ static struct nvc_gpio_pdata pm269_sh532u_left_gpio_pdata[] = {
};
static struct sh532u_platform_data pm269_sh532u_left_pdata = {
- .cfg = 0,
+ .cfg = NVC_CFG_NODEV,
.num = 1,
.sync = 2,
.dev_name = "focuser",
@@ -589,7 +589,7 @@ static struct nvc_gpio_pdata pm269_sh532u_right_gpio_pdata[] = {
};
static struct sh532u_platform_data pm269_sh532u_right_pdata = {
- .cfg = 0,
+ .cfg = NVC_CFG_NODEV,
.num = 2,
.sync = 1,
.dev_name = "focuser",
@@ -624,7 +624,7 @@ static struct nvc_gpio_pdata pm269_ad5816_left_gpio_pdata[] = {
};
static struct ad5816_platform_data pm269_ad5816_left_pdata = {
- .cfg = 0,
+ .cfg = NVC_CFG_NODEV,
.num = 1,
.sync = 2,
.dev_name = "focuser",
@@ -637,7 +637,7 @@ static struct nvc_gpio_pdata pm269_ad5816_right_gpio_pdata[] = {
};
static struct ad5816_platform_data pm269_ad5816_right_pdata = {
- .cfg = 0,
+ .cfg = NVC_CFG_NODEV,
.num = 2,
.sync = 1,
.dev_name = "focuser",