diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2006-12-06 20:13:54 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-05-10 18:51:09 -0400 |
commit | 7bbb3cc5c816fc167601ce9519adae5eced3ea6d (patch) | |
tree | 46230dd86d69905a2acbf76769036c9736156ae1 /include/asm-arm | |
parent | d30c7369666ff1687f668ea5a65b99d1f7e06144 (diff) |
ARM: OMAP: 24xx pinmux updates
Add some OMAP 24xx pin mux declarations to support:
- TUSB 6010 EVM (on H4)
- All three full speed USB ports
- GPIOs used with USB0 on Apollon and H4
For OMAP2, issue MUX_WARNINGS and debug messages correctly; and make the
message look more like the OMAP1 message.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-omap/mux.h | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h index 828cc5c114e1..f1ec2edd4040 100644 --- a/include/asm-arm/arch-omap/mux.h +++ b/include/asm-arm/arch-omap/mux.h | |||
@@ -421,7 +421,9 @@ enum omap24xx_index { | |||
421 | /* 24xx clock */ | 421 | /* 24xx clock */ |
422 | W14_24XX_SYS_CLKOUT, | 422 | W14_24XX_SYS_CLKOUT, |
423 | 423 | ||
424 | /* 24xx GPMC wait pin monitoring */ | 424 | /* 24xx GPMC chipselects, wait pin monitoring */ |
425 | E2_GPMC_NCS2, | ||
426 | L2_GPMC_NCS7, | ||
425 | L3_GPMC_WAIT0, | 427 | L3_GPMC_WAIT0, |
426 | N7_GPMC_WAIT1, | 428 | N7_GPMC_WAIT1, |
427 | M1_GPMC_WAIT2, | 429 | M1_GPMC_WAIT2, |
@@ -435,6 +437,7 @@ enum omap24xx_index { | |||
435 | 437 | ||
436 | /* 24xx GPIO */ | 438 | /* 24xx GPIO */ |
437 | M21_242X_GPIO11, | 439 | M21_242X_GPIO11, |
440 | P21_242X_GPIO12, | ||
438 | AA10_242X_GPIO13, | 441 | AA10_242X_GPIO13, |
439 | AA6_242X_GPIO14, | 442 | AA6_242X_GPIO14, |
440 | AA4_242X_GPIO15, | 443 | AA4_242X_GPIO15, |
@@ -444,7 +447,9 @@ enum omap24xx_index { | |||
444 | Y20_24XX_GPIO60, | 447 | Y20_24XX_GPIO60, |
445 | W4__24XX_GPIO74, | 448 | W4__24XX_GPIO74, |
446 | M15_24XX_GPIO92, | 449 | M15_24XX_GPIO92, |
450 | J15_24XX_GPIO99, | ||
447 | V14_24XX_GPIO117, | 451 | V14_24XX_GPIO117, |
452 | P14_24XX_GPIO125, | ||
448 | 453 | ||
449 | /* 242x DBG GPIO */ | 454 | /* 242x DBG GPIO */ |
450 | V4_242X_GPIO49, | 455 | V4_242X_GPIO49, |
@@ -486,6 +491,30 @@ enum omap24xx_index { | |||
486 | G18_24XX_MMC_CMD_DIR, | 491 | G18_24XX_MMC_CMD_DIR, |
487 | H15_24XX_MMC_CLKI, | 492 | H15_24XX_MMC_CLKI, |
488 | 493 | ||
494 | /* Full speed USB */ | ||
495 | J20_24XX_USB0_PUEN, | ||
496 | J19_24XX_USB0_VP, | ||
497 | K20_24XX_USB0_VM, | ||
498 | J18_24XX_USB0_RCV, | ||
499 | K19_24XX_USB0_TXEN, | ||
500 | J14_24XX_USB0_SE0, | ||
501 | K18_24XX_USB0_DAT, | ||
502 | |||
503 | N14_24XX_USB1_SE0, | ||
504 | W12_24XX_USB1_SE0, | ||
505 | P15_24XX_USB1_DAT, | ||
506 | R13_24XX_USB1_DAT, | ||
507 | W20_24XX_USB1_TXEN, | ||
508 | P13_24XX_USB1_TXEN, | ||
509 | V19_24XX_USB1_RCV, | ||
510 | V12_24XX_USB1_RCV, | ||
511 | |||
512 | AA10_24XX_USB2_SE0, | ||
513 | Y11_24XX_USB2_DAT, | ||
514 | AA12_24XX_USB2_TXEN, | ||
515 | AA6_24XX_USB2_RCV, | ||
516 | AA4_24XX_USB2_TLLSE0, | ||
517 | |||
489 | /* Keypad GPIO*/ | 518 | /* Keypad GPIO*/ |
490 | T19_24XX_KBR0, | 519 | T19_24XX_KBR0, |
491 | R19_24XX_KBR1, | 520 | R19_24XX_KBR1, |