2 files changed, 36 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 77e5d2398e21..d4095d0572c6 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -40,6 +40,7 @@
 #define DA8XX_PSC1_BASE         0x01e27000
 #define DA8XX_LCD_CNTRL_BASE    0x01e13000
 #define DA8XX_MMCSD0_BASE       0x01c40000
+#define DA8XX_AEMIF_CS2_BASE    0x60000000
 #define DA8XX_AEMIF_CS3_BASE    0x62000000
 #define DA8XX_AEMIF_CTL_BASE    0x68000000
 
@@ -113,6 +114,7 @@ extern const short da850_mcasp_pins[];
 extern const short da850_lcdcntl_pins[];
 extern const short da850_mmcsd0_pins[];
 extern const short da850_nand_pins[];
+extern const short da850_nor_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 ee6f29db4452..88cd22af4946 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -821,6 +821,40 @@ enum davinci_da850_index {
         DA850_NEMA_CS_4,
         DA850_NEMA_WE,
         DA850_NEMA_OE,
+        DA850_EMA_D_15,
+        DA850_EMA_D_14,
+        DA850_EMA_D_13,
+        DA850_EMA_D_12,
+        DA850_EMA_D_11,
+        DA850_EMA_D_10,
+        DA850_EMA_D_9,
+        DA850_EMA_D_8,
+        DA850_EMA_A_0,
+        DA850_EMA_A_3,
+        DA850_EMA_A_4,
+        DA850_EMA_A_5,
+        DA850_EMA_A_6,
+        DA850_EMA_A_7,
+        DA850_EMA_A_8,
+        DA850_EMA_A_9,
+        DA850_EMA_A_10,
+        DA850_EMA_A_11,
+        DA850_EMA_A_12,
+        DA850_EMA_A_13,
+        DA850_EMA_A_14,
+        DA850_EMA_A_15,
+        DA850_EMA_A_16,
+        DA850_EMA_A_17,
+        DA850_EMA_A_18,
+        DA850_EMA_A_19,
+        DA850_EMA_A_20,
+        DA850_EMA_A_21,
+        DA850_EMA_A_22,
+        DA850_EMA_A_23,
+        DA850_EMA_BA_1,
+        DA850_EMA_CLK,
+        DA850_EMA_WAIT_1,
+        DA850_NEMA_CS_2,
 
         /* GPIO function */
         DA850_GPIO2_15,