diff options
Diffstat (limited to 'include/asm-arm/arch-omap/mux.h')
-rw-r--r-- | include/asm-arm/arch-omap/mux.h | 66 |
1 files changed, 53 insertions, 13 deletions
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h index b8fff50e6a87..ff9a5b5575fd 100644 --- a/include/asm-arm/arch-omap/mux.h +++ b/include/asm-arm/arch-omap/mux.h | |||
@@ -4,9 +4,10 @@ | |||
4 | * Table of the Omap register configurations for the FUNC_MUX and | 4 | * Table of the Omap register configurations for the FUNC_MUX and |
5 | * PULL_DWN combinations. | 5 | * PULL_DWN combinations. |
6 | * | 6 | * |
7 | * Copyright (C) 2003 - 2005 Nokia Corporation | 7 | * Copyright (C) 2004 - 2008 Texas Instruments Inc. |
8 | * Copyright (C) 2003 - 2008 Nokia Corporation | ||
8 | * | 9 | * |
9 | * Written by Tony Lindgren <tony.lindgren@nokia.com> | 10 | * Written by Tony Lindgren |
10 | * | 11 | * |
11 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
@@ -27,14 +28,6 @@ | |||
27 | * - W8 = ball | 28 | * - W8 = ball |
28 | * - 1610 = 1510 or 1610, none if common for both 1510 and 1610 | 29 | * - 1610 = 1510 or 1610, none if common for both 1510 and 1610 |
29 | * - MMC2_DAT0 = function | 30 | * - MMC2_DAT0 = function |
30 | * | ||
31 | * Change log: | ||
32 | * Added entry for the I2C interface. (02Feb 2004) | ||
33 | * Copyright (C) 2004 Texas Instruments | ||
34 | * | ||
35 | * Added entry for the keypad and uwire CS1. (09Mar 2004) | ||
36 | * Copyright (C) 2004 Texas Instruments | ||
37 | * | ||
38 | */ | 31 | */ |
39 | 32 | ||
40 | #ifndef __ASM_ARCH_MUX_H | 33 | #ifndef __ASM_ARCH_MUX_H |
@@ -469,7 +462,12 @@ enum omap24xx_index { | |||
469 | AA8_242X_GPIO58, | 462 | AA8_242X_GPIO58, |
470 | Y20_24XX_GPIO60, | 463 | Y20_24XX_GPIO60, |
471 | W4__24XX_GPIO74, | 464 | W4__24XX_GPIO74, |
465 | N15_24XX_GPIO85, | ||
472 | M15_24XX_GPIO92, | 466 | M15_24XX_GPIO92, |
467 | P20_24XX_GPIO93, | ||
468 | P18_24XX_GPIO95, | ||
469 | M18_24XX_GPIO96, | ||
470 | L14_24XX_GPIO97, | ||
473 | J15_24XX_GPIO99, | 471 | J15_24XX_GPIO99, |
474 | V14_24XX_GPIO117, | 472 | V14_24XX_GPIO117, |
475 | P14_24XX_GPIO125, | 473 | P14_24XX_GPIO125, |
@@ -494,8 +492,6 @@ enum omap24xx_index { | |||
494 | D3_242X_DMAREQ4, | 492 | D3_242X_DMAREQ4, |
495 | E3_242X_DMAREQ5, | 493 | E3_242X_DMAREQ5, |
496 | 494 | ||
497 | P20_24XX_TSC_IRQ, | ||
498 | |||
499 | /* UART3 */ | 495 | /* UART3 */ |
500 | K15_24XX_UART3_TX, | 496 | K15_24XX_UART3_TX, |
501 | K14_24XX_UART3_RX, | 497 | K14_24XX_UART3_RX, |
@@ -557,13 +553,57 @@ enum omap24xx_index { | |||
557 | B3__24XX_KBR5, | 553 | B3__24XX_KBR5, |
558 | AA4_24XX_KBC2, | 554 | AA4_24XX_KBC2, |
559 | B13_24XX_KBC6, | 555 | B13_24XX_KBC6, |
556 | |||
557 | /* 2430 USB */ | ||
558 | AD9_2430_USB0_PUEN, | ||
559 | Y11_2430_USB0_VP, | ||
560 | AD7_2430_USB0_VM, | ||
561 | AE7_2430_USB0_RCV, | ||
562 | AD4_2430_USB0_TXEN, | ||
563 | AF9_2430_USB0_SE0, | ||
564 | AE6_2430_USB0_DAT, | ||
565 | AD24_2430_USB1_SE0, | ||
566 | AB24_2430_USB1_RCV, | ||
567 | Y25_2430_USB1_TXEN, | ||
568 | AA26_2430_USB1_DAT, | ||
569 | |||
570 | /* 2430 HS-USB */ | ||
571 | AD9_2430_USB0HS_DATA3, | ||
572 | Y11_2430_USB0HS_DATA4, | ||
573 | AD7_2430_USB0HS_DATA5, | ||
574 | AE7_2430_USB0HS_DATA6, | ||
575 | AD4_2430_USB0HS_DATA2, | ||
576 | AF9_2430_USB0HS_DATA0, | ||
577 | AE6_2430_USB0HS_DATA1, | ||
578 | AE8_2430_USB0HS_CLK, | ||
579 | AD8_2430_USB0HS_DIR, | ||
580 | AE5_2430_USB0HS_STP, | ||
581 | AE9_2430_USB0HS_NXT, | ||
582 | AC7_2430_USB0HS_DATA7, | ||
583 | |||
584 | /* 2430 McBSP */ | ||
585 | AC10_2430_MCBSP2_FSX, | ||
586 | AD16_2430_MCBSP2_CLX, | ||
587 | AE13_2430_MCBSP2_DX, | ||
588 | AD13_2430_MCBSP2_DR, | ||
589 | AC10_2430_MCBSP2_FSX_OFF, | ||
590 | AD16_2430_MCBSP2_CLX_OFF, | ||
591 | AE13_2430_MCBSP2_DX_OFF, | ||
592 | AD13_2430_MCBSP2_DR_OFF, | ||
593 | |||
594 | }; | ||
595 | |||
596 | struct omap_mux_cfg { | ||
597 | struct pin_config *pins; | ||
598 | unsigned long size; | ||
599 | int (*cfg_reg)(const struct pin_config *cfg); | ||
560 | }; | 600 | }; |
561 | 601 | ||
562 | #ifdef CONFIG_OMAP_MUX | 602 | #ifdef CONFIG_OMAP_MUX |
563 | /* setup pin muxing in Linux */ | 603 | /* setup pin muxing in Linux */ |
564 | extern int omap1_mux_init(void); | 604 | extern int omap1_mux_init(void); |
565 | extern int omap2_mux_init(void); | 605 | extern int omap2_mux_init(void); |
566 | extern int omap_mux_register(struct pin_config * pins, unsigned long size); | 606 | extern int omap_mux_register(struct omap_mux_cfg *); |
567 | extern int omap_cfg_reg(unsigned long reg_cfg); | 607 | extern int omap_cfg_reg(unsigned long reg_cfg); |
568 | #else | 608 | #else |
569 | /* boot loader does it all (no warnings from CONFIG_OMAP_MUX_WARNINGS) */ | 609 | /* boot loader does it all (no warnings from CONFIG_OMAP_MUX_WARNINGS) */ |