diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2011-06-28 11:14:32 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2011-06-28 11:14:32 +0200 |
| commit | e17fde7c50b8c54967450c7aea465e7e6bcb29dd (patch) | |
| tree | a366e06d482db5c55a0bbdef583c4fca6e8c59d2 | |
| parent | 1696dbc8035ed04964c72f379572b6bec15589ad (diff) | |
| download | bootable_bootloader_goldelico_gta04-e17fde7c50b8c54967450c7aea465e7e6bcb29dd.zip bootable_bootloader_goldelico_gta04-e17fde7c50b8c54967450c7aea465e7e6bcb29dd.tar.gz bootable_bootloader_goldelico_gta04-e17fde7c50b8c54967450c7aea465e7e6bcb29dd.tar.bz2 | |
fixed issues to work (mostly) correct
| -rw-r--r-- | board/goldelico/gta04/gps.c | 11 | ||||
| -rw-r--r-- | board/goldelico/gta04/gta04.h | 10 | ||||
| -rw-r--r-- | board/goldelico/gta04/i2c1-fix.c | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/board/goldelico/gta04/gps.c b/board/goldelico/gta04/gps.c index 4b7ec06..e6c23e5 100644 --- a/board/goldelico/gta04/gps.c +++ b/board/goldelico/gta04/gps.c @@ -35,7 +35,7 @@ #ifdef CONFIG_OMAP3_GTA04 #define GPIO_GPSEXT 144 // external GPS antenna plugged in -#define GPIO_GPS_ON 145 +#define GPIO_GPS_ON 145 // reset for GPS module #else /* Beagle Hybrid */ @@ -56,6 +56,15 @@ int gps_init(void) TWL4030_PM_RECEIVER_DEV_GRP_P1); udelay(5000); } +#ifdef CONFIG_OMAP3_GTA04 + /* ext. GPS Ant VSIM = 2.8 V (3.0V) */ + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VSIM_DEDICATED, + /*TWL4030_PM_RECEIVER_VSIM_VSEL_28*/ 0x04 /* 0x05 */, + TWL4030_PM_RECEIVER_VSIM_DEV_GRP, + TWL4030_PM_RECEIVER_DEV_GRP_P1); + udelay(5000); +#endif + omap_request_gpio(GPIO_GPS_ON); omap_set_gpio_direction(GPIO_GPS_ON, 0); // output omap_request_gpio(GPIO_GPSEXT); diff --git a/board/goldelico/gta04/gta04.h b/board/goldelico/gta04/gta04.h index 91e738c..40f7da2 100644 --- a/board/goldelico/gta04/gta04.h +++ b/board/goldelico/gta04/gta04.h @@ -506,12 +506,12 @@ MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | DIS | M0)) /*GPIO_159 - */\ MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTU | EN | M0)) /*GPIO_161 - */\ MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | EN | M0)) /*GPIO_162 - */\ MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M4)) /*GPIO_160 - PENIRQ*/\ -MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | DIS | M4)) /*GPIO_171 - Version sense*/\ -MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | DIS | M4)) /*GPIO_172 - Version sense*/\ -MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTU | DIS | M4)) /*GPIO_173 - Version sense*/\ +MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | EN | M4)) /*GPIO_171 - Version sense*/\ +MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | EN | M4)) /*GPIO_172 - Version sense*/\ +MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTU | EN | M4)) /*GPIO_173 - Version sense*/\ MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M4)) /*GPIO_174 - USB-PHY-RESET*/\ -MUX_VAL(CP(MCSPI1_CS1), (IEN | PTD | EN | M4)) /*GPIO_175/MMC3CMD - unused*/\ -MUX_VAL(CP(MCSPI1_CS2), (IEN | PTD | EN | M4)) /*GPIO_176/MMC3CLK - unused*/\ +MUX_VAL(CP(MCSPI1_CS1), (IEN | PTD | EN | M4)) /*GPIO_175/MMC3CMD - WAKE_WWAN */\ +MUX_VAL(CP(MCSPI1_CS2), (IEN | PTD | EN | M4)) /*GPIO_176/MMC3CLK - 3G_WOE */\ #endif /* _GTA04_H_ */ diff --git a/board/goldelico/gta04/i2c1-fix.c b/board/goldelico/gta04/i2c1-fix.c index 6a3da07..2e21acc 100644 --- a/board/goldelico/gta04/i2c1-fix.c +++ b/board/goldelico/gta04/i2c1-fix.c @@ -34,6 +34,8 @@ #ifdef CONFIG_OMAP3_GTA04A2 +/* #error this is for GTA04A2 only */ + #include "../../../drivers/i2c/omap24xx_i2c.h" /* this is a bit-bang driver for the I2C1 |