Skip to contentSkip to conversation

Multiadapter/multibus I2C, at91rm9200 and friends

PATCH New ksi at koi8.net 2 participants 2 messages Feb 14, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Multiadapter/multibus I2C, at91rm9200 and friends

Initial multiadapter/multibus I2C support.

Atmel AT91RM9200 based boards.

This goes on top of previous patches.

---

board/cmc_pu2/load_sernum_ethaddr.c +1 -1
diff -purN u-boot-i2c.ORIG/board/cmc_pu2/load_sernum_ethaddr.c u-boot-i2c/board/cmc_pu2/load_sernum_ethaddr.c
@@ -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,
cpu/arm920t/at91rm9200/i2c.c +0 -202

202 lines not on this page · raw message

cpu/arm920t/at91rm9200/Makefile +1 -1
diff -purN u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/Makefile u-boot-i2c/cpu/arm920t/at91rm9200/Makefile
@@ -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
 
drivers/i2c/at91_i2c.c +216 -0

216 lines not on this page · raw message

drivers/i2c/i2c_core.c +4 -0
diff -purN u-boot-i2c.ORIG/drivers/i2c/i2c_core.c u-boot-i2c/drivers/i2c/i2c_core.c
@@ -6,6 +6,10 @@
 #include <common.h>
 #include <i2c.h>
 
+#ifdef CONFIG_AT91_I2C
+extern i2c_adap_t	at91_i2c_adap;
+#endif
+
 #ifdef CONFIG_BFIN_TWI_I2C
 extern i2c_adap_t	bfin_twi_i2c_adap;
 #endif
drivers/i2c/Makefile +1 -0
diff -purN u-boot-i2c.ORIG/drivers/i2c/Makefile u-boot-i2c/drivers/i2c/Makefile
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libi2c.a
 
+COBJS-$(CONFIG_AT91_I2C) += at91_i2c.o
 COBJS-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o
 COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o
 COBJS-$(CONFIG_MXC_I2C) += mxc_i2c.o

Binary files u-boot-i2c.ORIG/.git/index and u-boot-i2c/.git/index differ

include/configs/cmc_pu2.h +8 -5
diff -purN u-boot-i2c.ORIG/include/configs/cmc_pu2.h u-boot-i2c/include/configs/cmc_pu2.h
@@ -96,11 +96,14 @@
 
 #undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
 
-#define CONFIG_HARD_I2C
+#define CONFIG_HAS_I2C
 
-#ifdef CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		0	/* not used */
-#define CONFIG_SYS_I2C_SLAVE		0	/* not used */
+#ifdef CONFIG_HAS_I2C
+#define CONFIG_NEW_I2C
+#define CONFIG_AT91_I2C
+#define CONFIG_SYS_AT91_I2C_SPEED	100000	/* I2C speed and slave address */
+#define CONFIG_SYS_AT91_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_ADAPTERS		{&at91_i2c_adap}
 #define CONFIG_RTC_RS5C372A		/* RICOH I2C RTC */
 #define CONFIG_SYS_I2C_RTC_ADDR	0x32
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
@@ -136,7 +139,7 @@
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_MISC
 
-#if defined(CONFIG_HARD_I2C)
+#if defined(CONFIG_HAS_I2C)
     #define CONFIG_CMD_DATE
     #define CONFIG_CMD_EEPROM
     #define CONFIG_CMD_I2C
include/configs/kb9202.h +5 -3
diff -purN u-boot-i2c.ORIG/include/configs/kb9202.h u-boot-i2c/include/configs/kb9202.h
@@ -128,7 +128,11 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS		1
 #define CONFIG_SYS_MAX_FLASH_SECT		256
 
-#define	CONFIG_HARD_I2C
+#define CONFIG_NEW_I2C
+#define CONFIG_AT91_I2C
+#define CONFIG_SYS_AT91_I2C_SPEED	50000	/* I2C speed and slave address */
+#define CONFIG_SYS_AT91_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_ADAPTERS		{&at91_i2c_adap}
 
 #define	CONFIG_ENV_IS_IN_EEPROM
 
