1 files changed, 50 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index db4209413450..192d719a47df 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -471,6 +471,40 @@ static const struct mux_config da850_pins[] = {
        MUX_CFG(DA850, NEMA_CS_4,       7,      8,      15,     1,      false)
        MUX_CFG(DA850, NEMA_WE,         7,      16,     15,     1,      false)
        MUX_CFG(DA850, NEMA_OE,         7,      20,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_0,         12,     28,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_3,         12,     16,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_4,         12,     12,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_5,         12,     8,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_6,         12,     4,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_7,         12,     0,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_8,         11,     28,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_9,         11,     24,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_10,        11,     20,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_11,        11,     16,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_12,        11,     12,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_13,        11,     8,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_14,        11,     4,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_15,        11,     0,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_16,        10,     28,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_17,        10,     24,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_18,        10,     20,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_19,        10,     16,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_20,        10,     12,     15,     1,      false)
+        MUX_CFG(DA850, EMA_A_21,        10,     8,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_22,        10,     4,      15,     1,      false)
+        MUX_CFG(DA850, EMA_A_23,        10,     0,      15,     1,      false)
+        MUX_CFG(DA850, EMA_D_8,         8,      28,     15,     1,      false)
+        MUX_CFG(DA850, EMA_D_9,         8,      24,     15,     1,      false)
+        MUX_CFG(DA850, EMA_D_10,        8,      20,     15,     1,      false)
+        MUX_CFG(DA850, EMA_D_11,        8,      16,     15,     1,      false)
+        MUX_CFG(DA850, EMA_D_12,        8,      12,     15,     1,      false)
+        MUX_CFG(DA850, EMA_D_13,        8,      8,      15,     1,      false)
+        MUX_CFG(DA850, EMA_D_14,        8,      4,      15,     1,      false)
+        MUX_CFG(DA850, EMA_D_15,        8,      0,      15,     1,      false)
+        MUX_CFG(DA850, EMA_BA_1,        5,      24,     15,     1,      false)
+        MUX_CFG(DA850, EMA_CLK,         6,      0,      15,     1,      false)
+        MUX_CFG(DA850, EMA_WAIT_1,      6,      24,     15,     1,      false)
+        MUX_CFG(DA850, NEMA_CS_2,       7,      0,      15,     1,      false)
        /* GPIO function */
        MUX_CFG(DA850, GPIO2_15,        5,      0,      15,     8,      false)
        MUX_CFG(DA850, GPIO8_10,        18,     28,     15,     8,      false)
@@ -545,6 +579,22 @@ const short da850_nand_pins[] __initdata = {
        -1
 };
+const short da850_nor_pins[] __initdata = {
+        DA850_EMA_BA_1, DA850_EMA_CLK, DA850_EMA_WAIT_1, DA850_NEMA_CS_2,
+        DA850_NEMA_WE, DA850_NEMA_OE, DA850_EMA_D_0, DA850_EMA_D_1,
+        DA850_EMA_D_2, DA850_EMA_D_3, DA850_EMA_D_4, DA850_EMA_D_5,
+        DA850_EMA_D_6, DA850_EMA_D_7, DA850_EMA_D_8, DA850_EMA_D_9,
+        DA850_EMA_D_10, DA850_EMA_D_11, DA850_EMA_D_12, DA850_EMA_D_13,
+        DA850_EMA_D_14, DA850_EMA_D_15, DA850_EMA_A_0, DA850_EMA_A_1,
+        DA850_EMA_A_2, 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,
+        -1
+};
 /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
 static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_COMMTX]              = 7,

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index db4209413450..192d719a47df 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c
@@ -471,6 +471,40 @@ static const struct mux_config da850_pins[] = {
471	MUX_CFG(DA850, NEMA_CS_4, 7, 8, 15, 1, false)	471	MUX_CFG(DA850, NEMA_CS_4, 7, 8, 15, 1, false)
472	MUX_CFG(DA850, NEMA_WE, 7, 16, 15, 1, false)	472	MUX_CFG(DA850, NEMA_WE, 7, 16, 15, 1, false)
473	MUX_CFG(DA850, NEMA_OE, 7, 20, 15, 1, false)	473	MUX_CFG(DA850, NEMA_OE, 7, 20, 15, 1, false)
		474	MUX_CFG(DA850, EMA_A_0, 12, 28, 15, 1, false)
		475	MUX_CFG(DA850, EMA_A_3, 12, 16, 15, 1, false)
		476	MUX_CFG(DA850, EMA_A_4, 12, 12, 15, 1, false)
		477	MUX_CFG(DA850, EMA_A_5, 12, 8, 15, 1, false)
		478	MUX_CFG(DA850, EMA_A_6, 12, 4, 15, 1, false)
		479	MUX_CFG(DA850, EMA_A_7, 12, 0, 15, 1, false)
		480	MUX_CFG(DA850, EMA_A_8, 11, 28, 15, 1, false)
		481	MUX_CFG(DA850, EMA_A_9, 11, 24, 15, 1, false)
		482	MUX_CFG(DA850, EMA_A_10, 11, 20, 15, 1, false)
		483	MUX_CFG(DA850, EMA_A_11, 11, 16, 15, 1, false)
		484	MUX_CFG(DA850, EMA_A_12, 11, 12, 15, 1, false)
		485	MUX_CFG(DA850, EMA_A_13, 11, 8, 15, 1, false)
		486	MUX_CFG(DA850, EMA_A_14, 11, 4, 15, 1, false)
		487	MUX_CFG(DA850, EMA_A_15, 11, 0, 15, 1, false)
		488	MUX_CFG(DA850, EMA_A_16, 10, 28, 15, 1, false)
		489	MUX_CFG(DA850, EMA_A_17, 10, 24, 15, 1, false)
		490	MUX_CFG(DA850, EMA_A_18, 10, 20, 15, 1, false)
		491	MUX_CFG(DA850, EMA_A_19, 10, 16, 15, 1, false)
		492	MUX_CFG(DA850, EMA_A_20, 10, 12, 15, 1, false)
		493	MUX_CFG(DA850, EMA_A_21, 10, 8, 15, 1, false)
		494	MUX_CFG(DA850, EMA_A_22, 10, 4, 15, 1, false)
		495	MUX_CFG(DA850, EMA_A_23, 10, 0, 15, 1, false)
		496	MUX_CFG(DA850, EMA_D_8, 8, 28, 15, 1, false)
		497	MUX_CFG(DA850, EMA_D_9, 8, 24, 15, 1, false)
		498	MUX_CFG(DA850, EMA_D_10, 8, 20, 15, 1, false)
		499	MUX_CFG(DA850, EMA_D_11, 8, 16, 15, 1, false)
		500	MUX_CFG(DA850, EMA_D_12, 8, 12, 15, 1, false)
		501	MUX_CFG(DA850, EMA_D_13, 8, 8, 15, 1, false)
		502	MUX_CFG(DA850, EMA_D_14, 8, 4, 15, 1, false)
		503	MUX_CFG(DA850, EMA_D_15, 8, 0, 15, 1, false)
		504	MUX_CFG(DA850, EMA_BA_1, 5, 24, 15, 1, false)
		505	MUX_CFG(DA850, EMA_CLK, 6, 0, 15, 1, false)
		506	MUX_CFG(DA850, EMA_WAIT_1, 6, 24, 15, 1, false)
		507	MUX_CFG(DA850, NEMA_CS_2, 7, 0, 15, 1, false)
474	/* GPIO function */	508	/* GPIO function */
475	MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false)	509	MUX_CFG(DA850, GPIO2_15, 5, 0, 15, 8, false)
476	MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false)	510	MUX_CFG(DA850, GPIO8_10, 18, 28, 15, 8, false)
@@ -545,6 +579,22 @@ const short da850_nand_pins[] __initdata = {
545	-1	579	-1
546	};	580	};
547		581
		582	const short da850_nor_pins[] __initdata = {
		583	DA850_EMA_BA_1, DA850_EMA_CLK, DA850_EMA_WAIT_1, DA850_NEMA_CS_2,
		584	DA850_NEMA_WE, DA850_NEMA_OE, DA850_EMA_D_0, DA850_EMA_D_1,
		585	DA850_EMA_D_2, DA850_EMA_D_3, DA850_EMA_D_4, DA850_EMA_D_5,
		586	DA850_EMA_D_6, DA850_EMA_D_7, DA850_EMA_D_8, DA850_EMA_D_9,
		587	DA850_EMA_D_10, DA850_EMA_D_11, DA850_EMA_D_12, DA850_EMA_D_13,
		588	DA850_EMA_D_14, DA850_EMA_D_15, DA850_EMA_A_0, DA850_EMA_A_1,
		589	DA850_EMA_A_2, DA850_EMA_A_3, DA850_EMA_A_4, DA850_EMA_A_5,
		590	DA850_EMA_A_6, DA850_EMA_A_7, DA850_EMA_A_8, DA850_EMA_A_9,
		591	DA850_EMA_A_10, DA850_EMA_A_11, DA850_EMA_A_12, DA850_EMA_A_13,
		592	DA850_EMA_A_14, DA850_EMA_A_15, DA850_EMA_A_16, DA850_EMA_A_17,
		593	DA850_EMA_A_18, DA850_EMA_A_19, DA850_EMA_A_20, DA850_EMA_A_21,
		594	DA850_EMA_A_22, DA850_EMA_A_23,
		595	-1
		596	};
		597
548	/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */	598	/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
549	static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {	599	static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
550	[IRQ_DA8XX_COMMTX] = 7,	600	[IRQ_DA8XX_COMMTX] = 7,