GTA04 U-Boot

GTA04 U-Boot Commit Details

Date:2010-11-26 16:33:15 (2 years 5 months ago)
Author:Nikolaus Schaller
Branch:gta04
Commit:60d2fab5fa5130175223eff2dc4be5a4f6fe9b03
Parents: b646f2c4f41a3b417400462a1a5e56ec7dcd1ea4
Message:fixed compilation of specific PINMUX

Changes:
Dboard/goldelico/beagle-hybrid/beagle.c (full)
Dboard/goldelico/beagle-hybrid/beagle.h (full)
Aboard/goldelico/beagle-hybrid/beaglehyb.c (full)
Aboard/goldelico/beagle-hybrid/beaglehyb.h (full)
Mboard/goldelico/beagle-hybrid/Makefile (1 diff)
Mboard/goldelico/gta04/gps.c (4 diffs)
Mboard/goldelico/gta04/jbt6k74.c (2 diffs)

File differences

board/goldelico/beagle-hybrid/Makefile
2525
2626
2727
28
28
2929
3030
3131
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))
board/goldelico/beagle-hybrid/beagle.c
1
#include "../../ti/beagle/beagle.c"
board/goldelico/beagle-hybrid/beagle.h
1
#include "../../ti/beagle/beagle.h"
board/goldelico/beagle-hybrid/beaglehyb.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
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"
board/goldelico/beagle-hybrid/beaglehyb.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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 */
board/goldelico/gta04/gps.c
2929
3030
3131
32
3233
3334
3435
......
3637
3738
3839
40
41
42
43
44
45
46
47
48
49
3950
4051
4152
......
5768
5869
5970
71
72
6073
6174
6275
......
6679
6780
6881
69
7082
7183
7284
#include <asm/arch/gpio.h>
#include <asm/mach-types.h>
#include <ns16550.h>
#include <twl4030.h>
#include "gps.h"
#define GPIO_GPSEXT138// external GPS antenna plugged in
int gps_init(void)
{
extern int get_board_revision(void);
#define REVISION_XM 0
if(get_board_revision() == REVISION_XM) {
/* Set VAUX1 to 3.3V for GTA04E display board */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX1_DEDICATED,
/*TWL4030_PM_RECEIVER_VAUX1_VSEL_33*/ 0x07,
TWL4030_PM_RECEIVER_VAUX1_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
udelay(5000);
}
omap_request_gpio(GPIO_GPS_ON);
omap_set_gpio_direction(GPIO_GPS_ON, 0);// output
omap_request_gpio(GPIO_GPSEXT);
omap_set_gpio_dataout(GPIO_GPS_ON, 0);
}
static int lastant=-1;
void gps_echo(void)
{
#define MODE_X_DIV 16
while (1)
{ // echo in both directions
int ant=omap_get_gpio_datain(GPIO_GPSEXT);
static int lastant=-1;
if(ant != lastant)
{ // changed
if(ant)
board/goldelico/gta04/jbt6k74.c
3333
3434
3535
36
3637
3738
3839
......
312313
313314
314315
316
317
318
319
320
321
322
323
324
325
315326
316327
317328
#include <asm/arch/gpio.h>
#include <asm/mach-types.h>
#include <asm/arch/dss.h>
#include <twl4030.h>
#include "dssfb.h"
#include "jbt6k74.h"
int board_video_init(GraphicDevice *pGD)
{
extern int get_board_revision(void);
#define REVISION_XM 0
if(get_board_revision() == REVISION_XM) {
/* Set VAUX1 to 3.3V for GTA04E display board */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX1_DEDICATED,
/*TWL4030_PM_RECEIVER_VAUX1_VSEL_33*/ 0x07,
TWL4030_PM_RECEIVER_VAUX1_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
udelay(5000);
}
if(jbt_reg_init())// initialize SPI
{
printf("No LCM connected\n");

Archive Download the corresponding diff file

Branches

Tags