From f29b355213af2849e8fa895faf5c54f4675f27be Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Mon, 3 Dec 2012 17:15:08 +0100 Subject: fixed PINMUX initialization for expander boards --- u-boot/board/goldelico/beagleb1/beagleb1.h | 44 ++++++++++++++++++------------ u-boot/board/goldelico/beagleb2/beagleb2.h | 6 ++-- u-boot/board/goldelico/gta04b2/gta04b2.h | 4 +-- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/u-boot/board/goldelico/beagleb1/beagleb1.h b/u-boot/board/goldelico/beagleb1/beagleb1.h index 71470f8..5a0dd9e 100644 --- a/u-boot/board/goldelico/beagleb1/beagleb1.h +++ b/u-boot/board/goldelico/beagleb1/beagleb1.h @@ -1,18 +1,26 @@ -#define MUX_BEAGLE_HYBRID() \ -MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M0)) /*GPIO_130 -> MMC2_CLK*/\ -MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M0)) /*GPIO_131 -> MMC2_CMD*/\ -MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M0)) /*GPIO_132 -> MMC2_DAT0*/\ -MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M0)) /*GPIO_133 -> MMC2_DAT1*/\ -MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M0)) /*GPIO_134 -> MMC2_DAT2*/\ -MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M0)) /*GPIO_135 -> MMC2_DAT3*/\ -MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136 - AUX */\ -MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137 - POWER */\ -MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | DIS | M4)) /*GPIO_138 - EXT-ANT */\ -MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139 - RS232 EXT */\ -MUX_VAL(CP(MCBSP1_CLKR), (IDIS | PTD | DIS | M4)) /*GPIO_156 - GPS ON(0)/OFF(1)*/\ -MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /*GPIO_157 - PENIRQ */\ -MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | EN | M4)) /*GPIO_158 - DOUT */\ -MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | DIS | M4)) /*GPIO_159 - DIN - pulled up */\ -MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS*/\ -MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | EN | M4)) /*GPIO_161 - CS */\ -MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | EN | M4)) /*GPIO_162 - SCL */ +// all pins on BB expansion connector + +// GPIO -> BB-Pin -> Expander function + +#define MUX_BEAGLE_EXPANDER() \ +MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M4)) /*GPIO_130 / MCSPI3-CLK*/\ +MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M4)) /*GPIO_131 / MCSPI3-SIMO -> */\ +MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M4)) /*GPIO_132 / MCSPI3-SOMI -> */\ +MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M4)) /*GPIO_133 / UART3-RX (software)*/\ +MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M4)) /*GPIO_134 / UART3-TX (software)*/\ +MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M4)) /*GPIO_135 / MCSPI3-CS0*/\ +MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136 / AUX */\ +MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137 / POWER */\ +MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | DIS | M4)) /*GPIO_138 / UART3-RTS (software) -> EXT-ANT */\ +MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139 / UART3-CTS (software) */\ +MUX_VAL(CP(UART2_RX), (IEN | PTU | EN | M4)) /*GPIO_143 / UART2-RX */\ +MUX_VAL(CP(UART2_CTS), (IEN | PTU | EN | M4)) /*GPIO_144 / UART2-CTS -> KEYIRQ*/\ +MUX_VAL(CP(UART2_RTS), (IEN | PTU | EN | M4)) /*GPIO_145 / UART2-RTS */\ +MUX_VAL(CP(UART2_TX), (IEN | PTU | EN | M4)) /*GPIO_146 / UART2-TX */\ +MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTD | DIS | M4)) /*GPIO_156 / ... - KEYIRQ -> TCA8418 */\ +MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /*GPIO_157 / ... - PENIRQ */\ +MUX_VAL(CP(MCBSP1_DX), (IDIS | PTU | EN | M4)) /*GPIO_158 / ... - Display DOUT */\ +MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | DIS | M4)) /*GPIO_159 / McBSP1-DR -> Display DIN - pulled up */\ +MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*GPIO_??? / McBSP_CLKS */\ +MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | EN | M4)) /*GPIO_161 / McBSP1-FSX -> Display CS */\ +MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTU | EN | M4)) /*GPIO_162 / McBSP1-CLKX -> Display SCL */ \ No newline at end of file diff --git a/u-boot/board/goldelico/beagleb2/beagleb2.h b/u-boot/board/goldelico/beagleb2/beagleb2.h index 6c65341..de3e297 100644 --- a/u-boot/board/goldelico/beagleb2/beagleb2.h +++ b/u-boot/board/goldelico/beagleb2/beagleb2.h @@ -3,11 +3,11 @@ // GPIO -> BB-Pin -> Expander function #define MUX_BEAGLE_EXPANDER() \ -MUX_VAL(CP(MMC2_CLK), (IEN | PTD | EN | M1)) /*GPIO_130 / MCSPI3-CLK -> TRF*/\ +/*MUX_VAL(CP(MMC2_CLK), (IEN | PTD | EN | M1)) /*GPIO_130 / MCSPI3-CLK -> TRF*/\ MUX_VAL(CP(MMC2_CLK), (IDIS | PTD | EN | M4)) /*GPIO_130 / MCSPI3-CLK -> TRF*/\ -MUX_VAL(CP(MMC2_CMD), (IDIS | PTD | EN | M1)) /*GPIO_131 / MCSPI3-SIMO -> TRF*/\ +/*MUX_VAL(CP(MMC2_CMD), (IDIS | PTD | EN | M1)) /*GPIO_131 / MCSPI3-SIMO -> TRF*/\ MUX_VAL(CP(MMC2_CMD), (IDIS | PTD | EN | M4)) /*GPIO_131 / MCSPI3-SIMO -> TRF*/\ -MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M1)) /*GPIO_132 / MCSPI3-SOMI -> TRF*/\ +/*MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M1)) /*GPIO_132 / MCSPI3-SOMI -> TRF*/\ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M4)) /*GPIO_132 / MCSPI3-SOMI -> TRF*/\ MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M4)) /*GPIO_133 / UART3-RX (software)*/\ MUX_VAL(CP(MMC2_DAT2), (IDIS | PTU | EN | M4)) /*GPIO_134 / UART3-TX (software)*/\ diff --git a/u-boot/board/goldelico/gta04b2/gta04b2.h b/u-boot/board/goldelico/gta04b2/gta04b2.h index d943e02..3159a83 100644 --- a/u-boot/board/goldelico/gta04b2/gta04b2.h +++ b/u-boot/board/goldelico/gta04b2/gta04b2.h @@ -4,14 +4,14 @@ #define MUX_EXPANDER_B2() \ MUX_VAL(CP(SYS_CLKOUT1), (IDIS | PTD | DIS | M4)) /*GPIO_10 / KEYIRQ - TRF-IRQ*/\ -MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTD | EN | M4)) /*GPIO_12 / McBSP5-CLKX - Enable 3.3V LDO for display*/\ +MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M4)) /*GPIO_12 / McBSP5-CLKX - enable RS232*/\ MUX_VAL(CP(ETK_D0), (IEN | PTD | EN | M1)) /*GPIO_14 / MCSPI3-SIMO -> TRF*/\ MUX_VAL(CP(ETK_D1), (IEN | PTD | EN | M1)) /*GPIO_15 / MCSPI3-SOMI -> TRF*/\ MUX_VAL(CP(ETK_D2), (IEN | PTD | EN | M1)) /*GPIO_16 / MCSPI3-CS -> TRF*/\ MUX_VAL(CP(ETK_D3), (IEN | PTD | EN | M1)) /*GPIO_17 / MCSPI3-CLK -> TRF*/\ MUX_VAL(CP(ETK_D4_ES2), (IDIS | PTU | EN | M4)) /*GPIO_18 / McBSP5-DR - drives RS232 EXT line*/\ MUX_VAL(CP(ETK_D5_ES2), (IDIS | PTD | EN | M4)) /*GPIO_19 / McBSP5-FSX - TRF79x0 EN/EN2*/\ -MUX_VAL(CP(ETK_D6_ES2), (IDIS | PTD | EN | M4)) /*GPIO_20 / McBSP5-DX - Enable 5V on VBUS*/\ +MUX_VAL(CP(ETK_D6_ES2), (IDIS | PTD | EN | M4)) /*GPIO_20 / McBSP5-DX - -Display STBYB*/\ MUX_VAL(CP(UART2_CTS), (IEN | PTU | DIS | M4)) /*GPIO_144 / UART2-CTS - ext Ant */\ MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M4)) /*GPIO_145 / UART2-RTS - GPS ON(0)/OFF(1)*/\ MUX_VAL(CP(UART2_TX), (IDIS | PTU | DIS | M0)) /*GPIO_146 / UART2-TX - GPS_TX */\ -- cgit v1.1