i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

PATCH Superseded Heiko Schocher 3 participants 7 messages Aug 3, 2013 – Aug 30, 2013 1 message not in the archive

Subsystems (2)

Arm (32-bit) I2C

lore

Share & tools

lore

Heiko Schocher

author

2013-08-03 04:58 UTC #0 lore raw

PATCH 1/1 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver

Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/

Based on u-boot-ti git://git.denx.de/u-boot-ti.git master:

commit bb2a5d8f87fffb4fadfb205837decbd1b3e75f88

Author: Dan Murphy <[email protected]>
Date:   Thu Jul 11 13:10:28 2013 -0500

gpio: omap5-uevm: Configure the tca6424 gpio expander

Signed-off-by Heiko Schocher <[email protected]>

Cc Tom Rini <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Tom Rix <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Luca Ceresoli <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Ilya Yanok <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Pali Roh?r <[email protected]>

Cc Peter Barada <[email protected]>

Cc Nagendra T S <[email protected]>

Cc Michael Jones <[email protected]>

Cc Raphael Assenat <[email protected]>

---
 README                                         |  13 ++
 arch/arm/cpu/armv7/omap-common/clocks-common.c |   3 +-
 arch/arm/cpu/armv7/omap3/board.c               |   2 +-
 arch/arm/cpu/armv7/omap3/clock.c               |   2 +-
 arch/arm/include/asm/arch-am33xx/i2c.h         |   6 +-
 board/compulab/cm_t35/Makefile                 |   2 +-
 board/compulab/cm_t35/cm_t35.c                 |   2 +-
 board/compulab/cm_t35/eeprom.h                 |   2 +-
 board/logicpd/am3517evm/am3517evm.c            |   4 +-
 board/overo/overo.c                            |   2 +-
 board/phytec/pcm051/board.c                    |   4 +-
 board/ti/am335x/board.c                        |   2 +-
 board/ti/am3517crane/am3517crane.c             |   4 +-
 board/ti/evm/evm.c                             |   4 +-
 drivers/i2c/Makefile                           |   4 +-
 drivers/i2c/omap24xx_i2c.c                     | 172 ++++++++++++++++---------
 include/configs/am335x_evm.h                   |   9 +-
 include/configs/am3517_crane.h                 |   8 +-
 include/configs/am3517_evm.h                   |   8 +-
 include/configs/cm_t35.h                       |   8 +-
 include/configs/devkit8000.h                   |   8 +-
 include/configs/dig297.h                       |   8 +-
 include/configs/igep00x0.h                     |   8 +-
 include/configs/mcx.h                          |   8 +-
 include/configs/nokia_rx51.h                   |   8 +-
 include/configs/omap3_beagle.h                 |   9 +-
 include/configs/omap3_evm_common.h             |   9 +-
 include/configs/omap3_logic.h                  |  10 +-
 include/configs/omap3_mvblx.h                  |   9 +-
 include/configs/omap3_overo.h                  |   9 +-
 include/configs/omap3_pandora.h                |   8 +-
 include/configs/omap3_sdp3430.h                |   8 +-
 include/configs/omap3_zoom1.h                  |   8 +-
 include/configs/omap3_zoom2.h                  |   8 +-
 include/configs/omap4_common.h                 |   9 +-
 include/configs/omap5_common.h                 |   9 +-
 include/configs/pcm051.h                       |   9 +-
 include/configs/tam3517-common.h               |  11 +-
 include/configs/tricorder.h                    |   8 +-

39 Dateien ge?ndert, 236 Zeilen hinzugef?gt(+), 189 Zeilen entfernt(-)

README +13 -0

index a5c3e8d..8e93eab 100644
@@ -1974,6 +1974,19 @@ CBFS (Coreboot Filesystem) support
 		  - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
 		  - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
 
+		- drivers/i2c/omap24xx_i2c.c
+		  - activate this driver with CONFIG_SYS_I2C_OMAP24XX
+		  - CONFIG_SYS_OMAP24_I2C_SPEED speed channel 0
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE slave addr channel 0
+		  - CONFIG_SYS_OMAP24_I2C_SPEED1 speed channel 1
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE1 slave addr channel 1
+		  - CONFIG_SYS_OMAP24_I2C_SPEED2 speed channel 2
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE2 slave addr channel 2
+		  - CONFIG_SYS_OMAP24_I2C_SPEED3 speed channel 3
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE3 slave addr channel 3
+		  - CONFIG_SYS_OMAP24_I2C_SPEED4 speed channel 4
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE4 slave addr channel 4
+
 		additional defines:
 
 		CONFIG_SYS_NUM_I2C_BUSES

arch/arm/cpu/armv7/omap-common/clocks-common.c +2 -1

index 7580594..fc70595 100644
@@ -786,7 +786,8 @@ void gpi2c_init(void)
 	static int gpi2c = 1;
 
 	if (gpi2c) {
-		i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+		i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED,
+			 CONFIG_SYS_OMAP24_I2C_SLAVE);
 		gpi2c = 0;
 	}
 }

