diff options
| author | Esben Haabendal <esben.haabendal@gmail.com> | 2012-03-26 19:29:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-02 10:11:38 +0200 |
| commit | e62edd3de96421a68c953e57d4d80950e1b01e72 (patch) | |
| tree | fcccc1ae8726021125f9a68a64710318c7375dc8 /arch/arm/mach-mxs | |
| parent | 20da230046a8f4b4731e97ec33dea64cb0f165ee (diff) | |
| download | barebox-e62edd3de96421a68c953e57d4d80950e1b01e72.tar.gz barebox-e62edd3de96421a68c953e57d4d80950e1b01e72.tar.xz | |
mxs: Fix support for BITKEEPER() macro
There was no check for BE, so any BITKEEPER(1) iomux configurations
were not being applied.
Signed-off-by: Esben Haabendal <esben.haabendal@prevas.dk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/iomux-imx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/iomux-imx.c b/arch/arm/mach-mxs/iomux-imx.c index 3161a5d3cc..6bcde035be 100644 --- a/arch/arm/mach-mxs/iomux-imx.c +++ b/arch/arm/mach-mxs/iomux-imx.c @@ -128,6 +128,12 @@ void imx_gpio_mode(uint32_t m) (GET_PULLUP(m) == 1 ? BIT_SET : BIT_CLR)); } + 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)); + } + if (GET_FUNC(m) == IS_GPIO) { if (GET_GPIODIR(m) == 1) { /* first set the output value */ |