diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-11 09:08:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-11 09:08:49 +0200 |
| commit | fdc889de61fb67dcecadf850fb1f534c786668e9 (patch) | |
| tree | 4f4015accd8dcc83351f45f8489587b38f53e709 /arch/arm/mach-mxs | |
| parent | 7541ec644df5ecaf890c8be74fbff59581717aa1 (diff) | |
| parent | 32e630d182a5479e5da60906523b74a19cf5caab (diff) | |
| download | barebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.gz barebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/iomux-imx23.h | 4 |
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) |