arch/arm/cpu/armv7/omap3/board.c +1 -1

index 7d1f8d9..2922816 100644
@@ -98,7 +98,7 @@ void spl_board_init(void)
 	gpmc_init();
 #endif
 #ifdef CONFIG_SPL_I2C_SUPPORT
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 }
 #endif /* CONFIG_SPL_BUILD */

arch/arm/cpu/armv7/omap3/clock.c +1 -1

index 3acbc9c..7e48352 100644
@@ -692,7 +692,7 @@ void per_clocks_enable(void)
 	sr32(&prcm_base->iclken_per, 17, 1, 1);
 #endif
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 	/* Turn on all 3 I2C clocks */
 	sr32(&prcm_base->fclken1_core, 15, 3, 0x7);
 	sr32(&prcm_base->iclken1_core, 15, 3, 0x7);	/* I2C1,2,3 = on */

arch/arm/include/asm/arch-am33xx/i2c.h +3 -3

index 8bfa53f..8642c8f 100644
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
-#ifndef _I2C_H_
-#define _I2C_H_
+#ifndef _I2C_AM33XX_H_
+#define _I2C_AM33XX_H_
 
 #define  I2C_BASE1		0x44E0B000
 #define  I2C_BASE2		0x4802A000

@@ -62,4 +62,4 @@ struct i2c {
 #define I2C_IP_CLK			48000000
 #define I2C_INTERNAL_SAMPLING_CLK	12000000
 
-#endif /* _I2C_H_ */
+#endif /* _I2C_AM33XX_H_ */

board/compulab/cm_t35/Makefile +1 -1

index 6d07947..9014d2a 100644
@@ -11,7 +11,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
+COBJS-$(CONFIG_SYS_I2C_OMAP34XX) += eeprom.o
 COBJS-$(CONFIG_LCD) += display.o
 
 COBJS	:= cm_t35.o leds.o $(COBJS-y)

board/compulab/cm_t35/cm_t35.c +1 -1

index 3caa5be..1dd3647 100644
@@ -470,7 +470,7 @@ static void setup_net_chip_gmpc(void)
 		&ctrl_base->gpmc_nadv_ale);
 }
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 /*
  * Routine: reset_net_chip
  * Description: reset the Ethernet controller via TPS65930 GPIO

board/compulab/cm_t35/eeprom.h +1 -1

index 02ffbb1..a07559d 100644
@@ -10,7 +10,7 @@
 #ifndef _EEPROM_
 #define _EEPROM_
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 int cm_t3x_eeprom_read_mac_addr(uchar *buf);
 u32 cm_t3x_eeprom_get_board_rev(void);
 #else

board/logicpd/am3517evm/am3517evm.c +2 -2

index 1cabc80..33709bd 100644
@@ -98,8 +98,8 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 	dieid_num_r();

board/overo/overo.c +1 -1

index a6e2e93..93ed2f7 100644
@@ -92,7 +92,7 @@ int get_board_revision(void)
 {
 	int revision;
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 	unsigned char data;
 
 	/* board revisions <= R2410 connect 4030 irq_1 to gpio112             */

board/phytec/pcm051/board.c +2 -2

index 275fe82..b99983d 100644
@@ -91,7 +91,7 @@ void set_mux_conf_regs(void)
 {
 	/* Initalize the board header */
 	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
 	enable_board_pin_mux();
 }

