Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...

[platform/kernel/linux-rpi.git] / arch / arm / plat-mxc / include / mach / mx25.h

diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h
index 087cd7a..ccebf5b 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx25.h
+++ b/arch/arm/plat-mxc/include/mach/mx25.h
@@ -41,6 +41,7 @@
 #define MX25_SSI2_BASE_ADDR            0x50014000
 #define MX25_SSI1_BASE_ADDR            0x50034000
 #define MX25_NFC_BASE_ADDR             0xbb000000
 #define MX25_SSI2_BASE_ADDR            0x50014000
 #define MX25_SSI1_BASE_ADDR            0x50034000
 #define MX25_NFC_BASE_ADDR             0xbb000000

+#define MX25_IIM_BASE_ADDR             0x53ff0000

 #define MX25_DRYICE_BASE_ADDR          0x53ffc000
 #define MX25_ESDHC1_BASE_ADDR          0x53fb4000
 #define MX25_ESDHC2_BASE_ADDR          0x53fb8000
 #define MX25_DRYICE_BASE_ADDR          0x53ffc000
 #define MX25_ESDHC1_BASE_ADDR          0x53fb4000
 #define MX25_ESDHC2_BASE_ADDR          0x53fb8000


@@ -104,4 +105,8 @@
 #define MX25_DMA_REQ_SSI1_RX0  28
 #define MX25_DMA_REQ_SSI1_TX0  29
 
 #define MX25_DMA_REQ_SSI1_RX0  28
 #define MX25_DMA_REQ_SSI1_TX0  29
 

+#ifndef __ASSEMBLY__
+extern int mx25_revision(void);
+#endif
+

 #endif /* ifndef __MACH_MX25_H__ */
 #endif /* ifndef __MACH_MX25_H__ */