@@ -142,8 +146,6 @@
 #define	CONFIG_SYS_I2C_EEPROM_ADDR		0x50
 #define	CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	6
 #define	CONFIG_SYS_I2C_EEPROM_ADDR_LEN		2
-#define	CONFIG_SYS_I2C_SPEED			50000
-#define	CONFIG_SYS_I2C_SLAVE			0 /* not used */
 #define	CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10
 
 #define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
include/configs/m501sk.h +5 -3
diff -purN u-boot-i2c.ORIG/include/configs/m501sk.h u-boot-i2c/include/configs/m501sk.h
@@ -94,9 +94,11 @@
 #define CONFIG_ENV_SECT_SIZE	0x20000
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION	/*for Intel P30 Flash*/
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100
-#define CONFIG_SYS_I2C_SLAVE		0
+#define CONFIG_NEW_I2C
+#define CONFIG_AT91_I2C
+#define CONFIG_SYS_AT91_I2C_SPEED	100000	/* I2C speed and slave address */
+#define CONFIG_SYS_AT91_I2C_SLAVE	0
+#define CONFIG_SYS_I2C_ADAPTERS		{&at91_i2c_adap}
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #undef CONFIG_ENV_IS_IN_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
include/configs/mp2usb.h +9 -6
diff -purN u-boot-i2c.ORIG/include/configs/mp2usb.h u-boot-i2c/include/configs/mp2usb.h
@@ -115,11 +115,14 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91rm9200"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
 
-#undef CONFIG_HARD_I2C
+#undef CONFIG_HAS_I2C
 
-#ifdef CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		0	/* not used */
-#define CONFIG_SYS_I2C_SLAVE		0	/* not used */
+#ifdef CONFIG_HAS_I2C
+#define CONFIG_NEW_I2C
+#define CONFIG_AT91_I2C
+#define CONFIG_SYS_AT91_I2C_SPEED	100000	/* I2C speed and slave address */
+#define CONFIG_SYS_AT91_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_ADAPTERS		{&at91_i2c_adap}
 #define CONFIG_RTC_RS5C372A		/* RICOH I2C RTC */
 #define CONFIG_SYS_I2C_RTC_ADDR	0x32
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
@@ -131,7 +134,7 @@
 
 #define CONFIG_BOOTDELAY      3
 
-#if !defined(CONFIG_HARD_I2C)
+#if !defined(CONFIG_HAS_I2C)
 #define CONFIG_TIMESTAMP
 #endif
 
@@ -154,7 +157,7 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
-#if defined(CONFIG_HARD_I2C)
+#if defined(CONFIG_HAS_I2C)
 
     #define CONFIG_CMD_DATE
     #define CONFIG_CMD_EEPROM
#1 lore raw

PATCH 1/1 Multiadapter/multibus I2C, at91rm9200 and friends

Quoted 7 lines · 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.

please use git-format to sow that you move the file please do the move and the change in a 2 patchs iif possible

Quoted 31 lines

---
diff -purN u-boot-i2c.ORIG/board/cmc_pu2/load_sernum_ethaddr.c u-boot-i2c/board/cmc_pu2/load_sernum_ethaddr.c

board/cmc_pu2/load_sernum_ethaddr.c +1 -1
@@ -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

cpu/arm920t/at91rm9200/i2c.c +0 -14
@@ -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 <[email protected]>
- *
- *  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.

cpu/arm920t/at91rm9200/i2c.c line 24

Quoted 10 lines
cpu/arm920t/at91rm9200/i2c.c +0 -10
- *
- *  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.
- *

-

drivers/i2c/at91_i2c.c

Quoted 16 lines
cpu/arm920t/at91rm9200/i2c.c +0 -1
-#endif /* CONFIG_HARD_I2C */

diff -purN u-boot-i2c.ORIG/cpu/arm920t/at91rm9200/Makefile u-boot-i2c/cpu/arm920t/at91rm9200/Makefile

cpu/arm920t/at91rm9200/Makefile +1 -1
@@ -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

drivers/i2c/at91_i2c.c +0 -0

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.