From c56bb68d95b962495629f08fe0890ecdeb790912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 5 Apr 2012 12:01:10 +0200 Subject: [PATCH] fix mxs iomux error in mx23 case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sascha Hauer --- arch/arm/mach-mxs/include/mach/iomux-imx23.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-mxs/include/mach/iomux-imx23.h b/arch/arm/mach-mxs/include/mach/iomux-imx23.h index bebaf5657..7b2883c7b 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)