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

laforge at sita.openmoko.org laforge at sita.openmoko.org
Wed Mar 14 20:53:41 CET 2007


Author: laforge
Date: 2007-03-14 20:53:40 +0100 (Wed, 14 Mar 2007)
New Revision: 1363

Modified:
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
Add support for enabling/disabling fast charge

FIXME: if we disable fast charge, we should go back to trickle/pre charge!


Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-03-14 11:45:30 UTC (rev 1362)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2007-03-14 19:53:40 UTC (rev 1363)
@@ -6,9 +6,9 @@
 
 Index: u-boot/Makefile
 ===================================================================
---- u-boot.orig/Makefile	2007-03-01 14:31:08.000000000 +0100
-+++ u-boot/Makefile	2007-03-01 14:31:09.000000000 +0100
-@@ -1934,6 +1934,13 @@
+--- 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 @@
  sbc2410x_config: unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
@@ -25,7 +25,7 @@
 Index: u-boot/board/neo1973/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/Makefile	2007-03-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/Makefile	2007-03-14 09:45:31.000000000 +0100
 @@ -0,0 +1,47 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
@@ -77,7 +77,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/config.mk	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,34 @@
 +#
 +# (C) Copyright 2002
@@ -116,7 +116,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/neo1973.c	2007-03-14 09:45:34.000000000 +0100
 @@ -0,0 +1,317 @@
 +/*
 + * (C) 2006 by OpenMoko, Inc.
@@ -438,7 +438,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-01 14:31:22.000000000 +0100
++++ u-boot/board/neo1973/lowlevel_init.S	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,188 @@
 +/*
 + * Memory Setup stuff - taken from blob memsetup.S
@@ -631,7 +631,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/u-boot.lds	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,58 @@
 +/*
 + * (C) Copyright 2002
@@ -694,7 +694,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-01 14:31:09.000000000 +0100
++++ u-boot/include/configs/neo1973.h	2007-03-14 09:45:34.000000000 +0100
 @@ -0,0 +1,260 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
@@ -959,7 +959,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/split_by_variant.sh	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,49 @@
 +#!/bin/sh
 +# ---------------------------------------------------------
@@ -1013,7 +1013,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/cmd_neo1973.c	2007-03-14 09:45:33.000000000 +0100
 @@ -0,0 +1,120 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1138,7 +1138,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/neo1973.h	2007-03-14 09:45:30.000000000 +0100
 @@ -0,0 +1,18 @@
 +#ifndef _NEO1973_H
 +#define _NEO1973_H
@@ -1161,8 +1161,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-01 14:31:09.000000000 +0100
-@@ -0,0 +1,168 @@
++++ u-boot/board/neo1973/pcf50606.c	2007-03-14 09:43:53.000000000 +0100
+@@ -0,0 +1,184 @@
 +
 +#include <common.h>
 +#include <i2c.h>
@@ -1183,12 +1183,18 @@
 +	return tmp;
 +}
 +
-+u_int8_t pcf50606_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val)
++void pcf50606_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val)
 +{
 +	u_int8_t tmp = pcf50606_reg_read(reg);
 +	pcf50606_reg_write(reg, (val & mask) | (tmp & ~mask));
 +}
 +
++void pcf50606_reg_clear_bits(u_int8_t reg, u_int8_t bits)
++{
++	u_int8_t tmp = pcf50606_reg_read(reg);
++	pcf50606_reg_write(reg, (tmp & ~bits));
++}
++
 +static const u_int8_t regs_valid[] = {
 +	PCF50606_REG_OOCS, PCF50606_REG_INT1M, PCF50606_REG_INT2M,
 +	PCF50606_REG_INT3M, PCF50606_REG_OOCC1, PCF50606_REG_OOCC2,
@@ -1331,11 +1337,21 @@
 +				   initial_register_set[regs_valid[i]]);
 +#endif
 +}
++
++void pcf50606_charge_autofast(int on)
++{
++	if (on)
++		pcf50606_reg_set_bit_mask(PCF50606_REG_MBCC1,
++					  PCF50606_MBCC1_AUTOFST,
++					  PCF50606_MBCC1_AUTOFST);
++	else
++		pcf50606_reg_write(PCF50606_REG_MBCC1, 0x00);
++}
 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-01 14:31:09.000000000 +0100
-@@ -0,0 +1,267 @@
++++ u-boot/board/neo1973/pcf50606.h	2007-03-14 09:37:07.000000000 +0100
+@@ -0,0 +1,269 @@
 +#ifndef _PCF50606_H
 +#define _PCF50606_H
 +
@@ -1597,16 +1613,18 @@
 +
 +u_int8_t pcf50606_reg_read(u_int8_t reg);
 +
-+u_int8_t pcf50606_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val);
++void pcf50606_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val);
++void pcf50606_reg_clear_bits(u_int8_t reg, u_int8_t bits);
 +
 +void pcf50606_init(void);
++void pcf50606_charge_autofast(int on);
 +
 +#endif /* _PCF50606_H */
 +
 Index: u-boot/common/main.c
 ===================================================================
---- u-boot.orig/common/main.c	2007-03-01 14:29:31.000000000 +0100
-+++ u-boot/common/main.c	2007-03-01 14:31:09.000000000 +0100
+--- u-boot.orig/common/main.c	2007-03-14 09:36:52.000000000 +0100
++++ u-boot/common/main.c	2007-03-14 09:45:31.000000000 +0100
 @@ -61,6 +61,7 @@
  #undef DEBUG_PARSER
  
@@ -1627,7 +1645,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/jbt6k74.c	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,403 @@
 +/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
 + *
@@ -2035,7 +2053,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-01 14:31:09.000000000 +0100
++++ u-boot/board/neo1973/jbt6k74.h	2007-03-14 09:37:07.000000000 +0100
 @@ -0,0 +1,14 @@
 +#ifndef _JBT6K74_H
 +#define _JBT6K74_H





More information about the commitlog mailing list