Changeset 2830

Timestamp:

08/24/07 21:38:25 (6 years ago)

Author:

laforge

Message:

make u-boot actaully work on the first GTA02v2 samples:

• memory is x32, has 9-bit column addresses and a 64/64 bank6/7 split
• cpu powers up with low voltage, so don't go to 304MHz PLL before reconfiguring core power
• disable all internal pull-down resistors
• switch vibrator and LED into output mode, since PWM is not active yet after power-up
• switch GPJ4 (nGSM_EN) to high to activate serial console on debug board
• don't power-cycle DOWN2 converter, there's now way more than just the glamo

File:

• trunk/src/target/u-boot/patches/uboot-gta02.patch (modified) (8 diffs)

trunk/src/target/u-boot/patches/uboot-gta02.patch

@@ -92 +92 @@
 --- /dev/null
 +++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,356 @@
+@@ -0,0 +1,370 @@
 +/*
 + * (C) 2006-2007 by OpenMoko, Inc.
@@ -139 +139 @@
 +#define POWER_KEY_SECONDS      2
 +
++#if defined(CONFIG_ARCH_GTA02_v1)
 +//#define M_MDIV       0x7f            /* Fout = 405.00MHz */
 +#define M_MDIV 0x7d            /* Fout = 399.00MHz */
@@ -147 +148 @@
 +#define U_M_PDIV       0x2
 +#define U_M_SDIV       0x2
++#else
++/* configure GTA02v2 to low speed until we've increased the voltage */
++#define M_MDIV 80
++#define M_PDIV 8
++#define M_SDIV 0
++#define U_M_MDIV 80
++#define U_M_PDIV 8
++#define U_M_SDIV 1
++#endif
 +
 +unsigned int neo1973_wakeup_cause;
@@ -213 +223 @@
 +       gpio->GPADAT |= (1 << 16);      /* Set GPA16 to high (nNAND_WP) */
 +
-+       gpio->GPBCON = 0x001555AA;
-+       //gpio->GPBUP = 0x000007FF;
++       gpio->GPBCON = 0x00155555;
++       gpio->GPBUP = 0x000007FF;
 +
 +       gpio->GPCCON = 0x55415155;
-+       //gpio->GPCUP = 0x0000FFFF;
++       gpio->GPCUP = 0x0000FFFF;
 +
 +       gpio->GPDCON = 0x55555555;
-+       //gpio->GPDUP = 0x0000FFFF;
++       gpio->GPDUP = 0x0000FFFF;
 +
 +       gpio->GPECON = 0xAAAAAAAA;
-+       //gpio->GPEUP = 0x0000FFFF;
++       gpio->GPEUP = 0x0000FFFF;
 +
 +       gpio->GPFCON = 0x0000AAAA;
-+       //gpio->GPFUP = 0x000000FF;
++       gpio->GPFUP = 0x000000FF;
 +
 +       gpio->GPGCON = 0x0156FE7A;
-+       //gpio->GPGUP = 0x0000FFFF;
++       gpio->GPGUP = 0x0000FFFF;
 +
 +       gpio->GPHCON = 0x001AAAAA;
-+       //gpio->GPHUP = 0x000007FF;
++       gpio->GPHUP = 0x000007FF;
 +
 +       gpio->GPJCON = 0x1551544;
++       gpio->GPJUP = 0x1ffff;
++       gpio->GPJDAT |= (1 << 4);       /* Set GPJ4 to high (nGSM_EN) */
 +#else
 +#error Please define GTA02 version
@@ -263 +275 @@
 +       pcf50633_init();
 +
++#if defined(CONFIG_ARCH_GTA02_v1)
 +       /* Glamo3362 reset and power cycle */
 +       gpio->GPJDAT &= ~0x000000001;
@@ -269 +282 @@
 +       pcf50633_reg_write(PCF50633_REG_DOWN2ENA, 0x2);
 +       gpio->GPJDAT |= 0x000000001;
++#endif
 +
 +#if 0
@@ -1301 +1315 @@
  #define B1_Tacp                        0x0
  #define B1_PMC                 0x0
-@@ -112,7 +112,8 @@
- #if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+@@ -109,16 +109,18 @@
+ 
+ #define B6_MT                  0x3     /* SDRAM */
+ #define B6_Trcd                        0x1     /* 3clk */
+-#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
++#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4) || \
++    defined(CONFIG_ARCH_GTA02_v2)
  #define B6_SCAN                        0x1     /* 9bit */
++#define B7_SCAN                        0x1     /* 9bit */
  #elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
 -      defined(CONFIG_ARCH_GTA01B_v4)
 +      defined(CONFIG_ARCH_GTA01B_v4) || defined(CONFIG_ARCH_GTA02_v1) || \
-+      defined(CONFIG_ARCH_GTA02_v2)
  #define B6_SCAN                        0x2     /* 10bit */
++#define B7_SCAN                        0x2     /* 10bit */
  #endif
  
-@@ -165,6 +166,27 @@
+ #define B7_MT                  0x3     /* SDRAM */
+ #define B7_Trcd                        0x1     /* 3clk */
+-#define B7_SCAN                        0x2     /* 10bit */
+ 
+ /* REFRESH parameter */
+ #define REFEN                  0x1     /* Refresh enable */
+@@ -165,6 +167,27 @@
         str     r1, [r0]
  #endif
@@ -1339 +1365 @@
         mov     pc, lr
  
+@@ -182,6 +205,10 @@
+     .word ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN))
+     .word ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN))
+     .word ((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT)
++#if defined(CONFIG_ARCH_GTA02_v2)
++    .word 0xb1
++#else
+     .word 0xb2
++#endif
+     .word 0x30
+     .word 0x30
 Index: u-boot/board/neo1973/gta02/pcf50633.c
 ===================================================================