2 files changed, 19 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 0af141ffc3b4..77e5d2398e21 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -40,6 +40,8 @@
 #define DA8XX_PSC1_BASE         0x01e27000
 #define DA8XX_LCD_CNTRL_BASE    0x01e13000
 #define DA8XX_MMCSD0_BASE       0x01c40000
+#define DA8XX_AEMIF_CS3_BASE    0x62000000
+#define DA8XX_AEMIF_CTL_BASE    0x68000000
 
 #define PINMUX0                 0x00
 #define PINMUX1                 0x04
@@ -110,6 +112,7 @@ extern const short da850_cpgmac_pins[];
 extern const short da850_mcasp_pins[];
 extern const short da850_lcdcntl_pins[];
 extern const short da850_mmcsd0_pins[];
+extern const short da850_nand_pins[];
 
 int da8xx_pinmux_setup(const short pins[]);
 
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index b2335640c222..ee6f29db4452 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -806,6 +806,22 @@ enum davinci_da850_index {
         DA850_MMCSD0_CLK,
         DA850_MMCSD0_CMD,
 
+        /* EMIF2.5/EMIFA function */
+        DA850_EMA_D_7,
+        DA850_EMA_D_6,
+        DA850_EMA_D_5,
+        DA850_EMA_D_4,
+        DA850_EMA_D_3,
+        DA850_EMA_D_2,
+        DA850_EMA_D_1,
+        DA850_EMA_D_0,
+        DA850_EMA_A_1,
+        DA850_EMA_A_2,
+        DA850_NEMA_CS_3,
+        DA850_NEMA_CS_4,
+        DA850_NEMA_WE,
+        DA850_NEMA_OE,
+
         /* GPIO function */
         DA850_GPIO2_15,
         DA850_GPIO8_10,