Skip to contentSkip to conversation

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

PATCH Superseded Heiko Schocher 4 participants 9 messages Oct 22, 2013 – Nov 13, 2013

Subsystems (2)
Arm (32-bit) I2C

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Heiko Schocher

author
#0 lore raw

PATCH v4 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/

Signed-off-by Heiko Schocher <[email protected]>
Tested-by 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
- changes for v3:
rebase against: u-boot-it 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 add siemens boards (rut, dxr2 and pxm2)
- changes for v4:
fix u-boot spl mode

---
 README                                         |  13 ++
 arch/arm/cpu/armv7/omap-common/clocks-common.c |   3 +-
 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds  |   4 +
 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/siemens/common/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/siemens-am33x-common.h         |   9 +-
 include/configs/tam3517-common.h               |  11 +-
 include/configs/ti_armv7_common.h              |   9 +-
 include/configs/tricorder.h                    |   8 +-
 42 files changed, 242 insertions(+), 192 deletions(-)
README +13 -0
index 09662a4..e6e0465 100644
@@ -2003,6 +2003,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 ab0c568..98c3630 100644
@@ -779,7 +779,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/omap-common/u-boot-spl.lds +4 -0
index 5e93b34..989083c 100644
@@ -33,6 +33,10 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	} >.sram
+	. = ALIGN(4);
 	__image_copy_end = .;
 	_end = .;
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 9f989ff..14fc7e8 100644
@@ -708,7 +708,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 b6c68da..1569905 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 dafb1eb..034886a 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/siemens/common/board.c +2 -2
index 6279c32..32d2ee4 100644
@@ -42,7 +42,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_set_bus_num(0);
 	if (read_eeprom() < 0)
 		puts("Could not get board ID.\n");
 

@@ -67,7 +67,7 @@ int board_init(void)
 #if defined(CONFIG_HW_WATCHDOG)
 	hw_watchdog_init();
 #endif /* defined(CONFIG_HW_WATCHDOG) */
-	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+	i2c_set_bus_num(0);
 	if (read_eeprom() < 0)
 		puts("Could not get board ID.\n");
board/ti/am335x/board.c +1 -1
index c2fc5a6..44a1dea 100644
@@ -395,7 +395,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 df3092e..c2001ea 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_TSI108_I2C) += tsi108_i2c.o

@@ -29,6 +27,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 c2ba7e3..f35ed6f 100644
@@ -183,7 +183,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 c1e996e..9759106 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 08d49fb..2a5574e 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 e92bb68..41bf758 100644
@@ -124,10 +124,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 5e27ab2..f197490 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 64db0eb..c307686 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 9fcd50b..3b9225d 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 42cea01..8e177c0 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 73d5d30..328d8c4 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 ee448bb..7cfed8e 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 fc219fa..42384e6 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 a4a739e..86f8daf 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 2fff0be..1f04acc 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/siemens-am33x-common.h +4 -5
index 5426ee8..03c143d 100644
@@ -133,11 +133,10 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#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	OMAP_I2C_STANDARD
+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
+#define CONFIG_SYS_I2C_OMAP24XX
 
 /* Defines for SPL */
 #define CONFIG_SPL
include/configs/tam3517-common.h +5 -6
index 60dd8ff..9e5fe90 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.

@@ -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/ti_armv7_common.h +4 -5
index e89e874..72a4ec5 100644
@@ -60,12 +60,11 @@
 
 /* I2C IP block */
 #define CONFIG_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_CMD_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 b102739..da3288a 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.8.3.1
#1 lore raw

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

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher <[email protected]>
Tested-by 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]>

[...]

Quoted 3 lines
 board/compulab/cm_t35/Makefile                 |   2 +-
 board/compulab/cm_t35/cm_t35.c                 |   2 +-
 board/compulab/cm_t35/eeprom.h                 |   2 +-

[...]

Quoted 1 line
 include/configs/cm_t35.h                       |   8 +-

[...]

Quoted 31 lines
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 +0 -0
index 02ffbb1..a07559d 100644

board/compulab/cm_t35/eeprom.h line 16

Quoted 8 lines
board/compulab/cm_t35/eeprom.h +1 -1
@@ -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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Otherwise,

Acked-by Igor Grinberg <[email protected]>

[...]

Quoted 19 lines
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

[...]

Signature · 2 lines
Regards,
Igor.
author
#2 lore raw

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

Hello Igor,

Am 27.10.2013 08:30, schrieb Igor Grinberg:

Quoted 30 lines

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher<[email protected]>
Tested-by 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]>

[...]

[...]

Quoted 18 lines

board/compulab/cm_t35/eeprom.h line 16