@@ -108,7 +108,7 @@ void sdram_init(void)
  */
 int board_init(void)
 {
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
 	gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;

board/ti/am335x/board.c +1 -1

index b2bec34..daa6907 100644
@@ -249,7 +249,7 @@ const struct dpll_params *get_dpll_ddr_params(void)
 	struct am335x_baseboard_id header;
 
 	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 	if (read_eeprom(&header) < 0)
 		puts("Could not get board ID.\n");

board/ti/am3517crane/am3517crane.c +2 -2

index 5eb97ff..a649697 100644
@@ -43,8 +43,8 @@ int board_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 	dieid_num_r();

board/ti/evm/evm.c +2 -2

index c71c218..81dd081 100644
@@ -146,8 +146,8 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
 int misc_init_r(void)
 {
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 #if defined(CONFIG_CMD_NET)

drivers/i2c/Makefile +2 -2

index 37ccbd1..f32daea 100644
@@ -17,8 +17,6 @@ COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
 COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
 COBJS-$(CONFIG_I2C_MXS) += mxs_i2c.o
 COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
-COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
-COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o
 COBJS-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
 COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o
 COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o

@@ -30,6 +28,8 @@ COBJS-$(CONFIG_SYS_I2C) += i2c_core.o
 COBJS-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
 COBJS-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o
 COBJS-$(CONFIG_SYS_I2C_PPC4XX) += ppc4xx_i2c.o
+COBJS-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o
+COBJS-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o
 COBJS-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 COBJS-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
 COBJS-$(CONFIG_ZYNQ_I2C) += zynq_i2c.o

drivers/i2c/omap24xx_i2c.c +108 ~~-64~~

348 lines not on this page · raw message

include/configs/am335x_evm.h +4 -5

index e32066d..566b118 100644
@@ -300,11 +300,10 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */

include/configs/am3517_crane.h +4 -4

index 9bf283a..436dacc 100644
@@ -141,10 +141,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

include/configs/am3517_evm.h +4 -4

index 5c61697..e9cb007 100644
@@ -135,10 +135,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

include/configs/cm_t35.h +4 -4

index 39a216e..5c57ae7 100644
@@ -139,10 +139,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_I2C_MULTI_BUS

include/configs/devkit8000.h +4 -4

index 513121a..172b13e 100644
@@ -89,10 +89,10 @@
 #define CONFIG_DOS_PARTITION		1
 
 /* I2C */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_POWER		1

include/configs/dig297.h +4 -4

index bf91625..3e87cc3 100644
@@ -122,10 +122,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/igep00x0.h +4 -4

index c17267e..2230f86 100644
@@ -121,10 +121,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/mcx.h +4 -4

index c2b1631..43ef3c3 100644
@@ -136,10 +136,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* RTC */
 #define CONFIG_RTC_DS1337

include/configs/nokia_rx51.h +4 -4

index 36c6800..5cf852c 100644
@@ -156,10 +156,10 @@
 #undef CONFIG_CMD_SETGETDCR		/* DCR support on 4xx */
 
 #define CONFIG_OMAP3_SPI
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_beagle.h +4 -5

index 4487451..8ec0292 100644
@@ -160,11 +160,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
 
 /*

include/configs/omap3_evm_common.h +4 -5

index 3b3e25a..46fff9f 100644
@@ -87,11 +87,10 @@
 /*
  * I2C
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * PISMO support

include/configs/omap3_logic.h +4 -6

index 3dd6d32..4eb333b 100644
@@ -117,12 +117,10 @@
 /*
  * I2C
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_mvblx.h +4 -5

index 5526b43..67e7aad 100644
@@ -127,11 +127,10 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_FPGA
 
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		0
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
-#define CONFIG_I2C_MULTI_BUS		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_overo.h +4 -5

index 3e018c0..7a8048f 100644
@@ -97,11 +97,10 @@
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_pandora.h +4 -4

index 3e8bd67..12cba69 100644
@@ -110,10 +110,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_sdp3430.h +4 -4

index 836a3d8..4949d66 100644
@@ -113,10 +113,10 @@
 /*
  * I2C for power management setup
  */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* OMITTED:  single 1 Gbit MT29F1G NAND flash */

include/configs/omap3_zoom1.h +4 -4

index 3687045..372ee6b 100644
@@ -117,10 +117,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_zoom2.h +4 -4

index c57df8e..7de8c97 100644
@@ -137,10 +137,10 @@
 #undef CONFIG_CMD_NFS			/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap4_common.h +4 -5

index 719cb83..e3c0c10 100644
@@ -72,11 +72,10 @@
 #define CONFIG_ARCH_CPU_INIT
 
 /* I2C  */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
-#define CONFIG_I2C_MULTI_BUS		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL6030 */
 #ifndef CONFIG_SPL_BUILD

include/configs/omap5_common.h +4 -5

index 7dd56cf..fd790ed 100644
@@ -66,11 +66,10 @@
 #define CONFIG_ARCH_CPU_INIT
 
 /* I2C  */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
-#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* MMC */
 #define CONFIG_GENERIC_MMC

include/configs/pcm051.h +4 -5

index 9b16c47..9704a43 100644
@@ -176,11 +176,10 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */

include/configs/tam3517-common.h +5 -6

index c297827..b76af0e 100644
@@ -116,14 +116,13 @@
 #undef CONFIG_CMD_IMLS
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	400000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50		/* base address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1		/* bytes of address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x07
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
 
 /*
  * Board NAND Info.

@@ -370,7 +369,7 @@ struct tam3517_module_info {
 
 #define TAM3517_READ_EEPROM(info, ret) \
 do {								\
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);	\
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); \
 	if (eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0,		\
 		(void *)info, sizeof(*info)))			\
 		ret = 1;					\

include/configs/tricorder.h +4 -4

index 4e2cb65..da2581d 100644
@@ -79,10 +79,10 @@
 #define CONFIG_DOS_PARTITION
 
 /* I2C */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_POWER

Signature · 1 line

1.7.11.7

A message that is not in the archive (sent off-list or not yet received): [email protected]

Nikita Kiryanov

2013-08-13 06:47 UTC #2 lore raw

PATCH 1/1 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

Hi Heiko,

Quoted 14 lines

-------- Original Message --------
Subject: [PATCH] i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework
Date: Sat, 3 Aug 2013 06:58:25 +0200
From: Heiko Schocher <[email protected]>
To: u-boot at lists.denx.de
CC: Heiko Schocher <[email protected]>, Tom Rini <[email protected]>, Lars Poeschel <[email protected]>, Steve Sakoman <[email protected]>, Thomas Weber <[email protected]>, Tom Rix <[email protected]>, Grazvydas Ignotas <[email protected]>, Enric Balletbo i Serra <[email protected]>, Luca Ceresoli <[email protected]>, Igor Grinberg <[email protected]>, Ilya Yanok <[email protected]>, Stefano Babic <[email protected]>, Nishanth Menon <[email protected]>, Pali Roh?r <[email protected]>, Peter Barada <[email protected]>, Nagendra T S <[email protected]>, Michael Jones <[email protected]>, Raphael Assenat <[email protected]>
- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/

Quoted 8 lines

Based on u-boot-ti git://git.denx.de/u-boot-ti.git master:
commit bb2a5d8f87fffb4fadfb205837decbd1b3e75f88
Author: Dan Murphy <[email protected]>
Date:   Thu Jul 11 13:10:28 2013 -0500
gpio: omap5-uevm: Configure the tca6424 gpio expander

The patch doesn't apply on current u-boot-ti master. Please rebase.

Signature · 2 lines

Regards,
Nikita.

Heiko Schocher

author

2013-08-19 14:48 UTC #3 lore raw

PATCH v2 1/2 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

In reply to Heiko Schocher

- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver

Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/

Signed-off-by Heiko Schocher <[email protected]>

Cc Tom Rini <[email protected]>

Cc Lars Poeschel <[email protected]>

Cc Steve Sakoman <[email protected]>

Cc Thomas Weber <[email protected]>

Cc Tom Rix <[email protected]>

Cc Grazvydas Ignotas <[email protected]>

Cc Enric Balletbo i Serra <[email protected]>

Cc Luca Ceresoli <[email protected]>

Cc Igor Grinberg <[email protected]>

Cc Ilya Yanok <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Nishanth Menon <[email protected]>

Cc Pali Roh?r <[email protected]>

Cc Peter Barada <[email protected]>

Cc Nagendra T S <[email protected]>

Cc Michael Jones <[email protected]>

Cc Raphael Assenat <[email protected]>

---
- changes for v2:
rebased against u-boot-ti 425faf74cd8189c87919f7e72a0101c684ee3b9f

 README                                         |  13 ++
 arch/arm/cpu/armv7/omap-common/clocks-common.c |   3 +-
 arch/arm/cpu/armv7/omap3/board.c               |   2 +-
 arch/arm/cpu/armv7/omap3/clock.c               |   2 +-
 arch/arm/include/asm/arch-am33xx/i2c.h         |   6 +-
 board/compulab/cm_t35/Makefile                 |   2 +-
 board/compulab/cm_t35/cm_t35.c                 |   2 +-
 board/compulab/cm_t35/eeprom.h                 |   2 +-
 board/logicpd/am3517evm/am3517evm.c            |   4 +-
 board/overo/overo.c                            |   2 +-
 board/phytec/pcm051/board.c                    |   4 +-
 board/ti/am335x/board.c                        |   2 +-
 board/ti/am3517crane/am3517crane.c             |   4 +-
 board/ti/evm/evm.c                             |   4 +-
 drivers/i2c/Makefile                           |   4 +-
 drivers/i2c/omap24xx_i2c.c                     | 172 ++++++++++++++++---------
 include/configs/am335x_evm.h                   |   1 -
 include/configs/am3517_crane.h                 |   8 +-
 include/configs/am3517_evm.h                   |   8 +-
 include/configs/cm_t35.h                       |   8 +-
 include/configs/devkit8000.h                   |   8 +-
 include/configs/dig297.h                       |   8 +-
 include/configs/igep00x0.h                     |   8 +-
 include/configs/mcx.h                          |   8 +-
 include/configs/nokia_rx51.h                   |   8 +-
 include/configs/omap3_beagle.h                 |   9 +-
 include/configs/omap3_evm_common.h             |   9 +-
 include/configs/omap3_logic.h                  |  10 +-
 include/configs/omap3_mvblx.h                  |   9 +-
 include/configs/omap3_overo.h                  |   9 +-
 include/configs/omap3_pandora.h                |   8 +-
 include/configs/omap3_sdp3430.h                |   8 +-
 include/configs/omap3_zoom1.h                  |   8 +-
 include/configs/omap3_zoom2.h                  |   8 +-
 include/configs/omap4_common.h                 |   9 +-
 include/configs/pcm051.h                       |   9 +-
 include/configs/tam3517-common.h               |  11 +-
 include/configs/ti_armv7_common.h              |   9 +-
 include/configs/tricorder.h                    |   8 +-

39 Dateien ge?ndert, 232 Zeilen hinzugef?gt(+), 185 Zeilen entfernt(-)

README +13 -0

index a5c3e8d..8e93eab 100644
@@ -1974,6 +1974,19 @@ CBFS (Coreboot Filesystem) support
 		  - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
 		  - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
 
+		- drivers/i2c/omap24xx_i2c.c
+		  - activate this driver with CONFIG_SYS_I2C_OMAP24XX
+		  - CONFIG_SYS_OMAP24_I2C_SPEED speed channel 0
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE slave addr channel 0
+		  - CONFIG_SYS_OMAP24_I2C_SPEED1 speed channel 1
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE1 slave addr channel 1
+		  - CONFIG_SYS_OMAP24_I2C_SPEED2 speed channel 2
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE2 slave addr channel 2
+		  - CONFIG_SYS_OMAP24_I2C_SPEED3 speed channel 3
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE3 slave addr channel 3
+		  - CONFIG_SYS_OMAP24_I2C_SPEED4 speed channel 4
+		  - CONFIG_SYS_OMAP24_I2C_SLAVE4 slave addr channel 4
+
 		additional defines:
 
 		CONFIG_SYS_NUM_I2C_BUSES

arch/arm/cpu/armv7/omap-common/clocks-common.c +2 -1

index 7580594..fc70595 100644
@@ -786,7 +786,8 @@ void gpi2c_init(void)
 	static int gpi2c = 1;
 
 	if (gpi2c) {
-		i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+		i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED,
+			 CONFIG_SYS_OMAP24_I2C_SLAVE);
 		gpi2c = 0;
 	}
 }

