summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajat Verma <rajat.verma@stericsson.com>2011-10-07 16:25:22 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:07:01 +0200
commitf6fac2492301e1185153c95a9e3a607c4ed4c7df (patch)
tree946f8b011bed6d03ff14cfcaa8a7636d8f86e256
parentf819c5ccb26dd5b031b1564bcda2d30c13038b0c (diff)
u8500: mmio: fix gpio_set_value warning
gpio_set_value_cansleep() should be used in place of gpio_set_value() for setting xenon_charge gpio pin which is located on expander chip in case of href boards < v60. ST-Ericsson Linux next: NA ST-Ericsson ID: 361940 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I62676b374552a2fa86f273c9d006220436c0fe68 Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33338 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500-mmio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mmio.c b/arch/arm/mach-ux500/board-mop500-mmio.c
index a67b16aba2c..10dedfac8e8 100644
--- a/arch/arm/mach-ux500/board-mop500-mmio.c
+++ b/arch/arm/mach-ux500/board-mop500-mmio.c
@@ -55,7 +55,7 @@ static pin_cfg_t xshutdown_disable[] = {
GPIO142_GPIO | PIN_OUTPUT_LOW
};
-struct mmio_board_data{
+struct mmio_board_data {
int number_of_regulators;
struct regulator **mmio_regulators;
/* Pin configs */
@@ -274,7 +274,7 @@ err_no_mem_reg:
static void mmio_power_exit(struct mmio_platform_data *pdata)
{
int i = 0;
- struct mmio_board_data *extra = pdata->extra;;
+ struct mmio_board_data *extra = pdata->extra;
dev_dbg(pdata->dev , "Board %s() Enter\n", __func__);
for (i = 0; i < extra->number_of_regulators; i++)
regulator_put(extra->mmio_regulators[i]);
@@ -382,7 +382,7 @@ static void mmio_power_disable(struct mmio_platform_data *pdata)
for (i = 0; i < extra->number_of_regulators; i++)
regulator_disable(extra->mmio_regulators[i]);
/* Disable Xenon Charge */
- gpio_set_value(extra->xenon_charge, 0);
+ gpio_set_value_cansleep(extra->xenon_charge, 0);
}
static int mmio_clock_enable(struct mmio_platform_data *pdata)
{