summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-05 10:28:11 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-09 11:10:32 +0100
commit847a2ee7392e7d3278f9b82c4b503744c72ee463 (patch)
tree8f1443cd30c634f65d75ea633d94eb80de933c29 /arch
parent300a47b4378a3b2e7c2a423b0aa4d75fc78987d3 (diff)
downloadlinux-3.10-847a2ee7392e7d3278f9b82c4b503744c72ee463.tar.gz
linux-3.10-847a2ee7392e7d3278f9b82c4b503744c72ee463.tar.bz2
linux-3.10-847a2ee7392e7d3278f9b82c4b503744c72ee463.zip
arm/imx: fix power button on imx51 babbage board
Since commit 6571534 (plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired) was in, the power button on imx51 babbage board stopped working because it's pulled up by mistake. The patch removes the pull-up setting from the pad configuration for that gpio to make the power button back to work. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx5/board-mx51_babbage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 5c837603ff0..24994bb5214 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -362,7 +362,7 @@ static void __init mx51_babbage_init(void)
{
iomux_v3_cfg_t usbh1stp = MX51_PAD_USBH1_STP__USBH1_STP;
iomux_v3_cfg_t power_key = NEW_PAD_CTRL(MX51_PAD_EIM_A27__GPIO2_21,
- PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP);
+ PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH);
imx51_soc_init();