diff options
author | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:23:46 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:51:21 -0400 |
commit | b9d766c767d53a9be1f741a53fe8151354ba1da3 (patch) | |
tree | 5011cf162cded7ed45e682c2ebdf406237f4a86d /arch/arm | |
parent | 2bb6c8026ccfa26ba713f4462f661aba7dd4dc16 (diff) |
ARM: OMAP3: Add more GPIO mux options
This patch adds several new GPIO pins and updates
the pin naming comments.
The patch is based on earlier patches on linux-omap
list by Manikandan Pillai <mani.pillai@ti.com>,
Vaibhav Hiremath <hvaibhav@ti.com> and
David Brownell <dbrownell@users.sourceforge.net>.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/mux.c | 27 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/mux.h | 13 |
2 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index dacb41f130c0..026c4fc883a7 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c | |||
@@ -453,10 +453,37 @@ MUX_CFG_34XX("AC1_3430_USB3FS_PHY_MM3_TXEN_N", 0x18a, | |||
453 | 453 | ||
454 | 454 | ||
455 | /* 34XX GPIO - bidirectional, unless the name has an "_OUT" suffix. | 455 | /* 34XX GPIO - bidirectional, unless the name has an "_OUT" suffix. |
456 | * (Always specify PIN_INPUT, except for names suffixed by "_OUT".) | ||
456 | * No internal pullup/pulldown without "_UP" or "_DOWN" suffix. | 457 | * No internal pullup/pulldown without "_UP" or "_DOWN" suffix. |
457 | */ | 458 | */ |
459 | MUX_CFG_34XX("AF26_34XX_GPIO0", 0x1e0, | ||
460 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
461 | MUX_CFG_34XX("AF22_34XX_GPIO9", 0xa18, | ||
462 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
458 | MUX_CFG_34XX("AH8_34XX_GPIO29", 0x5fa, | 463 | MUX_CFG_34XX("AH8_34XX_GPIO29", 0x5fa, |
459 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | 464 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) |
465 | MUX_CFG_34XX("U8_34XX_GPIO54_OUT", 0x0b4, | ||
466 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | ||
467 | MUX_CFG_34XX("U8_34XX_GPIO54_DOWN", 0x0b4, | ||
468 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLDOWN) | ||
469 | MUX_CFG_34XX("L8_34XX_GPIO63", 0x0ce, | ||
470 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
471 | MUX_CFG_34XX("G25_34XX_GPIO86_OUT", 0x0fc, | ||
472 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | ||
473 | MUX_CFG_34XX("AG4_34XX_GPIO134_OUT", 0x160, | ||
474 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | ||
475 | MUX_CFG_34XX("AE4_34XX_GPIO136_OUT", 0x164, | ||
476 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | ||
477 | MUX_CFG_34XX("AF6_34XX_GPIO140_UP", 0x16c, | ||
478 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) | ||
479 | MUX_CFG_34XX("AE6_34XX_GPIO141", 0x16e, | ||
480 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
481 | MUX_CFG_34XX("AF5_34XX_GPIO142", 0x170, | ||
482 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
483 | MUX_CFG_34XX("AE5_34XX_GPIO143", 0x172, | ||
484 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | ||
485 | MUX_CFG_34XX("H19_34XX_GPIO164_OUT", 0x19c, | ||
486 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) | ||
460 | MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6, | 487 | MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6, |
461 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) | 488 | OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) |
462 | }; | 489 | }; |
diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h index 6a02f8f4c8bf..85a621705766 100644 --- a/arch/arm/plat-omap/include/mach/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h | |||
@@ -838,7 +838,20 @@ enum omap34xx_index { | |||
838 | * - "_DOWN" suffix (GPIO3_DOWN) with internal pulldown | 838 | * - "_DOWN" suffix (GPIO3_DOWN) with internal pulldown |
839 | * - "_OUT" suffix (GPIO3_OUT) for output-only pins (unlike 24xx) | 839 | * - "_OUT" suffix (GPIO3_OUT) for output-only pins (unlike 24xx) |
840 | */ | 840 | */ |
841 | AF26_34XX_GPIO0, | ||
842 | AF22_34XX_GPIO9, | ||
841 | AH8_34XX_GPIO29, | 843 | AH8_34XX_GPIO29, |
844 | U8_34XX_GPIO54_OUT, | ||
845 | U8_34XX_GPIO54_DOWN, | ||
846 | L8_34XX_GPIO63, | ||
847 | G25_34XX_GPIO86_OUT, | ||
848 | AG4_34XX_GPIO134_OUT, | ||
849 | AE4_34XX_GPIO136_OUT, | ||
850 | AF6_34XX_GPIO140_UP, | ||
851 | AE6_34XX_GPIO141, | ||
852 | AF5_34XX_GPIO142, | ||
853 | AE5_34XX_GPIO143, | ||
854 | H19_34XX_GPIO164_OUT, | ||
842 | J25_34XX_GPIO170, | 855 | J25_34XX_GPIO170, |
843 | }; | 856 | }; |
844 | 857 | ||