diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2010-11-26 16:33:15 +0100 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2010-11-26 16:33:15 +0100 |
| commit | 60d2fab5fa5130175223eff2dc4be5a4f6fe9b03 (patch) | |
| tree | 7a7246945b4b39b9540daba5171802f2d99fa2c3 /board/goldelico/beagle-hybrid | |
| parent | b646f2c4f41a3b417400462a1a5e56ec7dcd1ea4 (diff) | |
| download | bootable_bootloader_goldelico_gta04-60d2fab5fa5130175223eff2dc4be5a4f6fe9b03.zip bootable_bootloader_goldelico_gta04-60d2fab5fa5130175223eff2dc4be5a4f6fe9b03.tar.gz bootable_bootloader_goldelico_gta04-60d2fab5fa5130175223eff2dc4be5a4f6fe9b03.tar.bz2 | |
fixed compilation of specific PINMUX
Diffstat (limited to 'board/goldelico/beagle-hybrid')
| -rw-r--r-- | board/goldelico/beagle-hybrid/Makefile | 2 | ||||
| -rw-r--r-- | board/goldelico/beagle-hybrid/beagle.c | 1 | ||||
| -rw-r--r-- | board/goldelico/beagle-hybrid/beagle.h | 1 | ||||
| -rw-r--r-- | board/goldelico/beagle-hybrid/beaglehyb.c | 24 | ||||
| -rw-r--r-- | board/goldelico/beagle-hybrid/beaglehyb.h | 18 |
5 files changed, 43 insertions, 3 deletions
diff --git a/board/goldelico/beagle-hybrid/Makefile b/board/goldelico/beagle-hybrid/Makefile index ef59f12..b2dc8eb 100644 --- a/board/goldelico/beagle-hybrid/Makefile +++ b/board/goldelico/beagle-hybrid/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := beagle.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/commands.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/commands.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/goldelico/beagle-hybrid/beagle.c b/board/goldelico/beagle-hybrid/beagle.c deleted file mode 100644 index f060ec9..0000000 --- a/board/goldelico/beagle-hybrid/beagle.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../ti/beagle/beagle.c"
\ No newline at end of file diff --git a/board/goldelico/beagle-hybrid/beagle.h b/board/goldelico/beagle-hybrid/beagle.h deleted file mode 100644 index f560d84..0000000 --- a/board/goldelico/beagle-hybrid/beagle.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../ti/beagle/beagle.h"
\ No newline at end of file diff --git a/board/goldelico/beagle-hybrid/beaglehyb.c b/board/goldelico/beagle-hybrid/beaglehyb.c new file mode 100644 index 0000000..7fbe8d2 --- /dev/null +++ b/board/goldelico/beagle-hybrid/beaglehyb.c @@ -0,0 +1,24 @@ +#include <common.h> +#include <twl4030.h> +#include <asm/io.h> +#include <asm/arch/mmc_host_def.h> +#include <asm/arch/mux.h> +#include <asm/arch/sys_proto.h> +#include <asm/arch/gpio.h> +#include <asm/mach-types.h> +#include "../../ti/beagle/beagle.h" +#include "beaglehyb.h" + +// make us initialize using both pinmux sets + +void muxinit(void) +{ + MUX_BEAGLE(); + MUX_BEAGLE_HYBRID(); +} + +#undef MUX_BEAGLE +#define MUX_BEAGLE() muxinit() + +// take the original beagle.c code +#include "../../ti/beagle/beagle.c" diff --git a/board/goldelico/beagle-hybrid/beaglehyb.h b/board/goldelico/beagle-hybrid/beaglehyb.h new file mode 100644 index 0000000..71470f8 --- /dev/null +++ b/board/goldelico/beagle-hybrid/beaglehyb.h @@ -0,0 +1,18 @@ +#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 */ |