diff options
Diffstat (limited to 'u-boot/board/goldelico/gta04b3')
| -rw-r--r-- | u-boot/board/goldelico/gta04b3/LQ070Y3DB3B.c | 13 | ||||
| -rw-r--r-- | u-boot/board/goldelico/gta04b3/gta04b3.c | 8 | ||||
| -rw-r--r-- | u-boot/board/goldelico/gta04b3/gta04b3.h | 32 |
3 files changed, 42 insertions, 11 deletions
diff --git a/u-boot/board/goldelico/gta04b3/LQ070Y3DB3B.c b/u-boot/board/goldelico/gta04b3/LQ070Y3DB3B.c index 5a77210..89968ec 100644 --- a/u-boot/board/goldelico/gta04b3/LQ070Y3DB3B.c +++ b/u-boot/board/goldelico/gta04b3/LQ070Y3DB3B.c @@ -31,6 +31,7 @@ #include <twl4030.h> #include "../gta04/dssfb.h" #include "../gta04/panel.h" +#include "../gta04/backlight.h" #include "LQ070Y3DB3B.h" #ifndef CONFIG_GOLDELICO_EXPANDER_B3 @@ -41,7 +42,7 @@ #ifdef CONFIG_OMAP3_GTA04 -#define GPIO_STBY 20 +#define GPIO_STBY 12 #elif CONFIG_OMAP3_BEAGLE @@ -75,14 +76,17 @@ #define HBL (HS+HBP+HFP) // horizontal blanking period #define HP (HDISP+HBL) // horizontal cycle +int displayColumns=HDISP; +int displayLines=VDISP; + static /*const*/ struct panel_config lcm_cfg = { .timing_h = ((HBP-1)<<20) | ((HFP-1)<<8) | ((HS-1)<<0), /* Horizantal timing */ .timing_v = ((VBP+0)<<20) | ((VFP+0)<<8) | ((VS-1)<<0), /* Vertical timing */ - // negative clock edge - // negative sync pulse + // negative clock edge samples data; changes on positive edge + // negative sync pulses // positive DE pulse - .pol_freq = (1<<17)|(1<<16)|(0<<15)|(0<<14)|(1<<13)|(1<<12)|0x28, /* Pol Freq */ + .pol_freq = (1<<17)|(1<<16)|(0<<15)|(0<<14)|(1<<13)|(1<<12)|0x28, /* DISPC_POL_FREQ */ .divisor = (0x0001<<16)|(DSS1_FCLK/PIXEL_CLOCK), /* Pixel Clock divisor from dss1_fclk */ .lcd_size = ((HDISP-1)<<0) | ((VDISP-1)<<16), /* as defined by LCM */ .panel_type = 0x01, /* TFT */ @@ -94,6 +98,7 @@ static /*const*/ struct panel_config lcm_cfg = int panel_reg_init(void) { omap_request_gpio(GPIO_STBY); + printf("panel_reg_init() GPIO_%d\n", GPIO_STBY); omap_set_gpio_direction(GPIO_STBY, 0); // output return 0; } diff --git a/u-boot/board/goldelico/gta04b3/gta04b3.c b/u-boot/board/goldelico/gta04b3/gta04b3.c index 99e4e5f..4744efd 100644 --- a/u-boot/board/goldelico/gta04b3/gta04b3.c +++ b/u-boot/board/goldelico/gta04b3/gta04b3.c @@ -13,12 +13,12 @@ void muxinit(void) { - MUX_BEAGLE(); - MUX_BEAGLE_EXPANDER(); + MUX_GTA04(); + MUX_EXPANDER_B3(); } -#undef MUX_BEAGLE -#define MUX_BEAGLE() muxinit() +#undef MUX_GTA04 +#define MUX_GTA04() muxinit() // take the original beagle.c code #include "../gta04/gta04.c" diff --git a/u-boot/board/goldelico/gta04b3/gta04b3.h b/u-boot/board/goldelico/gta04b3/gta04b3.h index 668f5f9..200c7b4 100644 --- a/u-boot/board/goldelico/gta04b3/gta04b3.h +++ b/u-boot/board/goldelico/gta04b3/gta04b3.h @@ -1,13 +1,39 @@ -// all pins on GTA04 expansion connector +// all reuseable pins on GTA04 expansion connector // GPIO -> GTA04-Pin -> Expander function -#define MUX_BEAGLE_EXPANDER() \ +#define MUX_EXPANDER_B3() \ +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_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(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 */\ +MUX_VAL(CP(UART2_RX), (IEN | PTU | DIS | M0)) /*GPIO_147 / UART2-RX - GPS_RX */\ +MUX_VAL(CP(MCBSP4_CLKX), (IEN | PTD | DIS | M0)) /*GPIO_152 / MCBSP4_CLKX*/\ +MUX_VAL(CP(MCBSP4_DR), (IEN | PTD | DIS | M0)) /*GPIO_153 / MCBSP4_DR*/\ +MUX_VAL(CP(MCBSP4_DX), (IEN | PTD | DIS | M0)) /*GPIO_154 / MCBSP4_DX*/\ +MUX_VAL(CP(MCBSP4_FSX), (IEN | PTD | DIS | M0)) /*GPIO_155 / MCBSP4_FSX*/\ +MUX_VAL(CP(MCBSP_CLKS), (IDIS | PTD | DIS | M4)) /*GPIO_160 / PENIRQ*/\ + +#if 0 +MUX_VAL(CP(UART3_CTS_RCTX), (IDIS | PTD | DIS | M0)) /*GPIO_163 / UART3-CTS*/\ +MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0)) /*GPIO_164 / UART3-RTS*/\ +MUX_VAL(CP(UART3_RX_IRRX), (IDIS | PTD | DIS | M0)) /*GPIO_165 / UART3-RX*/\ +MUX_VAL(CP(UART3_TX_IRTX), (IDIS | PTD | DIS | M0)) /*GPIO_166 / UART3-TX*/\ + +#endif // FIXME: clean up so that we have the right PinMuxes +// this below appears to be the BeagleBoard expansion port mapping and not GTA04 #if 0 -MUX_VAL(CP(ETK_D0), (IEN | PTD | EN | M1)) /*GPIO_17 -> 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 | M4)) /*GPIO_131 -> MCSPI3-SIMO -> TRF*/\ MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M4)) /*GPIO_132 -> MCSPI3-SOMI -> TRF*/\ |