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)
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 5c837603ff0f..24994bb52147 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();
d>1-0/+608 2017-05-30powerpc/sequoia: Fix NAND partitions not to overlapPavel Machek1-1/+1 2017-05-30powerpc/64s: Fix FIXUP_ENDIAN non-maskable interrupt reentrancyNicholas Piggin1-5/+7 2017-05-22Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller1-1/+0 2017-05-18devicetree: Move include prefixes from arch to separate directoryOlof Johansson1-1/+0 2017-05-18powerpc/85xx/kmcent2: use hdlc busmode for UCC1Holger Brunck1-3/+1 2017-03-08powerpc/boot: Fix zImage TOC alignmentMichael Ellerman1-0/+1 2017-03-01Merge tag 'powerpc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds2-0/+307 2017-03-01Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2-4/+4 2017-02-27scripts/spelling.txt: add "partiton" pattern and fix typo instancesMasahiro Yamada1-1/+1 2017-02-22Merge tag 'powerpc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds1-0/+4 2017-02-22powerpc/mpc85xx: Update TMU device tree node for T1023/T1024Hongtao Jia1-2/+2 2017-02-22powerpc/mpc85xx: Update TMU device tree node for T1040/T1042Hongtao Jia1-2/+2 2017-02-18Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwoo...Michael Ellerman2-0/+307 2017-02-03EDAC, mpc85xx: Add T2080 l2-cache supportChris Packham1-0/+1 2017-02-02powerpc/boot: Update .gitignoreMichael Ellerman1-0/+4 2017-01-25powerpc/corenet: add support for the kmcent2 boardValentin Longchamp1-0/+303 2017-01-25powerpc/corenet: explicitly disable the SDHC controller on kmcoge4Valentin Longchamp1-0/+4 2016-12-16Merge tag 'powerpc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds10-30/+287 2016-12-16Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwoo...Michael Ellerman6-0/+250 2016-12-09powerpc/fsl/dts: add FMan node for t1042d4rdbMadalin Bucur1-0/+52 2016-12-09powerpc/fsl/dts: add sg_2500_aqr105_phy4 alias on t1024rdbMadalin Bucur1-0/+4 2016-12-09powerpc/fsl/dts: add QMan and BMan nodes on t1024Madalin Bucur2-0/+58 2016-12-09powerpc/fsl/dts: add QMan and BMan nodes on t1023Madalin Bucur2-0/+132 2016-12-05powerpc/boot: Request no dynamic linker for boot wrapperNicholas Piggin1-1/+23 2016-11-30powerpc/ps3: Fix system hang with GCC 5 buildsGeoff Levand2-12/+1 2016-11-29powerpc/boot: Fix rebuild when changing kernel endianMichael Ellerman1-4/+0 2016-11-29powerpc/boot: All uses of if_changed should depend on FORCEMichael Ellerman1-13/+13 2016-11-28powerpc/boot: Fix build failure in 32-bit boot wrapperBen Hutchings2-2/+3 2016-11-24powerpc/boot: Fix the early OPAL console wrappersOliver O'Halloran4-2/+31 2016-11-22powerpc/dts: add device tree entry for W83793 on T4240RDBFlorian Larysch1-0/+4 2016-10-19powerpc/boot: Fix boot on systems with uncompressed kernel imageHeiner Kallweit1-2/+16