diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/arm/mach-omap2/mux34xx.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/arm/mach-omap2/mux34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux34xx.c | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c index 68e0a595f9a1..07aa7b3c95f7 100644 --- a/arch/arm/mach-omap2/mux34xx.c +++ b/arch/arm/mach-omap2/mux34xx.c | |||
| @@ -649,6 +649,53 @@ static struct omap_mux __initdata omap3_muxmodes[] = { | |||
| 649 | _OMAP3_MUXENTRY(UART3_TX_IRTX, 166, | 649 | _OMAP3_MUXENTRY(UART3_TX_IRTX, 166, |
| 650 | "uart3_tx_irtx", NULL, NULL, NULL, | 650 | "uart3_tx_irtx", NULL, NULL, NULL, |
| 651 | "gpio_166", NULL, NULL, "safe_mode"), | 651 | "gpio_166", NULL, NULL, "safe_mode"), |
| 652 | |||
| 653 | /* Only on 3630, see omap36xx_cbp_subset for the signals */ | ||
| 654 | _OMAP3_MUXENTRY(GPMC_A11, 0, | ||
| 655 | NULL, NULL, NULL, NULL, | ||
| 656 | NULL, NULL, NULL, NULL), | ||
| 657 | _OMAP3_MUXENTRY(SAD2D_MBUSFLAG, 0, | ||
| 658 | NULL, NULL, NULL, NULL, | ||
| 659 | NULL, NULL, NULL, NULL), | ||
| 660 | _OMAP3_MUXENTRY(SAD2D_MREAD, 0, | ||
| 661 | NULL, NULL, NULL, NULL, | ||
| 662 | NULL, NULL, NULL, NULL), | ||
| 663 | _OMAP3_MUXENTRY(SAD2D_MWRITE, 0, | ||
| 664 | NULL, NULL, NULL, NULL, | ||
| 665 | NULL, NULL, NULL, NULL), | ||
| 666 | _OMAP3_MUXENTRY(SAD2D_SBUSFLAG, 0, | ||
| 667 | NULL, NULL, NULL, NULL, | ||
| 668 | NULL, NULL, NULL, NULL), | ||
| 669 | _OMAP3_MUXENTRY(SAD2D_SREAD, 0, | ||
| 670 | NULL, NULL, NULL, NULL, | ||
| 671 | NULL, NULL, NULL, NULL), | ||
| 672 | _OMAP3_MUXENTRY(SAD2D_SWRITE, 0, | ||
| 673 | NULL, NULL, NULL, NULL, | ||
| 674 | NULL, NULL, NULL, NULL), | ||
| 675 | _OMAP3_MUXENTRY(GPMC_A11, 0, | ||
| 676 | NULL, NULL, NULL, NULL, | ||
| 677 | NULL, NULL, NULL, NULL), | ||
| 678 | _OMAP3_MUXENTRY(SAD2D_MCAD28, 0, | ||
| 679 | NULL, NULL, NULL, NULL, | ||
| 680 | NULL, NULL, NULL, NULL), | ||
| 681 | _OMAP3_MUXENTRY(SAD2D_MCAD29, 0, | ||
| 682 | NULL, NULL, NULL, NULL, | ||
| 683 | NULL, NULL, NULL, NULL), | ||
| 684 | _OMAP3_MUXENTRY(SAD2D_MCAD32, 0, | ||
| 685 | NULL, NULL, NULL, NULL, | ||
| 686 | NULL, NULL, NULL, NULL), | ||
| 687 | _OMAP3_MUXENTRY(SAD2D_MCAD33, 0, | ||
| 688 | NULL, NULL, NULL, NULL, | ||
| 689 | NULL, NULL, NULL, NULL), | ||
| 690 | _OMAP3_MUXENTRY(SAD2D_MCAD34, 0, | ||
| 691 | NULL, NULL, NULL, NULL, | ||
| 692 | NULL, NULL, NULL, NULL), | ||
| 693 | _OMAP3_MUXENTRY(SAD2D_MCAD35, 0, | ||
| 694 | NULL, NULL, NULL, NULL, | ||
| 695 | NULL, NULL, NULL, NULL), | ||
| 696 | _OMAP3_MUXENTRY(SAD2D_MCAD36, 0, | ||
| 697 | NULL, NULL, NULL, NULL, | ||
| 698 | NULL, NULL, NULL, NULL), | ||
| 652 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 699 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 653 | }; | 700 | }; |
| 654 | 701 | ||