Quoted 13 lines
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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Quoted 2 lines

Otherwise,

Acked-by Igor Grinberg<[email protected]>

Hmm.. I cannot see, that your patch is accepted ... but I looked in it, and it looks good to me. So, I propose to add this patch to the i2c tree, so I do the necessary changes in my patch when applying it to the i2c tree (as they are trivial changes) ...

@Tom: Is this OK for you?

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#3 lore raw

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

Quoted 53 lines · Heiko Schocher

Hello Igor,

Am 27.10.2013 08:30, schrieb Igor Grinberg:

Quoted 30 lines

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher<[email protected]>
Tested-by 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]>

[...]

[...]

Quoted 18 lines

board/compulab/cm_t35/eeprom.h line 16

Quoted 13 lines
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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Quoted 7 lines
Quoted 2 lines

Otherwise,

Acked-by Igor Grinberg<[email protected]>

Hmm.. I cannot see, that your patch is accepted ... but I looked in it, and it looks good to me. So, I propose to add this patch to the i2c tree, so I do the necessary changes in my patch when applying it to the i2c tree (as they are trivial changes) ...

Well, I have no problem with that, but we need to take into account that there are several more patches (unrelated to i2c) on the mailing list waiting for approval/apply and depend on my series.

Quoted 2 lines

@Tom: Is this OK for you?

I think, it would be better to apply my series to u-boot-ti and you can pull from it to the i2c tree?

Signature · 2 lines
Regards,
Igor.
author
#4 lore raw

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

Hello Igor,

Am 29.10.2013 12:07, schrieb Igor Grinberg:

Quoted 57 lines · Heiko Schocher
Quoted 56 lines

Hello Igor,

Am 27.10.2013 08:30, schrieb Igor Grinberg:

Quoted 30 lines

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher<[email protected]>
Tested-by 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]>

[...]

[...]

Quoted 20 lines

board/compulab/cm_t35/eeprom.h line 16

Quoted 13 lines
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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Otherwise,

Acked-by Igor Grinberg<[email protected]>
Quoted 8 lines
Quoted 4 lines

Hmm.. I cannot see, that your patch is accepted ... but I looked in it, and it looks good to me. So, I propose to add this patch to the i2c tree, so I do the necessary changes in my patch when applying it to the i2c tree (as they are trivial changes) ...

Well, I have no problem with that, but we need to take into account that there are several more patches (unrelated to i2c) on the mailing list waiting for approval/apply and depend on my series.

Ok.

Quoted 4 lines
Quoted 1 line

@Tom: Is this OK for you?

I think, it would be better to apply my series to u-boot-ti and you can pull from it to the i2c tree?

Hmm.. u-boot-i2c is based on u-boot.git not on u-boot-ti, and I did not want to change this. I can of course rebase my patch against u-boot-ti when Tom added your patch to u-boot-ti and resend it, and tom pick up my patch ...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author
#5 lore raw

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

Hello Tom,

Am 29.10.2013 12:30, schrieb Heiko Schocher:

Quoted 73 lines

Hello Igor,

Am 29.10.2013 12:07, schrieb Igor Grinberg:

Quoted 57 lines · Heiko Schocher
Quoted 56 lines

Hello Igor,

Am 27.10.2013 08:30, schrieb Igor Grinberg:

Quoted 30 lines

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher<[email protected]>
Tested-by 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]>

[...]

[...]

Quoted 20 lines

board/compulab/cm_t35/eeprom.h line 16

Quoted 13 lines
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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/
which should be applied any time soon.

Otherwise,

Acked-by Igor Grinberg<[email protected]>
Quoted 8 lines
Quoted 4 lines

Hmm.. I cannot see, that your patch is accepted ... but I looked in it, and it looks good to me. So, I propose to add this patch to the i2c tree, so I do the necessary changes in my patch when applying it to the i2c tree (as they are trivial changes) ...

Well, I have no problem with that, but we need to take into account that there are several more patches (unrelated to i2c) on the mailing list waiting for approval/apply and depend on my series.

Ok.

Quoted 2 lines
Quoted 1 line

@Tom: Is this OK for you?

Quoted 7 lines
Quoted 2 lines

I think, it would be better to apply my series to u-boot-ti and you can pull from it to the i2c tree?

Hmm.. u-boot-i2c is based on u-boot.git not on u-boot-ti, and I did not want to change this. I can of course rebase my patch against u-boot-ti when Tom added your patch to u-boot-ti and resend it, and tom pick up my patch ...

Tom, what do you think?

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#6 lore raw

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

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

Quoted 78 lines · Heiko Schocher

Hello Tom,

