[U-Boot] [PATCH] Multiadapter/multibus I2C, at91rm9200 and friends

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:45 Fri 13 Feb     , ksi at koi8.net wrote:
> Initial multiadapter/multibus I2C support.
> 
> Atmel AT91RM9200 based boards.
> 
> This goes on top of previous patches.
> 
> Signed-off-by: Sergey Kubushyn <ksi at koi8.net>
please use git-format to sow that you move the file
please do the move and the change in a 2 patchs iif possible
> ---
> diff -purN u-boot-i2c.ORIG/board/cmc_pu2/load_sernum_ethaddr.c u-boot-i2c/board/cmc_pu2/load_sernum_ethaddr.c
> --- u-boot-i2c.ORIG/board/cmc_pu2/load_sernum_ethaddr.c	2009-02-12 10:43:40.000000000 -0800
> +++ u-boot-i2c/board/cmc_pu2/load_sernum_ethaddr.c	2009-02-13 16:29:00.000000000 -0800
> @@ -75,7 +75,7 @@ void load_sernum_ethaddr (void)
>  	unsigned char *p;
>  	unsigned short i, is, id;
>  
> -#if !defined(CONFIG_HARD_I2C) && !defined(CONFIG_SOFT_I2C)
> +#if !defined(CONFIG_HAS_I2C)
>  #error you must define some I2C support (CONFIG_HARD_I2C or CONFIG_SOFT_I2C)
>  #endif
>  	if (i2c_read(I2C_CHIP, I2C_OFFSET, I2C_ALEN, (unsigned char *)&data,
> diff -purN u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/i2c.c u-boot-i2c/cpu/arm920t/at91rm9200/i2c.c
> --- u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/i2c.c	2009-02-12 10:43:41.000000000 -0800
> +++ u-boot-i2c/cpu/arm920t/at91rm9200/i2c.c	1969-12-31 16:00:00.000000000 -0800
> @@ -1,202 +0,0 @@
> -/*
> - *  i2c Support for Atmel's AT91RM9200 Two-Wire Interface
> - *
> - *  (c) Rick Bronson
> - *
> - *  Borrowed heavily from original work by:
> - *  Copyright (c) 2000 Philip Edelbrock <phil at stimpy.netroedge.com>
> - *
> - *  Modified to work with u-boot by (C) 2004 Gary Jennejohn garyj at denx.de
> - *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, write to the Free Software
> - *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> - *
 -
> -#endif /* CONFIG_HARD_I2C */
> diff -purN u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/Makefile u-boot-i2c/cpu/arm920t/at91rm9200/Makefile
> --- u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/Makefile	2009-02-12 10:43:41.000000000 -0800
> +++ u-boot-i2c/cpu/arm920t/at91rm9200/Makefile	2009-02-13 15:36:53.000000000 -0800
> @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB	= $(obj)lib$(SOC).a
>  
> -COBJS	= bcm5221.o dm9161.o ether.o i2c.o interrupts.o \
> +COBJS	= bcm5221.o dm9161.o ether.o interrupts.o \
>  	  lxt972.o serial.o usb.o spi.o
>  SOBJS	= lowlevel_init.o
>  
> diff -purN u-boot-i2c.ORIG/drivers/i2c/at91_i2c.c u-boot-i2c/drivers/i2c/at91_i2c.c
> --- u-boot-i2c.ORIG/drivers/i2c/at91_i2c.c	1969-12-31 16:00:00.000000000 -0800
> +++ u-boot-i2c/drivers/i2c/at91_i2c.c	2009-02-13 15:52:08.000000000 -0800
please name it at91rm9200_i2c.c

the at91sam9 and at91rm9200 does not share actually the same API.
the update fo the RM9200 to the sam9 is inprogress but not finish

Best Regards,
J.