summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRajat Verma <rajat.verma@stericsson.com>2011-10-11 09:34:50 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 11:00:51 +0100
commit60ef70fd4e3e9081ba687966ad8503eb6b1a403f (patch)
tree1a59837fbc400c498726606ca545d18a884a5c01 /arch
parentdf300113f2792b7fcaa2a8d07516b9d970d45582 (diff)
ARM: ux500: mmio: Corrects disable mode pin config
Corrects disable mode pin configuration for xshutdown pins of camera in case of HREF v60 boards. XShutdown pins should be configured in mode (dir: out, value: low) when disabled. ST-Ericsson ID: 328427 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I6db2fafef8061d43f191f4d7ffef6a15d2063c16 Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33571 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-mop500-mmio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mmio.c b/arch/arm/mach-ux500/board-mop500-mmio.c
index 10dedfac8e8..355f835caa1 100644
--- a/arch/arm/mach-ux500/board-mop500-mmio.c
+++ b/arch/arm/mach-ux500/board-mop500-mmio.c
@@ -193,13 +193,15 @@ static int mmio_pin_cfg_init(struct mmio_platform_data *pdata)
extra->xenon_charge = HREFV60_MMIO_XENON_CHARGE;
xshutdown_host[SECONDARY_CAMERA] = GPIO140_GPIO;
xshutdown_fw[SECONDARY_CAMERA] = GPIO140_IP_GPIO7;
- xshutdown_disable[SECONDARY_CAMERA] = GPIO140_GPIO;
+ xshutdown_disable[SECONDARY_CAMERA] =
+ GPIO140_GPIO | PIN_OUTPUT_LOW;
extra->xshutdown_pins[SECONDARY_CAMERA].gpio = 140;
} else {
extra->xenon_charge = GPIO_MMIO_XENON_CHARGE;
xshutdown_host[SECONDARY_CAMERA] = GPIO142_GPIO;
xshutdown_fw[SECONDARY_CAMERA] = GPIO142_IP_GPIO3;
- xshutdown_disable[SECONDARY_CAMERA] = GPIO142_GPIO;
+ xshutdown_disable[SECONDARY_CAMERA] =
+ GPIO142_GPIO | PIN_OUTPUT_LOW;
extra->xshutdown_pins[SECONDARY_CAMERA].gpio = 142;
}
/* Setup Xenon Charge */
@@ -271,6 +273,7 @@ err_regulator:
err_no_mem_reg:
return err;
}
+
static void mmio_power_exit(struct mmio_platform_data *pdata)
{
int i = 0;