diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-07-11 11:15:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-16 23:30:14 +0200 |
| commit | 2f6b1f7690640f571f8e72fc2f2564acb2e13778 (patch) | |
| tree | 4ca5e76008ba35e20dafa82fdd270169112dc812 | |
| parent | a540e889654c763776ea4a62f40bef97529ef4d6 (diff) | |
| download | barebox-2f6b1f7690640f571f8e72fc2f2564acb2e13778.tar.gz barebox-2f6b1f7690640f571f8e72fc2f2564acb2e13778.tar.xz | |
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 <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mxs/iomux-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/iomux-imx.c b/arch/arm/mach-mxs/iomux-imx.c index 6bcde035be..a3ecb943c8 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) { |