Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / arch / arm / mach-mxs / include / mach / mxs.h

diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
index 35a89dd..0d2d2b4 100644 (file)
--- a/arch/arm/mach-mxs/include/mach/mxs.h
+++ b/arch/arm/mach-mxs/include/mach/mxs.h
@@ -33,6 +33,7 @@
                0)
 #define cpu_is_mx28()          (                                       \
                machine_is_mx28evk() ||                                 \
+               machine_is_m28evk() ||                                  \
                machine_is_tx28() ||                                    \
                0)
 
@@ -86,6 +87,8 @@
        .type = _type,                                                  \
 }
 
+#define MXS_GPIO_NR(bank, nr)  ((bank) * 32 + (nr))
+
 #define MXS_SET_ADDR           0x4
 #define MXS_CLR_ADDR           0x8
 #define MXS_TOG_ADDR           0xc