From 2f6b1f7690640f571f8e72fc2f2564acb2e13778 Mon Sep 17 00:00:00 2001 From: Juergen Beisert Date: Wed, 11 Jul 2012 11:15:58 +0200 Subject: [PATCH] ARM/MXS: the GPIO bitkeeper enable logic is inverse to the pullup enable logic While a set bit enables the pullup (if exists) it disables the bitkeeper (if exists). Both features are using the same register bit and only one of this feature is present on a per pin base. Signed-off-by: Juergen Beisert Signed-off-by: Sascha Hauer --- arch/arm/mach-mxs/iomux-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mxs/iomux-imx.c b/arch/arm/mach-mxs/iomux-imx.c index 6bcde035b..a3ecb943c 100644 --- a/arch/arm/mach-mxs/iomux-imx.c +++ b/arch/arm/mach-mxs/iomux-imx.c @@ -131,7 +131,7 @@ void imx_gpio_mode(uint32_t m) if (BK_PRESENT(m)) { reg_offset = calc_pullup_reg(gpio_pin); writel(0x1 << (gpio_pin % 32), IMX_IOMUXC_BASE + reg_offset + - (GET_BITKEEPER(m) == 1 ? BIT_SET : BIT_CLR)); + (GET_BITKEEPER(m) == 1 ? BIT_CLR : BIT_SET)); } if (GET_FUNC(m) == IS_GPIO) {