aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include/mach
diff options
context:
space:
mode:
authorSudhakar Rajashekhara <sudhakar.raj@ti.com>2009-08-13 17:36:25 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-08-26 04:55:56 -0400
commit7c5ec6095a7d29c89ee050281faa068a374a5ac6 (patch)
tree5ac3611c87a80e6c48fd3dbc39fbd562af624050 /arch/arm/mach-davinci/include/mach
parent38beb929f2c33a37bf3af6103c064a9edfbe242b (diff)
davinci: Add NOR flash support for da850/omap-l138
This patch adds platform data for the 8MB NOR flash found on da850/omap-l138 EVM. Both NOR and NAND can co-exist on da850/omap-l138 as they are using different chip selects. Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h2
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h34
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 @@
40#define DA8XX_PSC1_BASE 0x01e27000 40#define DA8XX_PSC1_BASE 0x01e27000
41#define DA8XX_LCD_CNTRL_BASE 0x01e13000 41#define DA8XX_LCD_CNTRL_BASE 0x01e13000
42#define DA8XX_MMCSD0_BASE 0x01c40000 42#define DA8XX_MMCSD0_BASE 0x01c40000
43#define DA8XX_AEMIF_CS2_BASE 0x60000000
43#define DA8XX_AEMIF_CS3_BASE 0x62000000 44#define DA8XX_AEMIF_CS3_BASE 0x62000000
44#define DA8XX_AEMIF_CTL_BASE 0x68000000 45#define DA8XX_AEMIF_CTL_BASE 0x68000000
45 46
@@ -113,6 +114,7 @@ extern const short da850_mcasp_pins[];
113extern const short da850_lcdcntl_pins[]; 114extern const short da850_lcdcntl_pins[];
114extern const short da850_mmcsd0_pins[]; 115extern const short da850_mmcsd0_pins[];
115extern const short da850_nand_pins[]; 116extern const short da850_nand_pins[];
117extern const short da850_nor_pins[];
116 118
117int da8xx_pinmux_setup(const short pins[]); 119int da8xx_pinmux_setup(const short pins[]);
118 120
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 {
821 DA850_NEMA_CS_4, 821 DA850_NEMA_CS_4,
822 DA850_NEMA_WE, 822 DA850_NEMA_WE,
823 DA850_NEMA_OE, 823 DA850_NEMA_OE,
824 DA850_EMA_D_15,
825 DA850_EMA_D_14,
826 DA850_EMA_D_13,
827 DA850_EMA_D_12,
828 DA850_EMA_D_11,
829 DA850_EMA_D_10,
830 DA850_EMA_D_9,
831 DA850_EMA_D_8,
832 DA850_EMA_A_0,
833 DA850_EMA_A_3,
834 DA850_EMA_A_4,
835 DA850_EMA_A_5,
836 DA850_EMA_A_6,
837 DA850_EMA_A_7,
838 DA850_EMA_A_8,
839 DA850_EMA_A_9,
840 DA850_EMA_A_10,
841 DA850_EMA_A_11,
842 DA850_EMA_A_12,
843 DA850_EMA_A_13,
844 DA850_EMA_A_14,
845 DA850_EMA_A_15,
846 DA850_EMA_A_16,
847 DA850_EMA_A_17,
848 DA850_EMA_A_18,
849 DA850_EMA_A_19,
850 DA850_EMA_A_20,
851 DA850_EMA_A_21,
852 DA850_EMA_A_22,
853 DA850_EMA_A_23,
854 DA850_EMA_BA_1,
855 DA850_EMA_CLK,
856 DA850_EMA_WAIT_1,
857 DA850_NEMA_CS_2,
824 858
825 /* GPIO function */ 859 /* GPIO function */
826 DA850_GPIO2_15, 860 DA850_GPIO2_15,