arch/arm/cpu/armv7/omap3/board.c +1 -1

index 7d1f8d9..2922816 100644
@@ -98,7 +98,7 @@ void spl_board_init(void)
 	gpmc_init();
 #endif
 #ifdef CONFIG_SPL_I2C_SUPPORT
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 }
 #endif /* CONFIG_SPL_BUILD */

arch/arm/cpu/armv7/omap3/clock.c +1 -1

index e903ed9..f30344a 100644
@@ -710,7 +710,7 @@ void per_clocks_enable(void)
 	sr32(&prcm_base->iclken_per, 17, 1, 1);
 #endif
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 	/* Turn on all 3 I2C clocks */
 	sr32(&prcm_base->fclken1_core, 15, 3, 0x7);
 	sr32(&prcm_base->iclken1_core, 15, 3, 0x7);	/* I2C1,2,3 = on */

arch/arm/include/asm/arch-am33xx/i2c.h +3 -3

index 8bfa53f..8642c8f 100644
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
-#ifndef _I2C_H_
-#define _I2C_H_
+#ifndef _I2C_AM33XX_H_
+#define _I2C_AM33XX_H_
 
 #define  I2C_BASE1		0x44E0B000
 #define  I2C_BASE2		0x4802A000

@@ -62,4 +62,4 @@ struct i2c {
 #define I2C_IP_CLK			48000000
 #define I2C_INTERNAL_SAMPLING_CLK	12000000
 
-#endif /* _I2C_H_ */
+#endif /* _I2C_AM33XX_H_ */

board/compulab/cm_t35/Makefile +1 -1

index 6d07947..9014d2a 100644
@@ -11,7 +11,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
+COBJS-$(CONFIG_SYS_I2C_OMAP34XX) += eeprom.o
 COBJS-$(CONFIG_LCD) += display.o
 
 COBJS	:= cm_t35.o leds.o $(COBJS-y)

board/compulab/cm_t35/cm_t35.c +1 -1

index 3caa5be..1dd3647 100644
@@ -470,7 +470,7 @@ static void setup_net_chip_gmpc(void)
 		&ctrl_base->gpmc_nadv_ale);
 }
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 /*
  * Routine: reset_net_chip
  * Description: reset the Ethernet controller via TPS65930 GPIO

board/compulab/cm_t35/eeprom.h +1 -1

index 02ffbb1..a07559d 100644
@@ -10,7 +10,7 @@
 #ifndef _EEPROM_
 #define _EEPROM_
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 int cm_t3x_eeprom_read_mac_addr(uchar *buf);
 u32 cm_t3x_eeprom_get_board_rev(void);
 #else

board/logicpd/am3517evm/am3517evm.c +2 -2

index 1cabc80..33709bd 100644
@@ -98,8 +98,8 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 	dieid_num_r();

board/overo/overo.c +1 -1

index aace42a..9ac35d2 100644
@@ -92,7 +92,7 @@ int get_board_revision(void)
 {
 	int revision;
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
+#ifdef CONFIG_SYS_I2C_OMAP34XX
 	unsigned char data;
 
 	/* board revisions <= R2410 connect 4030 irq_1 to gpio112             */

