summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-04-05 12:01:10 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-05 18:22:18 +0200
commitc56bb68d95b962495629f08fe0890ecdeb790912 (patch)
treea5b5e5c53f33b0b443ebea8c592bd1e22c6068fd /arch/arm/mach-mxs
parent167443183145eaebfe7e2e68b78e157cf527d3ef (diff)
downloadbarebox-c56bb68d95b962495629f08fe0890ecdeb790912.tar.gz
barebox-c56bb68d95b962495629f08fe0890ecdeb790912.tar.xz
fix mxs iomux error in mx23 case
e62edd3 mxs: Fix support for BITKEEPER() macro added this macro in iomux-imxc.c but the macro is not present in the i.MX23 case. Adding it in iomux-imx23.h fix both imx23evk_defconfig and chumbyone_defconfig Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/include/mach/iomux-imx23.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/iomux-imx23.h b/arch/arm/mach-mxs/include/mach/iomux-imx23.h
index bebaf56571..7b2883c7ba 100644
--- a/arch/arm/mach-mxs/include/mach/iomux-imx23.h
+++ b/arch/arm/mach-mxs/include/mach/iomux-imx23.h
@@ -63,9 +63,13 @@
/* control pad's pull up / bit keeper feature */
#define PE (1 << 10)
+#define BK (1 << 11) /* FIXME useful to distinguish? */
#define PE_PRESENT(x) (!!((x) & PE))
+#define BK_PRESENT(x) (!!((x) & BK))
#define PULLUP(x) ((x) << 13)
+#define BITKEEPER(x) ((x) << 14)
#define GET_PULLUP(x) (!!((x) & (1 << 13)))
+#define GET_BITKEEPER(x) (!!((x) & BITKEEPER(1)))
/* control pad's voltage feature */
#define VE (1 << 14)