From 2d42a1e6e6a3a60d8da9f1556523a573820df8ca Mon Sep 17 00:00:00 2001 From: Rajat Verma Date: Tue, 11 Oct 2011 09:34:50 +0530 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33571 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT --- arch/arm/mach-ux500/board-mop500-mmio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-ux500/board-mop500-mmio.c') 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; -- cgit v1.2.3