aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2008-03-20 10:56:26 -0400
committerTony Lindgren <tony@atomide.com>2008-04-14 12:57:13 -0400
commitf7337a199acffa9f12fa9d88253d33bfb56ef14a (patch)
treee2f85689743bea108274fb88e4dafd433b8010e5 /arch/arm/mach-omap2
parentdd89dd98cb9ae28f9e4c4d2c08be427a1f941c54 (diff)
ARM: OMAP2: Add new pin multiplexing configurations
Add new pin multiplexing configurations Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/mux.c44
1 files changed, 41 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 71cff46a8b71..5cba3a2a2392 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -79,7 +79,12 @@ MUX_CFG_24XX("AA12_242X_GPIO17", 0x0e9, 3, 0, 0, 1)
79MUX_CFG_24XX("AA8_242X_GPIO58", 0x0ea, 3, 0, 0, 1) 79MUX_CFG_24XX("AA8_242X_GPIO58", 0x0ea, 3, 0, 0, 1)
80MUX_CFG_24XX("Y20_24XX_GPIO60", 0x12c, 3, 0, 0, 1) 80MUX_CFG_24XX("Y20_24XX_GPIO60", 0x12c, 3, 0, 0, 1)
81MUX_CFG_24XX("W4__24XX_GPIO74", 0x0f2, 3, 0, 0, 1) 81MUX_CFG_24XX("W4__24XX_GPIO74", 0x0f2, 3, 0, 0, 1)
82MUX_CFG_24XX("N15_24XX_GPIO85", 0x103, 3, 0, 0, 1)
82MUX_CFG_24XX("M15_24XX_GPIO92", 0x10a, 3, 0, 0, 1) 83MUX_CFG_24XX("M15_24XX_GPIO92", 0x10a, 3, 0, 0, 1)
84MUX_CFG_24XX("P20_24XX_GPIO93", 0x10b, 3, 0, 0, 1)
85MUX_CFG_24XX("P18_24XX_GPIO95", 0x10d, 3, 0, 0, 1)
86MUX_CFG_24XX("M18_24XX_GPIO96", 0x10e, 3, 0, 0, 1)
87MUX_CFG_24XX("L14_24XX_GPIO97", 0x10f, 3, 0, 0, 1)
83MUX_CFG_24XX("J15_24XX_GPIO99", 0x113, 3, 1, 1, 1) 88MUX_CFG_24XX("J15_24XX_GPIO99", 0x113, 3, 1, 1, 1)
84MUX_CFG_24XX("V14_24XX_GPIO117", 0x128, 3, 1, 0, 1) 89MUX_CFG_24XX("V14_24XX_GPIO117", 0x128, 3, 1, 0, 1)
85MUX_CFG_24XX("P14_24XX_GPIO125", 0x140, 3, 1, 1, 1) 90MUX_CFG_24XX("P14_24XX_GPIO125", 0x140, 3, 1, 1, 1)
@@ -104,9 +109,6 @@ MUX_CFG_24XX("G4_242X_DMAREQ3", 0x073, 2, 0, 0, 1)
104MUX_CFG_24XX("D3_242X_DMAREQ4", 0x072, 2, 0, 0, 1) 109MUX_CFG_24XX("D3_242X_DMAREQ4", 0x072, 2, 0, 0, 1)
105MUX_CFG_24XX("E3_242X_DMAREQ5", 0x071, 2, 0, 0, 1) 110MUX_CFG_24XX("E3_242X_DMAREQ5", 0x071, 2, 0, 0, 1)
106 111
107/* TSC IRQ */
108MUX_CFG_24XX("P20_24XX_TSC_IRQ", 0x108, 0, 0, 0, 1)
109
110/* UART3 */ 112/* UART3 */
111MUX_CFG_24XX("K15_24XX_UART3_TX", 0x118, 0, 0, 0, 1) 113MUX_CFG_24XX("K15_24XX_UART3_TX", 0x118, 0, 0, 0, 1)
112MUX_CFG_24XX("K14_24XX_UART3_RX", 0x119, 0, 0, 0, 1) 114MUX_CFG_24XX("K14_24XX_UART3_RX", 0x119, 0, 0, 0, 1)
@@ -169,6 +171,42 @@ MUX_CFG_24XX("B3__24XX_KBR5", 0x30, 3, 1, 1, 1)
169MUX_CFG_24XX("AA4_24XX_KBC2", 0xe7, 3, 0, 0, 1) 171MUX_CFG_24XX("AA4_24XX_KBC2", 0xe7, 3, 0, 0, 1)
170MUX_CFG_24XX("B13_24XX_KBC6", 0x110, 3, 0, 0, 1) 172MUX_CFG_24XX("B13_24XX_KBC6", 0x110, 3, 0, 0, 1)
171 173
174/* 2430 USB */
175MUX_CFG_24XX("AD9_2430_USB0_PUEN", 0x133, 4, 0, 0, 1)
176MUX_CFG_24XX("Y11_2430_USB0_VP", 0x134, 4, 0, 0, 1)
177MUX_CFG_24XX("AD7_2430_USB0_VM", 0x135, 4, 0, 0, 1)
178MUX_CFG_24XX("AE7_2430_USB0_RCV", 0x136, 4, 0, 0, 1)
179MUX_CFG_24XX("AD4_2430_USB0_TXEN", 0x137, 4, 0, 0, 1)
180MUX_CFG_24XX("AF9_2430_USB0_SE0", 0x138, 4, 0, 0, 1)
181MUX_CFG_24XX("AE6_2430_USB0_DAT", 0x139, 4, 0, 0, 1)
182MUX_CFG_24XX("AD24_2430_USB1_SE0", 0x107, 2, 0, 0, 1)
183MUX_CFG_24XX("AB24_2430_USB1_RCV", 0x108, 2, 0, 0, 1)
184MUX_CFG_24XX("Y25_2430_USB1_TXEN", 0x109, 2, 0, 0, 1)
185MUX_CFG_24XX("AA26_2430_USB1_DAT", 0x10A, 2, 0, 0, 1)
186
187/* 2430 HS-USB */
188MUX_CFG_24XX("AD9_2430_USB0HS_DATA3", 0x133, 0, 0, 0, 1)
189MUX_CFG_24XX("Y11_2430_USB0HS_DATA4", 0x134, 0, 0, 0, 1)
190MUX_CFG_24XX("AD7_2430_USB0HS_DATA5", 0x135, 0, 0, 0, 1)
191MUX_CFG_24XX("AE7_2430_USB0HS_DATA6", 0x136, 0, 0, 0, 1)
192MUX_CFG_24XX("AD4_2430_USB0HS_DATA2", 0x137, 0, 0, 0, 1)
193MUX_CFG_24XX("AF9_2430_USB0HS_DATA0", 0x138, 0, 0, 0, 1)
194MUX_CFG_24XX("AE6_2430_USB0HS_DATA1", 0x139, 0, 0, 0, 1)
195MUX_CFG_24XX("AE8_2430_USB0HS_CLK", 0x13A, 0, 0, 0, 1)
196MUX_CFG_24XX("AD8_2430_USB0HS_DIR", 0x13B, 0, 0, 0, 1)
197MUX_CFG_24XX("AE5_2430_USB0HS_STP", 0x13c, 0, 1, 1, 1)
198MUX_CFG_24XX("AE9_2430_USB0HS_NXT", 0x13D, 0, 0, 0, 1)
199MUX_CFG_24XX("AC7_2430_USB0HS_DATA7", 0x13E, 0, 0, 0, 1)
200
201/* 2430 McBSP */
202MUX_CFG_24XX("AC10_2430_MCBSP2_FSX", 0x012E, 1, 0, 0, 1)
203MUX_CFG_24XX("AD16_2430_MCBSP2_CLX", 0x012F, 1, 0, 0, 1)
204MUX_CFG_24XX("AE13_2430_MCBSP2_DX", 0x0130, 1, 0, 0, 1)
205MUX_CFG_24XX("AD13_2430_MCBSP2_DR", 0x0131, 1, 0, 0, 1)
206MUX_CFG_24XX("AC10_2430_MCBSP2_FSX_OFF",0x012E, 0, 0, 0, 1)
207MUX_CFG_24XX("AD16_2430_MCBSP2_CLX_OFF",0x012F, 0, 0, 0, 1)
208MUX_CFG_24XX("AE13_2430_MCBSP2_DX_OFF", 0x0130, 0, 0, 0, 1)
209MUX_CFG_24XX("AD13_2430_MCBSP2_DR_OFF", 0x0131, 0, 0, 0, 1)
172}; 210};
173 211
174#ifdef CONFIG_ARCH_OMAP24XX 212#ifdef CONFIG_ARCH_OMAP24XX