diff options
author | H. Nikolaus Schaller <hns@goldelico.com> | 2011-04-22 18:18:30 +0200 |
---|---|---|
committer | H. Nikolaus Schaller <hns@goldelico.com> | 2011-04-22 18:18:30 +0200 |
commit | 5e5a70dc2c3a5a2be7dab445b3fb14601aac4a72 (patch) | |
tree | 9e9f57098d81c7ea6119b321dd6e9abb88a9c136 /board/goldelico | |
parent | eda8612c845b9380ca32715a145bd3860b5688ec (diff) | |
download | bootable_bootloader_goldelico_gta04-5e5a70dc2c3a5a2be7dab445b3fb14601aac4a72.zip bootable_bootloader_goldelico_gta04-5e5a70dc2c3a5a2be7dab445b3fb14601aac4a72.tar.gz bootable_bootloader_goldelico_gta04-5e5a70dc2c3a5a2be7dab445b3fb14601aac4a72.tar.bz2 |
renamed beagle expander variant
Diffstat (limited to 'board/goldelico')
-rw-r--r-- | board/goldelico/beagle-expander/Makefile | 2 | ||||
-rw-r--r-- | board/goldelico/beagle-expander/beagleexpander.c (renamed from board/goldelico/beagle-expander/beaglehyb.c) | 4 | ||||
-rw-r--r-- | board/goldelico/beagle-expander/beagleexpander.h | 30 | ||||
-rw-r--r-- | board/goldelico/beagle-expander/beaglehyb.h | 20 |
4 files changed, 33 insertions, 23 deletions
diff --git a/board/goldelico/beagle-expander/Makefile b/board/goldelico/beagle-expander/Makefile index d249281..6bdedcd 100644 --- a/board/goldelico/beagle-expander/Makefile +++ b/board/goldelico/beagle-expander/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := beaglehyb.o ../gta04/TD028TTEC1.o ../gta04/jbt6k74.o ../gta04/backlight.o ../gta04/status.o ../gta04/tsc2007.o ../gta04/dssfb.o ../gta04/gps.o ../gta04/shutdown.o ../gta04/systest.o ../gta04/commands.o +COBJS := beagleexpander.o COM37H3M05DTC.o trf7960.o ../gta04/backlight.o ../gta04/status.o ../gta04/tsc2007.o ../gta04/dssfb.o ../gta04/gps.o ../gta04/shutdown.o ../gta04/systest.o ../gta04/commands.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/goldelico/beagle-expander/beaglehyb.c b/board/goldelico/beagle-expander/beagleexpander.c index 7fbe8d2..bd58b1f 100644 --- a/board/goldelico/beagle-expander/beaglehyb.c +++ b/board/goldelico/beagle-expander/beagleexpander.c @@ -7,14 +7,14 @@ #include <asm/arch/gpio.h> #include <asm/mach-types.h> #include "../../ti/beagle/beagle.h" -#include "beaglehyb.h" +#include "beagleexpander.h" // make us initialize using both pinmux sets void muxinit(void) { MUX_BEAGLE(); - MUX_BEAGLE_HYBRID(); + MUX_BEAGLE_EXPANDER(); } #undef MUX_BEAGLE diff --git a/board/goldelico/beagle-expander/beagleexpander.h b/board/goldelico/beagle-expander/beagleexpander.h new file mode 100644 index 0000000..049d999 --- /dev/null +++ b/board/goldelico/beagle-expander/beagleexpander.h @@ -0,0 +1,30 @@ +// all pins on BB expansion connector + +// 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), (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 | 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 | 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)*/\ +MUX_VAL(CP(MMC2_DAT3), (IDIS | PTU | EN | M1)) /*GPIO_135 -> MCSPI3-CS0*/\ +MUX_VAL(CP(MMC2_DAT4), (IEN | PTD | EN | M4)) /*GPIO_136 - AUX */\ +MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137 - POWER */\ +MUX_VAL(CP(MMC2_DAT6), (IDIS | PTU | EN | M4)) /*GPIO_138 - UART3-RTS (software) */\ +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), (IDIS | PTU | EN | M4)) /*GPIO_144 - UART2-CTS */\ +MUX_VAL(CP(UART2_RTS), (IDIS | 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 | EN | M4)) /*GPIO_156 - KEYIRQ -> TRF IRQ */\ +MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /*GPIO_157 - PENIRQ */\ +MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | EN | M4)) /*GPIO_158 - Display STBY */\ +MUX_VAL(CP(MCBSP1_DR), (IDIS | PTD | EN | M4)) /*GPIO_159 - McBSP1-DR -> TRF EN2 */\ +MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS */\ +MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTD | EN | M4)) /*GPIO_161 - McBSP1-FSX -> TRF EN */\ +MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | EN | M4)) /*GPIO_162 - McBSP1-CLKX -> UART3 Powerdown */ + diff --git a/board/goldelico/beagle-expander/beaglehyb.h b/board/goldelico/beagle-expander/beaglehyb.h deleted file mode 100644 index 19a5722..0000000 --- a/board/goldelico/beagle-expander/beaglehyb.h +++ /dev/null @@ -1,20 +0,0 @@ -#define MUX_BEAGLE_HYBRID() \ -MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M1)) /*GPIO_130 -> MCSPI3-CLK*/\ -MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M1)) /*GPIO_131 -> MCSPI3-SIMO*/\ -MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M1)) /*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 | M1)) /*GPIO_135 -> MCSPI3-CS0*/\ -MUX_VAL(CP(MMC2_DAT4), (IEN | PTD | 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) */\ -MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139 - UART3-CTS (software) */\ -MUX_VAL(CP(MCBSP1_CLKR), (IDIS | PTD | DIS | M4)) /*GPIO_156 - KEYIRQ*/\ -MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /*GPIO_157 - PENIRQ */\ -MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | EN | M0)) /*GPIO_158 - McBSP1-DX */\ -MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | DIS | M0)) /*GPIO_159 - McBSP1-DR */\ -MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS*/\ -MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | EN | M0)) /*GPIO_161 - McBSP1-FSX */\ -MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | EN | M0)) /*GPIO_162 - McBSP1-CLKX */ - -// should we mux GPIO 143/44/45/46 for UART2 and/or GPT/PWM?
\ No newline at end of file |