board/phytec/pcm051/board.c +2 -2

index e40b0bd..a2ad650 100644
@@ -91,7 +91,7 @@ void set_mux_conf_regs(void)
 {
 	/* Initalize the board header */
 	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
 	enable_board_pin_mux();
 }

@@ -108,7 +108,7 @@ void sdram_init(void)
  */
 int board_init(void)
 {
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

board/ti/am335x/board.c +1 -1

index cc04426..f78af9a 100644
@@ -249,7 +249,7 @@ const struct dpll_params *get_dpll_ddr_params(void)
 	struct am335x_baseboard_id header;
 
 	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 	if (read_eeprom(&header) < 0)
 		puts("Could not get board ID.\n");

board/ti/am3517crane/am3517crane.c +2 -2

index 5eb97ff..a649697 100644
@@ -43,8 +43,8 @@ int board_init(void)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 	dieid_num_r();

board/ti/evm/evm.c +2 -2

index c71c218..81dd081 100644
@@ -146,8 +146,8 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
 int misc_init_r(void)
 {
 
-#ifdef CONFIG_DRIVER_OMAP34XX_I2C
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
 
 #if defined(CONFIG_CMD_NET)

drivers/i2c/Makefile +2 -2

index 37ccbd1..f32daea 100644
@@ -17,8 +17,6 @@ COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
 COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
 COBJS-$(CONFIG_I2C_MXS) += mxs_i2c.o
 COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
-COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
-COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o
 COBJS-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
 COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o
 COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o

@@ -30,6 +28,8 @@ COBJS-$(CONFIG_SYS_I2C) += i2c_core.o
 COBJS-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
 COBJS-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o
 COBJS-$(CONFIG_SYS_I2C_PPC4XX) += ppc4xx_i2c.o
+COBJS-$(CONFIG_SYS_I2C_OMAP24XX) += omap24xx_i2c.o
+COBJS-$(CONFIG_SYS_I2C_OMAP34XX) += omap24xx_i2c.o
 COBJS-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 COBJS-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
 COBJS-$(CONFIG_ZYNQ_I2C) += zynq_i2c.o

drivers/i2c/omap24xx_i2c.c +108 ~~-64~~

348 lines not on this page · raw message

include/configs/am335x_evm.h +0 -1

index e0a87f8..1c45a5f 100644
@@ -218,7 +218,6 @@
 #define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 #define CONFIG_BAUDRATE			115200
 
-/* I2C Configuration */
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */

include/configs/am3517_crane.h +4 -4

index 1fd2508..73207f9 100644
@@ -142,10 +142,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

include/configs/am3517_evm.h +4 -4

index 6500878..fa44597 100644
@@ -136,10 +136,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS

include/configs/cm_t35.h +4 -4

index bc5b66c..c301697 100644
@@ -140,10 +140,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_I2C_MULTI_BUS

include/configs/devkit8000.h +4 -4

index cb79b4e..670945a 100644
@@ -90,10 +90,10 @@
 #define CONFIG_DOS_PARTITION		1
 
 /* I2C */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_POWER		1

include/configs/dig297.h +4 -4

index 30e3908..e066f7b 100644
@@ -123,10 +123,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/igep00x0.h +4 -4

index 722c566..fbb2654 100644
@@ -123,10 +123,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/mcx.h +4 -4

index 85ae016..5a2a693 100644
@@ -137,10 +137,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* RTC */
 #define CONFIG_RTC_DS1337

include/configs/nokia_rx51.h +4 -4

index cfc5f12..40a77ff 100644
@@ -157,10 +157,10 @@
 #undef CONFIG_CMD_SETGETDCR		/* DCR support on 4xx */
 
 #define CONFIG_OMAP3_SPI
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_beagle.h +4 -5

index c1245e7..aa8de324e 100644
@@ -161,11 +161,10 @@
 #undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
 
 /*

include/configs/omap3_evm_common.h +4 -5

index edf6543..bc7d24e 100644
@@ -88,11 +88,10 @@
 /*
  * I2C
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * PISMO support

include/configs/omap3_logic.h +4 -6

index ee6db51..b49c5a1 100644
@@ -118,12 +118,10 @@
 /*
  * I2C
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_mvblx.h +4 -5

index 0c88419..6eaeeae 100644
@@ -128,11 +128,10 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_FPGA
 
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		0
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
-#define CONFIG_I2C_MULTI_BUS		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_overo.h +4 -5

index 88380a4..8344028 100644
@@ -98,11 +98,10 @@
 #define CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP34XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_pandora.h +4 -4

index 91a2568..4f36d07 100644
@@ -111,10 +111,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_sdp3430.h +4 -4

index a5e469c..57929d7 100644
@@ -114,10 +114,10 @@
 /*
  * I2C for power management setup
  */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* OMITTED:  single 1 Gbit MT29F1G NAND flash */

include/configs/omap3_zoom1.h +4 -4

index c747d52..fdc4ab9 100644
@@ -118,10 +118,10 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap3_zoom2.h +4 -4

index cb8c7ec..f749740 100644
@@ -138,10 +138,10 @@
 #undef CONFIG_CMD_NFS			/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /*
  * TWL4030

include/configs/omap4_common.h +4 -5

index e9f2383..97d5a6b 100644
@@ -73,11 +73,10 @@
 #define CONFIG_ARCH_CPU_INIT
 
 /* I2C  */
-#define CONFIG_HARD_I2C			1
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
-#define CONFIG_I2C_MULTI_BUS		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL6030 */
 #ifndef CONFIG_SPL_BUILD

include/configs/pcm051.h +4 -5

index d4d4d79..a5c3f6b 100644
@@ -173,11 +173,10 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP24XX
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */

include/configs/tam3517-common.h +5 -6

index c215f0b..e47b4f7 100644
@@ -117,14 +117,13 @@
 #undef CONFIG_CMD_IMLS
 
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	400000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50		/* base address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1		/* bytes of address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x07
-#define CONFIG_DRIVER_OMAP34XX_I2C
-
 
 /*
  * Board NAND Info.

@@ -371,7 +370,7 @@ struct tam3517_module_info {
 
 #define TAM3517_READ_EEPROM(info, ret) \
 do {								\
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);	\
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); \
 	if (eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0,		\
 		(void *)info, sizeof(*info)))			\
 		ret = 1;					\

include/configs/ti_armv7_common.h +4 -5

index e0ab691..fa3ed24 100644
@@ -61,11 +61,10 @@
 /* I2C IP block */
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_DRIVER_OMAP24XX_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /* MMC/SD IP block */
 #define CONFIG_MMC

include/configs/tricorder.h +4 -4

index a9b2714..8ceb93a 100644
@@ -80,10 +80,10 @@
 #define CONFIG_DOS_PARTITION
 
 /* I2C */
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SLAVE		1
-#define CONFIG_DRIVER_OMAP34XX_I2C	1
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP34XX
 
 /* TWL4030 */
 #define CONFIG_TWL4030_POWER

Signature · 1 line

1.7.11.7

Tom Rini

2013-08-29 14:05 UTC #4 lore raw

PATCH v2 1/2 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

Quoted 6 lines · Heiko Schocher

- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/

On top of current master, on omap3_beagle (xM):
U-Boot SPL 2013.10-rc1-00054-g03028ca (Aug 29 2013 - 09:46:45) Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible
... hang here ...

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130829/6e9ed649/attachment.pgp>

Heiko Schocher

author

2013-08-30 04:44 UTC #5 lore raw

PATCH v2 1/2 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

Hello Tom,

Am 29.08.2013 16:05, schrieb Tom Rini:

Quoted 9 lines · Heiko Schocher

Quoted 7 lines
- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/

Quoted 5 lines

On top of current master, on omap3_beagle (xM):
U-Boot SPL 2013.10-rc1-00054-g03028ca (Aug 29 2013 - 09:46:45) Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible
... hang here ...

:-(

It seems there is no i2c adapter ... I just tried to rebase this patch against current u-boot-ti and get a merge error in

include/configs/ti_armv7_common.h

So, I repost a v3 of this patch against u-boot-ti commit 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 where the siemens boards are added. Can you have a look at this new patch?

With this patch on current u-boot-ti I find three i2c adapters in U-Boot (System.map):

8014afe4 D _u_boot_list_2_i2c_2_omap24_0
8014afe4 d end.6414
8014afe4 d start.6364
8014afe4 d start.6368
8014afe4 d start.6389
8014afe4 d start.6412
8014afe4 d start.6800
8014afe4 d start.6811
8014afe4 d start.6827
8014b00c D _u_boot_list_2_i2c_2_omap24_1
8014b034 D _u_boot_list_2_i2c_2_omap24_2
8014b05c B __bss_base

and three adapter in spl code (spl/u-boot-spl.map):

.data 0x00000000 0x0 drivers/i2c/libi2c.o
.u_boot_list_2_i2c_2_omap24_0

                 0x00000000       0x28 drivers/i2c/libi2c.o
  .u_boot_list_2_i2c_2_omap24_1
                 0x00000000       0x28 drivers/i2c/libi2c.o
  .u_boot_list_2_i2c_2_omap24_2
                 0x00000000       0x28 drivers/i2c/libi2c.o

.bss 0x00000000 0x0 drivers/i2c/libi2c.o

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Tom Rini

2013-08-30 12:35 UTC #6 lore raw

PATCH v2 1/2 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 23 lines · Heiko Schocher

Hello Tom,
Am 29.08.2013 16:05, schrieb Tom Rini:
Quoted 9 lines · Heiko Schocher
Quoted 7 lines
- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/
Quoted 5 lines
On top of current master, on omap3_beagle (xM):
U-Boot SPL 2013.10-rc1-00054-g03028ca (Aug 29 2013 - 09:46:45) Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible
... hang here ...
:-(
It seems there is no i2c adapter ... I just tried to rebase this patch against current u-boot-ti and get a merge error in

Quoted 8 lines

include/configs/ti_armv7_common.h
So, I repost a v3 of this patch against u-boot-ti commit 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 where the siemens boards are added. Can you have a look at this new patch?
With this patch on current u-boot-ti I find three i2c adapters in U-Boot (System.map):

OK, I missed this earlier, I'll test things again today.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSIJGVAAoJENk4IS6UOR1W+AAP/2Qrx6lPizehcLnNsBXPuNwJ 51ISmKcI8n4XvVoBF5y5ZGGZ3CL3ET5vFW4fTrCRoyzlPsc13k8FZXq2V2cR6VRT 2/gzVDjKp7egsZL6Qiysbh62ccKtYJKTsFkCKeiEsM5R2ruSW+y6H94JHg5z2ZkX YoUKRQNXgGxkJ8ESqJyh6a84RJdwi+/DsCb6tgWa+OXIDxP8GSCq1lBFVFDv8Uqh fz81DSWKHlzZoSA46hEcQVNgGTCYFRA+8I+5CFLyK+ofri9LAACr6OAoKJbu52uK i1JGkXSOdTiDQcXWGG2RKqdK7XZAC0BJjBNwQggobPcQGC8uqNdXtxbEWeN6IavP 8zglDP4Ul2R7FcA6pKUrCF9flxwJE3pUjemRkeMh8FEBCmG7rwMW3JHq90s3PZtc +lYb2316QAaUZqjToGjaTSHC+UnE+VF4Ud+Z3zkV0PxSWFPrjIfWi3bxr+BHhyge ECZ6ziX9nZyIpd/8K25qum/ZdM7/Lv97nmDEM1lwuwbft8dcRPQgxhBhUu2Vy5o5 PNr9kMruY0TQdCJLayM6IkOdzN/b30xzVAB5uZDsVHwfg8O1yOEiBTli8/K/uN+/ lWmx3UNEwEPWFc+qd62RQbfxYm16JSo7nBpU9gb0XNePcYJHYMbMQhUbJNr8NKng eR+MnEyC3Z/2CFueaxko
=llQW
-----END PGP SIGNATURE-----

Tom Rini

2013-08-30 18:55 UTC #7 lore raw

PATCH v2 1/2 i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework

In reply to Heiko Schocher

Quoted 47 lines · Heiko Schocher

Hello Tom,
Am 29.08.2013 16:05, schrieb Tom Rini:
Quoted 9 lines · Heiko Schocher
Quoted 7 lines
- add omap24xx driver to new multibus/multiadpater support
- adapted all config files, which uses this driver
Tested on the am335x based siemens boards rut, dxr2 and pxm2 posted here:
http://patchwork.ozlabs.org/patch/263211/
Quoted 5 lines
On top of current master, on omap3_beagle (xM):
U-Boot SPL 2013.10-rc1-00054-g03028ca (Aug 29 2013 - 09:46:45) Error, wrong i2c adapter 0 max 0 possible
Error, wrong i2c adapter 0 max 0 possible
... hang here ...
:-(
It seems there is no i2c adapter ... I just tried to rebase this patch against current u-boot-ti and get a merge error in
include/configs/ti_armv7_common.h
So, I repost a v3 of this patch against u-boot-ti commit 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 where the siemens boards are added. Can you have a look at this new patch?
With this patch on current u-boot-ti I find three i2c adapters in U-Boot (System.map):
8014afe4 D _u_boot_list_2_i2c_2_omap24_0
8014afe4 d end.6414
8014afe4 d start.6364
8014afe4 d start.6368
8014afe4 d start.6389
8014afe4 d start.6412
8014afe4 d start.6800
8014afe4 d start.6811
8014afe4 d start.6827
8014b00c D _u_boot_list_2_i2c_2_omap24_1
8014b034 D _u_boot_list_2_i2c_2_omap24_2
8014b05c B __bss_base
and three adapter in spl code (spl/u-boot-spl.map):

Quoted 8 lines

.data 0x00000000 0x0 drivers/i2c/libi2c.o
.u_boot_list_2_i2c_2_omap24_0

                0x00000000       0x28 drivers/i2c/libi2c.o
 .u_boot_list_2_i2c_2_omap24_1
                0x00000000       0x28 drivers/i2c/libi2c.o
 .u_boot_list_2_i2c_2_omap24_2
                0x00000000       0x28 drivers/i2c/libi2c.o

.bss 0x00000000 0x0 drivers/i2c/libi2c.o

Ah-ha! These are in the discard section of the map, which is why v3 still fails.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130830/84b0e2c8/attachment.pgp>