r1604 - trunk/src/target/u-boot/patches

Sun Apr 1 15:35:20 CEST 2007

Author: laforge
Date: 2007-04-01 15:35:19 +0200 (Sun, 01 Apr 2007)
New Revision: 1604

Modified:
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
more refined GTA01Bv4 support
* Make sure STBY_1V8 has correct voltage (rather than switching it off)
* Make CORE_1V8 dependent on PWREN2
* Activate ACD (accessory detection) for new charger handling


Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================

--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-04-01 13:03:55 UTC (rev 1603)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-04-01 13:35:19 UTC (rev 1604)
@@ -6,8 +6,8 @@
 
 Index: u-boot/Makefile
 ===================================================================
---- u-boot.orig/Makefile	2007-03-28 18:41:50.000000000 +0200
-+++ u-boot/Makefile	2007-03-28 18:52:57.000000000 +0200
+--- u-boot.orig/Makefile	2007-03-29 21:46:26.000000000 +0200
++++ u-boot/Makefile	2007-04-01 13:44:16.000000000 +0200
 @@ -1977,6 +1977,14 @@
  sbc2410x_config: unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -26,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-28 18:53:00.000000000 +0200
++++ u-boot/board/neo1973/Makefile	2007-04-01 13:44:18.000000000 +0200
 @@ -0,0 +1,47 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
@@ -78,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-28 18:41:50.000000000 +0200
++++ u-boot/board/neo1973/config.mk	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,34 @@
 +#
 +# (C) Copyright 2002
@@ -117,7 +117,7 @@
 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-28 18:53:01.000000000 +0200
++++ u-boot/board/neo1973/neo1973.c	2007-04-01 13:44:20.000000000 +0200
 @@ -0,0 +1,362 @@
 +/*
 + * (C) 2006 by OpenMoko, Inc.
@@ -484,7 +484,7 @@
 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-28 18:41:50.000000000 +0200
++++ u-boot/board/neo1973/lowlevel_init.S	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,189 @@
 +/*
 + * Memory Setup stuff - taken from blob memsetup.S
@@ -678,7 +678,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-28 18:41:50.000000000 +0200
++++ u-boot/board/neo1973/u-boot.lds	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,58 @@
 +/*
 + * (C) Copyright 2002
@@ -741,7 +741,7 @@
 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-28 18:53:01.000000000 +0200
++++ u-boot/include/configs/neo1973.h	2007-04-01 13:44:20.000000000 +0200
 @@ -0,0 +1,265 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
@@ -1011,7 +1011,7 @@
 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-28 18:41:50.000000000 +0200
++++ u-boot/board/neo1973/split_by_variant.sh	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,54 @@
 +#!/bin/sh
 +# ---------------------------------------------------------
@@ -1070,7 +1070,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-28 18:53:00.000000000 +0200
++++ u-boot/board/neo1973/cmd_neo1973.c	2007-04-01 13:44:18.000000000 +0200
 @@ -0,0 +1,120 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1195,7 +1195,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-28 18:52:58.000000000 +0200
++++ u-boot/board/neo1973/neo1973.h	2007-04-01 13:44:17.000000000 +0200
 @@ -0,0 +1,18 @@
 +#ifndef _NEO1973_H
 +#define _NEO1973_H
@@ -1218,8 +1218,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-28 18:41:50.000000000 +0200
-@@ -0,0 +1,94 @@
++++ u-boot/board/neo1973/pcf50606.c	2007-04-01 13:45:34.000000000 +0200
+@@ -0,0 +1,100 @@
 +
 +#include <common.h>
 +#include <pcf50606.h>
@@ -1254,9 +1254,10 @@
 +
 +#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) || \
-+      defined(CONFIG_ARCH_GTA01B_v4)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
 +	[PCF50606_REG_DCUDC1]	= 0xe4, /* CORE_1V8: 2.1V */
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++	[PCF50606_REG_DCUDC1]	= 0xc4, /* CORE_1V8: 2.1V if PWREN2 = HIGH */
 +#endif
 +	[PCF50606_REG_DCUDC2]	= 0x30, /* 1.25A current limit */
 +
@@ -1286,9 +1287,10 @@
 +	[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) || \
-+      defined(CONFIG_ARCH_GTA01B_v4)
++#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3)
 +	[PCF50606_REG_D3REGC1]	= 0x00, /* USER1: off */
++#elif defined(CONFIG_ARCH_GTA01B_v4)
++	[PCF50606_REG_D3REGC1]	= 0xec, /* STBY_1V8: 2.1V */
 +#endif
 +
 +	[PCF50606_REG_LPREGC1]	= 0xf8, /* LCM_3V3: on */
@@ -1301,7 +1303,11 @@
 +	[PCF50606_REG_ADCC1]	= 0x00,
 +	[PCF50606_REG_ADCC2]	= 0x00,
 +	/* gap */
++#if defined(CONFIG_ARCH_GTA01B_v4)
++	[PCF50606_REG_ACDC1]	= 0x86,	/* ACD thresh 1.6V, enabled */
++#else
 +	[PCF50606_REG_ACDC1]	= 0x00,
++#endif
 +	[PCF50606_REG_BVMC]	= PCF50606_BVMC_THRSHLD_3V3,
 +	[PCF50606_REG_PWMC1]	= 0x00,
 +	[PCF50606_REG_LEDC1]	= 0x00,
@@ -1316,8 +1322,8 @@
 +
 Index: u-boot/common/main.c
 ===================================================================
---- u-boot.orig/common/main.c	2007-03-28 18:35:29.000000000 +0200
-+++ u-boot/common/main.c	2007-03-28 18:52:59.000000000 +0200
+--- u-boot.orig/common/main.c	2007-03-29 21:46:19.000000000 +0200
++++ u-boot/common/main.c	2007-04-01 13:44:17.000000000 +0200
 @@ -61,6 +61,7 @@
  #undef DEBUG_PARSER
  
@@ -1338,7 +1344,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-28 18:50:47.000000000 +0200
++++ u-boot/board/neo1973/jbt6k74.c	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,405 @@
 +/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
 + *
@@ -1748,7 +1754,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-28 18:41:50.000000000 +0200
++++ u-boot/board/neo1973/jbt6k74.h	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _JBT6K74_H
 +#define _JBT6K74_H
@@ -1766,8 +1772,8 @@
 +#endif
 Index: u-boot/drivers/Makefile
 ===================================================================
---- u-boot.orig/drivers/Makefile	2007-03-28 18:41:49.000000000 +0200
-+++ u-boot/drivers/Makefile	2007-03-28 18:53:00.000000000 +0200
+--- u-boot.orig/drivers/Makefile	2007-03-29 21:46:26.000000000 +0200
++++ u-boot/drivers/Makefile	2007-04-01 13:44:18.000000000 +0200
 @@ -49,6 +49,7 @@
  	  usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
  	  videomodes.o w83c553f.o \
@@ -1779,7 +1785,7 @@
 Index: u-boot/drivers/pcf50606.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/pcf50606.c	2007-03-28 18:41:50.000000000 +0200
++++ u-boot/drivers/pcf50606.c	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,75 @@
 +
 +#include <common.h>
@@ -1859,7 +1865,7 @@
 Index: u-boot/include/pcf50606.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/pcf50606.h	2007-03-28 18:53:18.000000000 +0200
++++ u-boot/include/pcf50606.h	2007-03-29 21:46:26.000000000 +0200
 @@ -0,0 +1,272 @@
 +#ifndef _PCF50606_H
 +#define _PCF50606_H