Am 29.10.2013 12:30, schrieb Heiko Schocher:

Quoted 75 lines

Hello Igor,

Am 29.10.2013 12:07, schrieb Igor Grinberg:

Quoted 60 lines · Heiko Schocher
Quoted 50 lines

Hello Igor,

Am 27.10.2013 08:30, schrieb Igor Grinberg:

Quoted 30 lines

Hi Heiko,

Quoted 25 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/

Signed-off-by Heiko Schocher<[email protected]> Tested-by: 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]>

[...]

[...]

Quoted 15 lines
Quoted 10 lines
(quoted diff) +0 -0

b/board/compulab/cm_t35/eeprom.h index 02ffbb1..a07559d 100644 --- a/board/compulab/cm_t35/eeprom.h +++ b/board/compulab/cm_t35/eeprom.h @@ -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

Please, rebase on top of:
http://patchwork.ozlabs.org/patch/275284/ which should be applied any time soon.

Quoted 8 lines
Quoted 2 lines

Otherwise, Acked-by: Igor
Grinberg<[email protected]>

Hmm.. I cannot see, that your patch is accepted ... but I looked in it, and it looks good to me. So, I propose to add this patch to the i2c tree, so I do the necessary changes in my patch when applying it to the i2c tree (as they are trivial changes) ...

Quoted 4 lines

Well, I have no problem with that, but we need to take into account that there are several more patches (unrelated to i2c) on the mailing list waiting for approval/apply and depend on my series.

Ok.

Quoted 4 lines
Quoted 1 line

@Tom: Is this OK for you?

I think, it would be better to apply my series to u-boot-ti and you can pull from it to the i2c tree?

Quoted 6 lines
Quoted 4 lines

Hmm.. u-boot-i2c is based on u-boot.git not on u-boot-ti, and I did not want to change this. I can of course rebase my patch against u-boot-ti when Tom added your patch to u-boot-ti and resend it, and tom pick up my patch ...

Tom, what do you think?

You should keep your tree based on u-boot/master. I actually grabbed Igor's patches Friday for u-boot-ti but didn't get a chance to send out replies to everything I picked up before packing it up for the weekend.

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

iQIcBAEBAgAGBQJSd6OQAAoJENk4IS6UOR1WQA8P/3vRW0UDmLNmKi9N4BpqqPsh ZBeO2zbsnsLcUvRO/aeQD92cTY1c4WljPj7rFcutWmOwODGzG1CGvDnlcSaV/ENG qjsn6mbM9zZm/HjNtP/bDPlvhVsKhbO42MMQL6jX+9F5ZdsQewQRAG0QhNTbejFo cswtmM4SIFax5xVR+LJzqrX0vMdnLf+4Qy5jBJ7j14f/WV0Z+qme7t92xFvQC1ts qSZkpSsGOC6ZhgdWkK2PXUh1mW+9jJ6senGIS0UV/87kDjv3iIl+CeD2eVxX+3wW 4kqL23HdR1wZnv7trS9Sn9p7oeJv6k8PJQaZoC9ZC/CFfypoA5D9L6FidWRjuOYB bRXFmflHMls8dMwyosHMsRaIlVto1caHXhPH+z3I3xAQl3e/Ax8y5JrEsh5OABKQ ZEo9aamL4YPuOklAHfd+Gtnn+kgbyzyKYRLrFljxT0g3lAi5UkFeYYRYLMnMOW23 ZQX6K998KYUsdJwi2caMnxmzrpmlTHZp+VfSxouzW+WACmYcJPfOPeUMMI8L29nR 89r7ODjkI93NrbS5pt8rWq3XXYwnVbBZHCBfu5cdw0ytOKedbaIduk4bjvU7HvAj XecI95It00ze7mhFwsvlSe3K/G2FlRIywjHQpXCDam3rOF7fDesCHbF6n6ByEfnQ WH6I+L3z1GeVYdAFBTRv
=96H9
-----END PGP SIGNATURE-----

#7 lore raw

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

In reply to Heiko Schocher
Quoted 26 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/

Signed-off-by Heiko Schocher <[email protected]>
Tested-by 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]>
Quoted 1 line

---

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
author
#8 lore raw

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

In reply to Heiko Schocher

Hello Heiko,

Am 22.10.2013 11:03, schrieb Heiko Schocher:

Quoted 19 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/

Signed-off-by Heiko Schocher<[email protected]>
Tested-by 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]>
Quoted 8 lines
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]>
Acked-by Igor Grinberg<[email protected]>
Acked-by Stefano Babic<[email protected]>

Applied to u-boot-i2c.git, after fixing some merge conflicts.

bye,
Heiko

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