r1506 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Mon Mar 26 16:18:25 CEST 2007
Author: laforge
Date: 2007-03-26 16:18:24 +0200 (Mon, 26 Mar 2007)
New Revision: 1506
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
Add support for GTA01Bv4 (make gta01bv4_config)
* 266MHz PLL initialisation (instead of 200MHz)
* GPIO changes
* SYSTEM_REV 0240 is used for GTA01Bv4
* Fix Vibrator pulse for GTA01v4/GTA01v3
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-03-26 14:16:13 UTC (rev 1505)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-03-26 14:18:24 UTC (rev 1506)
@@ -6,9 +6,9 @@
Index: u-boot/Makefile
===================================================================
---- u-boot.orig/Makefile 2007-03-14 09:37:07.000000000 +0100
-+++ u-boot/Makefile 2007-03-14 09:37:07.000000000 +0100
-@@ -1977,6 +1977,13 @@
+--- u-boot.orig/Makefile 2007-03-26 14:47:13.000000000 +0200
++++ u-boot/Makefile 2007-03-26 16:05:48.000000000 +0200
+@@ -1977,6 +1977,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -16,6 +16,7 @@
+gta01v3_config \
+gta01bv2_config \
+gta01bv3_config \
++gta01bv4_config \
+gta01v4_config : unconfig
+ @board/neo1973/split_by_variant.sh $@
+
@@ -25,7 +26,7 @@
Index: u-boot/board/neo1973/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/Makefile 2007-03-26 14:42:43.000000000 +0200
++++ u-boot/board/neo1973/Makefile 2007-03-26 16:07:34.000000000 +0200
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -77,7 +78,7 @@
Index: u-boot/board/neo1973/config.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/config.mk 2007-03-14 09:37:07.000000000 +0100
++++ u-boot/board/neo1973/config.mk 2007-03-26 14:47:15.000000000 +0200
@@ -0,0 +1,34 @@
+#
+# (C) Copyright 2002
@@ -116,8 +117,8 @@
Index: u-boot/board/neo1973/neo1973.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.c 2007-03-26 14:42:47.000000000 +0200
-@@ -0,0 +1,317 @@
++++ u-boot/board/neo1973/neo1973.c 2007-03-26 16:07:53.000000000 +0200
+@@ -0,0 +1,361 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -171,6 +172,7 @@
+#define M_PDIV 0x7
+#define M_SDIV 0x0
+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++/* In case the debug board is attached, we cannot go beyond 200 MHz */
+#if 0
+#define M_MDIV 0x7d /* Fout = 266MHz */
+#define M_PDIV 0x1
@@ -180,6 +182,11 @@
+#define M_PDIV 0x7
+#define M_SDIV 0x0
+#endif
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++/* This board doesn't have bus lines at teh debug port, and we can go to 266 */
++#define M_MDIV 0x7d /* Fout = 266MHz */
++#define M_PDIV 0x1
++#define M_SDIV 0x1
+#else
+#error Please define GTA01 revision
+#endif
@@ -251,7 +258,7 @@
+
+ gpio->GPBCON = 0x00045015;
+ gpio->GPBUP = 0x000007FF;
-+ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
++ gpio->GPBDAT |= 0x4; /* Set GPB2 to high (Flash power-up) */
+
+ gpio->GPCCON = 0xAAAA12A9;
+ gpio->GPCUP = 0x0000FFFF;
@@ -275,7 +282,7 @@
+
+ gpio->GPBCON = 0x00145415;
+ gpio->GPBUP = 0x000007FF;
-+ gpio->GPBDAT |= 0x4; /* Set GBP2 to high (Flash power-up) */
++ gpio->GPBDAT |= 0x4; /* Set GPB2 to high (Flash power-up) */
+
+ gpio->GPCCON = 0xAAAA12A9;
+ gpio->GPCUP = 0x0000FFFF;
@@ -295,6 +302,30 @@
+
+ gpio->GPHCON = 0x0000FAAA;
+ gpio->GPHUP = 0x000007FF;
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++ gpio->GPACON = 0x0005E0FFF;
++
++ gpio->GPBCON = 0x00045496;
++ gpio->GPBUP = 0x000007FF;
++
++ gpio->GPCCON = 0xAAAA12A9;
++ gpio->GPCUP = 0x0000FFFF;
++
++ gpio->GPDCON = 0xAAAAAAAA;
++ gpio->GPDUP = 0x0000FFFF;
++
++ gpio->GPECON = 0xAAAAAAAA;
++ gpio->GPEUP = 0x0000FFFF;
++
++ gpio->GPFCON = 0x0000aa99;
++ gpio->GPFUP = 0x000000FF;
++ gpio->GPFDAT |= 0x4; /* Set GBF2 to high (nGSM_EN) */
++
++ gpio->GPGCON = 0xFF14F0F8;
++ gpio->GPGUP = 0x0000AFEF;
++
++ gpio->GPHCON = 0x0000FAAA;
++ gpio->GPHUP = 0x000007FF;
+#else
+#error Please define GTA01 version
+#endif
@@ -398,6 +429,8 @@
+ return 0x00000220;
+#elif defined(CONFIG_ARCH_GTA01B_v3)
+ return 0x00000230;
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++ return 0x00000240;
+#endif
+}
+
@@ -423,9 +456,21 @@
+{
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+ if (on)
-+ gpio->GPBDAT |= (1 << 10);
++#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
++ gpio->GPGDAT |= (1 << 11); /* GPG11 */
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++ gpio->GPBDAT |= (1 << 10); /* GPB10 */
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++ gpio->GPBDAT |= (1 << 3); /* GPB3 */
++#endif
+ else
-+ gpio->GPBDAT &= ~(1 << 10);
++#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
++ gpio->GPGDAT &= ~(1 << 11); /* GPG11 */
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++ gpio->GPBDAT &= ~(1 << 10); /* GPB10 */
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++ gpio->GPBDAT &= ~(1 << 3); /* GPB3 */
++#endif
+}
+
+int neo1973_911_key_pressed(void)
@@ -438,8 +483,8 @@
Index: u-boot/board/neo1973/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/lowlevel_init.S 2007-03-14 09:37:07.000000000 +0100
-@@ -0,0 +1,188 @@
++++ u-boot/board/neo1973/lowlevel_init.S 2007-03-26 15:03:36.000000000 +0200
+@@ -0,0 +1,189 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
+ *
@@ -553,7 +598,8 @@
+#define B6_Trcd 0x1 /* 3clk */
+#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+#define B6_SCAN 0x1 /* 9bit */
-+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
++ defined(CONFIG_ARCH_GTA01B_v4)
+#define B6_SCAN 0x2 /* 10bit */
+#endif
+
@@ -631,7 +677,7 @@
Index: u-boot/board/neo1973/u-boot.lds
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/u-boot.lds 2007-03-14 09:37:07.000000000 +0100
++++ u-boot/board/neo1973/u-boot.lds 2007-03-26 14:47:15.000000000 +0200
@@ -0,0 +1,58 @@
+/*
+ * (C) Copyright 2002
@@ -694,8 +740,8 @@
Index: u-boot/include/configs/neo1973.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/neo1973.h 2007-03-26 14:42:47.000000000 +0200
-@@ -0,0 +1,260 @@
++++ u-boot/include/configs/neo1973.h 2007-03-26 16:07:37.000000000 +0200
+@@ -0,0 +1,263 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -839,6 +885,8 @@
+#define CFG_PROMPT "GTA01Bv2 # " /* Monitor Command Prompt */
+#elif defined(CONFIG_ARCH_GTA01B_v3)
+#define CFG_PROMPT "GTA01Bv3 # " /* Monitor Command Prompt */
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++#define CFG_PROMPT "GTA01Bv4 # " /* Monitor Command Prompt */
+#endif
+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
@@ -881,7 +929,8 @@
+#define PHYS_SDRAM_1 0x30000000 /* SDRAM Bank #1 */
+#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
++ defined(CONFIG_ARCH_GTA01B_v4)
+#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
+#else
+#error Please define GTA01 variant
@@ -959,8 +1008,8 @@
Index: u-boot/board/neo1973/split_by_variant.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/split_by_variant.sh 2007-03-14 09:37:07.000000000 +0100
-@@ -0,0 +1,49 @@
++++ u-boot/board/neo1973/split_by_variant.sh 2007-03-26 14:49:53.000000000 +0200
+@@ -0,0 +1,54 @@
+#!/bin/sh
+# ---------------------------------------------------------
+# Set the core module defines according to Core Module
@@ -997,10 +1046,15 @@
+ echo "GTA01_BIG_RAM=y" > ${obj}board/neo1973/config.tmp
+ ;;
+
++ gta01bv4_config)
++ echo "#define CONFIG_ARCH_GTA01B_v4" > ${obj}include/config.h
++ echo "GTA01_BIG_RAM=y" > ${obj}board/neo1973/config.tmp
++ ;;
++
+ *)
-+ echo "$0:: Unrecognised config - using gta01v3_config"
-+ echo "#define CONFIG_ARCH_GTA01_v3" > ${obj}include/config.h
-+ echo "GTA01_BIG_RAM=n" > ${obj}board/neo1973/config.tmp
++ echo "$0:: Unrecognised config - using GTA01Bv4 config"
++ echo "#define CONFIG_ARCH_GTA01B_v4" > ${obj}include/config.h
++ echo "GTA01_BIG_RAM=y" > ${obj}board/neo1973/config.tmp
+ ;;
+
+ esac
@@ -1013,7 +1067,7 @@
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-26 14:42:45.000000000 +0200
++++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-26 16:07:36.000000000 +0200
@@ -0,0 +1,120 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1138,7 +1192,7 @@
Index: u-boot/board/neo1973/neo1973.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.h 2007-03-26 14:42:43.000000000 +0200
++++ u-boot/board/neo1973/neo1973.h 2007-03-26 16:07:34.000000000 +0200
@@ -0,0 +1,18 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
@@ -1161,8 +1215,8 @@
Index: u-boot/board/neo1973/pcf50606.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.c 2007-03-14 12:18:33.000000000 +0100
-@@ -0,0 +1,187 @@
++++ u-boot/board/neo1973/pcf50606.c 2007-03-26 15:10:03.000000000 +0200
+@@ -0,0 +1,192 @@
+
+#include <common.h>
+#include <i2c.h>
@@ -1229,7 +1283,7 @@
+ /* gap */
+#if defined(CONFIG_ARCH_GTA01B_v2)
+ [PCF50606_REG_DCDC1] = 0x1e, /* GL_3V3: off */
-+#elif defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+ [PCF50606_REG_DCDC1] = 0x18, /* GL_1V5: off */
+#endif
+ [PCF50606_REG_DCDC2] = 0x00,
@@ -1241,27 +1295,31 @@
+
+#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+ [PCF50606_REG_DCUDC1] = 0xe3, /* CORE_1V8: 1.8V */
-+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
++ defined(CONFIG_ARCH_GTA01B_v4)
+ [PCF50606_REG_DCUDC1] = 0xe4, /* CORE_1V8: 2.1V */
+#endif
+ [PCF50606_REG_DCUDC2] = 0x30, /* 1.25A current limit */
+
+#if defined(CONFIG_ARCH_GTA01_v3)
+ [PCF50606_REG_IOREGC] = 0x13, /* VTCXO_2V8: off */
-+#elif defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
++ defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+ //see internal bug 94 [PCF50606_REG_IOREGC] = 0x18, /* CODEC_3V3: off */
+ [PCF50606_REG_IOREGC] = 0xf8, /* CODEC_3V3: on */
+#endif
+
+#if defined(CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+ [PCF50606_REG_D1REGC1] = 0x15, /* VRF_3V: off */
-+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
++ defined(CONFIG_ARCH_GTA01B_v4)
+ [PCF50606_REG_D1REGC1] = 0x16, /* BT_3V15: off */
+#endif
+
+#if defined(CONFIG_ARCH_GTA01_v3)
+ [PCF50606_REG_D2REGC1] = 0xf8, /* SD_3V3: on */
-+#elif defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
++ defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+ [PCF50606_REG_D2REGC1] = 0x10, /* GL_2V5: off */
+#endif
+
@@ -1269,7 +1327,8 @@
+ [PCF50606_REG_D3REGC1] = 0x18, /* CODEC_3V3: off */
+#elif defined(CONFIG_ARCH_GTA01_v4)
+ [PCF50606_REG_D3REGC1] = 0x13, /* VTXCO_2V8: off */
-+#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
++ defined(CONFIG_ARCH_GTA01B_v4)
+ [PCF50606_REG_D3REGC1] = 0x00, /* USER1: off */
+#endif
+
@@ -1353,7 +1412,7 @@
Index: u-boot/board/neo1973/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.h 2007-03-14 09:37:07.000000000 +0100
++++ u-boot/board/neo1973/pcf50606.h 2007-03-26 14:47:16.000000000 +0200
@@ -0,0 +1,269 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -1626,8 +1685,8 @@
+
Index: u-boot/common/main.c
===================================================================
---- u-boot.orig/common/main.c 2007-03-14 09:36:52.000000000 +0100
-+++ u-boot/common/main.c 2007-03-26 14:42:43.000000000 +0200
+--- u-boot.orig/common/main.c 2007-03-26 14:42:55.000000000 +0200
++++ u-boot/common/main.c 2007-03-26 16:07:35.000000000 +0200
@@ -61,6 +61,7 @@
#undef DEBUG_PARSER
@@ -1648,7 +1707,7 @@
Index: u-boot/board/neo1973/jbt6k74.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.c 2007-03-14 09:37:07.000000000 +0100
++++ u-boot/board/neo1973/jbt6k74.c 2007-03-26 14:47:16.000000000 +0200
@@ -0,0 +1,403 @@
+/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
+ *
@@ -2056,7 +2115,7 @@
Index: u-boot/board/neo1973/jbt6k74.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.h 2007-03-14 09:37:07.000000000 +0100
++++ u-boot/board/neo1973/jbt6k74.h 2007-03-26 14:47:16.000000000 +0200
@@ -0,0 +1,14 @@
+#ifndef _JBT6K74_H
+#define _JBT6K74_H
More information about the commitlog
mailing list
