summaryrefslogtreecommitdiffstats
path: root/u-boot/board/goldelico/gta04
diff options
context:
space:
mode:
Diffstat (limited to 'u-boot/board/goldelico/gta04')
-rw-r--r--u-boot/board/goldelico/gta04/backlight.c31
-rw-r--r--u-boot/board/goldelico/gta04/commands.c6
-rw-r--r--u-boot/board/goldelico/gta04/gta04.c2
-rw-r--r--u-boot/board/goldelico/gta04/gta04.h29
-rw-r--r--u-boot/board/goldelico/gta04/jbt6k74.c6
-rw-r--r--u-boot/board/goldelico/gta04/panel.h3
6 files changed, 41 insertions, 36 deletions
diff --git a/u-boot/board/goldelico/gta04/backlight.c b/u-boot/board/goldelico/gta04/backlight.c
index 1e167f0..271a254 100644
--- a/u-boot/board/goldelico/gta04/backlight.c
+++ b/u-boot/board/goldelico/gta04/backlight.c
@@ -36,17 +36,17 @@
#if defined(CONFIG_GOLDELICO_EXPANDER_B2)
-#define GPIO_BACKLIGHT 146 /* = GPT11_PWM (instead of UART2-TX) */
+#define GPIO_BACKLIGHT 57
#define GPT_BACKLIGHT OMAP34XX_GPT11
#elif defined(CONFIG_GOLDELICO_EXPANDER_B3)
-#define GPIO_BACKLIGHT 146 /* = GPT11_PWM (instead of UART2-TX) */
+#define GPIO_BACKLIGHT 57
#define GPT_BACKLIGHT OMAP34XX_GPT11
#elif defined(CONFIG_GOLDELICO_EXPANDER_B4)
-#define GPIO_BACKLIGHT 146 /* = GPT11_PWM (instead of UART2-TX) */
+#define GPIO_BACKLIGHT 57
#define GPT_BACKLIGHT OMAP34XX_GPT11
#else
@@ -96,18 +96,18 @@ int backlight_init(void)
#if USE_PWM
struct gptimer *gpt_base = (struct gptimer *)GPT_BACKLIGHT;
#if defined(CONFIG_OMAP3_GTA04)
- MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M3)) /* GPT_11 - Backlight enable*/\
+ MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M3)) /* Switch GPIO57 to GPT_11 - Backlight enable*/
#elif defined(CONFIG_OMAP3_BEAGLE)
#if defined(CONFIG_GOLDELICO_EXPANDER_B1)
- MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M2)) /* switch to GPT10 */
+ MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M2)) /* switch GPIO145 to GPT10 */
#elif defined(CONFIG_GOLDELICO_EXPANDER_B2)
- MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M2)) /* switch to GPT11 */
+ MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M2)) /* switch GPIO146 to GPT11 */
#elif defined(CONFIG_GOLDELICO_EXPANDER_B4)
// tbd.
#else
-#error undefined CONFIG
-#endif
-#endif
+#error undefined CONFIG_OMAP3_
+#endif // defined(CONFIG_GOLDELICO_EXPANDER_B1)
+#endif // defined(CONFIG_OMAP3_BEAGLE)
// writel(value, &gpt_base->registername);
// program registers for generating a 100-1000 Hz PWM signal
// or PWM synchronized to VSYNC (to avoid flicker)
@@ -115,21 +115,21 @@ int backlight_init(void)
#error todo
-#else
-
+#else // USE_PWM
+
#if defined(CONFIG_OMAP3_GTA04)
MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M4)) /*GPIO_57 - Backlight enable*/
-#elif defined(CONFIG_OMAP3_BEAGLE)
+#elif defined(CONFIG_OMAP3_BEAGLE)
#if defined(CONFIG_GOLDELICO_EXPANDER_B1)
MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M4)) /*GPIO_145*/
#elif defined(CONFIG_GOLDELICO_EXPANDER_B2)
MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/
#elif defined(CONFIG_GOLDELICO_EXPANDER_B4)
- // tbd.
+// tbd. MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/
#else
-#error undefined CONFIG
-#endif
+#error undefined CONFIG_OMAP3_
#endif
+#endif // USE_PWM
if(omap_request_gpio(GPIO_BACKLIGHT) == 0) // 0 == ok
{
omap_set_gpio_direction(GPIO_BACKLIGHT, 0); // output
@@ -141,7 +141,6 @@ int backlight_init(void)
}
#endif
-
return 0;
}
diff --git a/u-boot/board/goldelico/gta04/commands.c b/u-boot/board/goldelico/gta04/commands.c
index c1ec7b9..107cb17 100644
--- a/u-boot/board/goldelico/gta04/commands.c
+++ b/u-boot/board/goldelico/gta04/commands.c
@@ -204,13 +204,13 @@ static int do_tsc_gloop(int argc, char *const argv[])
int i;
for(i=0; i<8; i++)
{
- int val=(480*read_adc(i))/4096;
+ int val=(displayColumns*read_adc(i))/4096;
int x, y;
printf("%d: %d\n", i, val);
for(y=16*i; y<16*i+16; y++)
{ // draw colored bar depending on current value
- for(x=0; x<480; x++)
- fb[x+480*y]=(x < val)?0xfc00:0x03ff;
+ for(x=0; x<displayColumns; x++)
+ fb[x+displayColumns*y]=(x < val)?0xfc00:0x03ff;
}
}
}
diff --git a/u-boot/board/goldelico/gta04/gta04.c b/u-boot/board/goldelico/gta04/gta04.c
index 28baaa4..92df3ef 100644
--- a/u-boot/board/goldelico/gta04/gta04.c
+++ b/u-boot/board/goldelico/gta04/gta04.c
@@ -307,7 +307,7 @@ int misc_init_r(void)
void set_muxconf_regs(void)
{
MUX_BEAGLE();
- MUX_BEAGLE_GTA04();
+ MUX_GTA04();
}
#ifdef CONFIG_GENERIC_MMC
diff --git a/u-boot/board/goldelico/gta04/gta04.h b/u-boot/board/goldelico/gta04/gta04.h
index 744068d..8249518 100644
--- a/u-boot/board/goldelico/gta04/gta04.h
+++ b/u-boot/board/goldelico/gta04/gta04.h
@@ -430,12 +430,12 @@ MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M3)) /*DSS_DATA23*/
#if defined(CONFIG_I2C_OMAP_GTA04A2)
-#define MUX_BEAGLE_GTA04() \
-MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M4)) /*GPIO_12 - Display serial clock*/\
+#define MUX_GTA04() \
+MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M4)) /*GPIO_12 / McBSP5-CLKX - Display serial clock*/\
MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTU | EN | M4)) /*GPIO_13 - IrDA FIR-SEL*/\
-MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | DIS | M4)) /*GPIO_18 - Display DIN*/\
-MUX_VAL(CP(ETK_D5_ES2), (IDIS | PTU | EN | M4)) /*GPIO_19 - Display chip select*/\
-MUX_VAL(CP(ETK_D6_ES2), (IDIS | PTU | EN | M4)) /*GPIO_20 - Display DOUT*/\
+MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | DIS | M4)) /*GPIO_18 / McBSP5-DR - Display DIN*/\
+MUX_VAL(CP(ETK_D5_ES2), (IDIS | PTU | EN | M4)) /*GPIO_19 / McBSP5-FSX - Display chip select*/\
+MUX_VAL(CP(ETK_D6_ES2), (IDIS | PTU | EN | M4)) /*GPIO_20 / McBSP5-DX - Display DOUT*/\
MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | EN | M4)) /*GPIO_21 - RS232 enable*/\
MUX_VAL(CP(GPMC_NCS6), (IDIS | PTD | DIS | M4)) /*GPIO_57/GPT_11 - Backlight enable*/\
MUX_VAL(CP(GPMC_WAIT3), (IDIS | PTU | DIS | M4)) /*GPIO_65 - AUX IN/OUT*/\
@@ -453,10 +453,10 @@ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M1)) /*GPIO_136 - MMC2_DIR_DAT0 */\
MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M1)) /*GPIO_137 - MMC2_DIR_DAT1 */\
MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M1)) /*GPIO_138 - MMC2_DIR_CMD */\
MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M1)) /*GPIO_139 - MMC2_DIR_CLKIN */\
-MUX_VAL(CP(UART2_CTS), (IEN | PTU | DIS | M4)) /*GPIO_144 - ext Ant */\
-MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M4)) /*GPIO_145 - GPS ON(0)/OFF(1)*/\
-MUX_VAL(CP(UART2_TX), (IDIS | PTU | DIS | M0)) /*GPIO_146 - GPS_TX */\
-MUX_VAL(CP(UART2_RX), (IEN | PTU | DIS | M0)) /*GPIO_147 - GPS_RX */\
+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(MCBSP1_CLKR), (IDIS | PTD | DIS | M0)) /*GPIO_156 - FM TRX*/\
MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M0)) /*GPIO_157 - */\
MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | EN | M0)) /*GPIO_158 - */\
@@ -477,8 +477,7 @@ MUX_VAL(CP(MCSPI1_CS2), (IEN | PTD | DIS | M4)) /*GPIO_176/MMC3CLK - 3G_WOE */
#else // GTA04A3ff has some improved mux assignments
-#define MUX_BEAGLE_GTA04() \
-/*GPIO10 - Keyboard Controller INT - n/a*/\
+#define MUX_GTA04() \
MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M4)) /*GPIO_12 - Display serial clock*/\
MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M4)) /*GPIO_13 - RS232 enable*/\
MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | DIS | M4)) /*GPIO_18 - Display DIN*/\
@@ -524,10 +523,10 @@ MUX_VAL(CP(MCBSP1_DR), (IEN | PTU | DIS | M0)) /*GPIO_159 -> MCBSP1_DR */\
MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M4)) /*GPIO_160 - PENIRQ*/\
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 */\
-MUX_VAL(CP(MCBSP4_CLKX), (IEN | PTD | DIS | M0)) /*MCBSP4_CLKX*/\
-MUX_VAL(CP(MCBSP4_DR), (IEN | PTD | DIS | M0)) /*MCBSP4_DR*/\
-MUX_VAL(CP(MCBSP4_DX), (IEN | PTD | DIS | M0)) /*MCBSP4_DX*/\
-MUX_VAL(CP(MCBSP4_FSX), (IEN | PTD | DIS | M0)) /*MCBSP4_FSX*/\
+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(HDQ_SIO), (IEN | PTU | EN | M0)) /*GPIO_170 -> HDQ*/\
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*/\
diff --git a/u-boot/board/goldelico/gta04/jbt6k74.c b/u-boot/board/goldelico/gta04/jbt6k74.c
index fd66af9..40ef8f6 100644
--- a/u-boot/board/goldelico/gta04/jbt6k74.c
+++ b/u-boot/board/goldelico/gta04/jbt6k74.c
@@ -36,6 +36,7 @@
#include <twl4030.h>
#include "dssfb.h"
#include "panel.h"
+#include "backlight.h"
#include "TD028TTEC1.h"
// FIXME: we have somehow mixed up the file names...
@@ -74,6 +75,9 @@
#define DEBUGPC(x, args...) do { } while (0)
#endif
+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 */
@@ -377,7 +381,7 @@ int board_video_init(GraphicDevice *pGD)
if (get_cpu_family() == CPU_OMAP36XX)
lcm_cfg.divisor = (0x0001<<16)|(DSS1_FCLK3730/PIXEL_CLOCK); /* get Pixel Clock divisor from dss1_fclk */
dssfb_init(&lcm_cfg);
-
+
printf("did board_video_init()\n");
return 0;
}
diff --git a/u-boot/board/goldelico/gta04/panel.h b/u-boot/board/goldelico/gta04/panel.h
index 98c97fc..490a7f7 100644
--- a/u-boot/board/goldelico/gta04/panel.h
+++ b/u-boot/board/goldelico/gta04/panel.h
@@ -16,4 +16,7 @@ int panel_enter_state(enum panel_state new_state);
const char *panel_state(void);
int board_video_init(GraphicDevice *pGD);
+extern int displayColumns;
+extern int displayLines;
+
#endif
generated by cgit v1.1 at 2024-06-08 23:05:48 +0000