public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem
@ 2013-09-15 19:09 Philippe Reynes
  2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Philippe Reynes @ 2013-09-15 19:09 UTC (permalink / raw)
  To: u-boot

This serie is composed of two patches:
- one to port the i2c mxc driver to new subsystem
- one to update all configurations with i2c mxc driver

This serie was tested with success on armadeus apf27.

Philippe Reynes (2):
  i2c: move to new subsystem
  i2c: update config using mxc driver to new subsystem

 README                            |    3 +
 arch/arm/cpu/armv7/mx5/clock.c    |    2 +-
 arch/arm/cpu/armv7/mx6/clock.c    |    2 +-
 arch/arm/imx-common/Makefile      |    2 +-
 drivers/i2c/Makefile              |    2 +-
 drivers/i2c/mxc_i2c.c             |  109 +++++++++++++++++--------------------
 include/configs/apf27.h           |    5 +-
 include/configs/flea3.h           |    6 +-
 include/configs/imx31_phycore.h   |    6 +-
 include/configs/m53evk.h          |    6 +-
 include/configs/mx25pdk.h         |    6 +-
 include/configs/mx35pdk.h         |    6 +-
 include/configs/mx53ard.h         |    6 +-
 include/configs/mx53evk.h         |    6 +-
 include/configs/mx53loco.h        |    6 +-
 include/configs/mx53smd.h         |    6 +-
 include/configs/mx6qsabreauto.h   |    3 +-
 include/configs/nitrogen6x.h      |    3 +-
 include/configs/titanium.h        |    3 +-
 include/configs/vf610twr.h        |    6 +-
 include/configs/woodburn_common.h |    6 +-
 21 files changed, 98 insertions(+), 102 deletions(-)

-- 
1.7.4.4

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] i2c: move to new subsystem
  2013-09-15 19:09 [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem Philippe Reynes
@ 2013-09-15 19:09 ` Philippe Reynes
  2013-09-15 21:12   ` Albert ARIBAUD
  2013-09-17  4:41   ` Heiko Schocher
  2013-09-15 19:09 ` [U-Boot] [PATCH 2/2] i2c: update config using mxc driver " Philippe Reynes
  2013-09-16 23:20 ` [U-Boot] [PATCH 0/2] i2c: port i2c " Eric Nelson
  2 siblings, 2 replies; 7+ messages in thread
From: Philippe Reynes @ 2013-09-15 19:09 UTC (permalink / raw)
  To: u-boot


Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
---
 README                         |    3 +
 arch/arm/cpu/armv7/mx5/clock.c |    2 +-
 arch/arm/cpu/armv7/mx6/clock.c |    2 +-
 arch/arm/imx-common/Makefile   |    2 +-
 drivers/i2c/Makefile           |    2 +-
 drivers/i2c/mxc_i2c.c          |  109 ++++++++++++++++++---------------------
 6 files changed, 57 insertions(+), 63 deletions(-)

diff --git a/README b/README
index 63706be..7c734ba 100644
--- a/README
+++ b/README
@@ -1995,6 +1995,9 @@ CBFS (Coreboot Filesystem) support
 		  - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
 		  - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
 
+		- drivers/i2c/i2c_mxc.c
+		 - activate this driver with CONFIG_SYS_I2C_MXC
+
 		additional defines:
 
 		CONFIG_SYS_NUM_I2C_BUSES
diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c
index 6bef254..fb3b128 100644
--- a/arch/arm/cpu/armv7/mx5/clock.c
+++ b/arch/arm/cpu/armv7/mx5/clock.c
@@ -94,7 +94,7 @@ void enable_usboh3_clk(bool enable)
 			MXC_CCM_CCGR2_USBOH3_60M(cg));
 }
 
-#ifdef CONFIG_I2C_MXC
+#ifdef CONFIG_SYS_I2C_MXC
 /* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
 int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
 {
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index 7efb0d2..8130827 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -48,7 +48,7 @@ void enable_usboh3_clk(unsigned char enable)
 
 }
 
-#ifdef CONFIG_I2C_MXC
+#ifdef CONFIG_SYS_I2C_MXC
 /* i2c_num can be from 0 - 2 */
 int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
 {
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 727a052..6c78dd9 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -16,7 +16,7 @@ COBJS-y	= iomux-v3.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
 COBJS-y	+= timer.o cpu.o speed.o
-COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o
+COBJS-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
 COBJS-y	+= misc.o
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 37ccbd1..f9fcebe 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -14,7 +14,7 @@ COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o
 COBJS-$(CONFIG_DW_I2C) += designware_i2c.o
 COBJS-$(CONFIG_I2C_MVTWSI) += mvtwsi.o
 COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
-COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
+COBJS-$(CONFIG_SYS_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
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 06ba4e3..3ac1865 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -153,21 +153,6 @@ static int bus_i2c_set_bus_speed(void *base, int speed)
 	return 0;
 }
 
-/*
- * Get I2C Speed
- */
-static unsigned int bus_i2c_get_bus_speed(void *base)
-{
-	struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base;
-	u8 clk_idx = readb(&i2c_regs->ifdr);
-	u8 clk_div;
-
-	for (clk_div = 0; i2c_clk_div[clk_div][1] != clk_idx; clk_div++)
-		;
-
-	return mxc_get_clock(MXC_I2C_CLK) / i2c_clk_div[clk_div][0];
-}
-
 #define ST_BUS_IDLE (0 | (I2SR_IBB << 8))
 #define ST_BUS_BUSY (I2SR_IBB | (I2SR_IBB << 8))
 #define ST_IIF (I2SR_IIF | (I2SR_IIF << 8))
@@ -410,20 +395,30 @@ struct sram_data {
  */
 static struct sram_data __attribute__((section(".data"))) srdata;
 
-void *get_base(void)
-{
-#ifdef CONFIG_SYS_I2C_BASE
-#ifdef CONFIG_I2C_MULTI_BUS
-	void *ret = srdata.i2c_data[srdata.curr_i2c_bus].base;
-	if (ret)
-		return ret;
-#endif
-	return (void *)CONFIG_SYS_I2C_BASE;
-#elif defined(CONFIG_I2C_MULTI_BUS)
-	return srdata.i2c_data[srdata.curr_i2c_bus].base;
+static void * const i2c_bases[] = {
+#if defined(CONFIG_MX25)
+	(void *)IMX_I2C_BASE,
+	(void *)IMX_I2C2_BASE,
+	(void *)IMX_I2C3_BASE
+#elif defined(CONFIG_MX27)
+	(void *)IMX_I2C1_BASE,
+	(void *)IMX_I2C2_BASE
+#elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
+	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||	\
+	defined(CONFIG_MX6)
+	(void *)I2C1_BASE_ADDR,
+	(void *)I2C2_BASE_ADDR,
+	(void *)I2C3_BASE_ADDR
+#elif defined(CONFIG_VF610)
+	(void *)I2C0_BASE_ADDR
 #else
-	return srdata.i2c_data[0].base;
+#error "architecture not supported"
 #endif
+};
+
+void *i2c_get_base(struct i2c_adapter *adap)
+{
+	return i2c_bases[adap->hwadapnr];
 }
 
 static struct i2c_parms *i2c_get_parms(void *base)
@@ -448,39 +443,26 @@ static int i2c_idle_bus(void *base)
 	return 0;
 }
 
-#ifdef CONFIG_I2C_MULTI_BUS
-unsigned int i2c_get_bus_num(void)
+int mxc_i2c_read(struct i2c_adapter *adap, uint8_t chip,
+				uint addr, int alen, uint8_t *buffer,
+				int len)
 {
-	return srdata.curr_i2c_bus;
+	return bus_i2c_read(i2c_get_base(adap), chip, addr, alen, buffer, len);
 }
 
-int i2c_set_bus_num(unsigned bus_idx)
-{
-	if (bus_idx >= ARRAY_SIZE(srdata.i2c_data))
-		return -1;
-	if (!srdata.i2c_data[bus_idx].base)
-		return -1;
-	srdata.curr_i2c_bus = bus_idx;
-	return 0;
-}
-#endif
-
-int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
+int mxc_i2c_write(struct i2c_adapter *adap, uint8_t chip,
+				uint addr, int alen, uint8_t *buffer,
+				int len)
 {
-	return bus_i2c_read(get_base(), chip, addr, alen, buf, len);
-}
-
-int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
-{
-	return bus_i2c_write(get_base(), chip, addr, alen, buf, len);
+	return bus_i2c_write(i2c_get_base(adap), chip, addr, alen, buffer, len);
 }
 
 /*
  * Test if a chip at a given address responds (probe the chip)
  */
-int i2c_probe(uchar chip)
+int mxc_i2c_probe(struct i2c_adapter *adap, uint8_t chip)
 {
-	return bus_i2c_write(get_base(), chip, 0, 0, NULL, 0);
+	return bus_i2c_write(i2c_get_base(adap), chip, 0, 0, NULL, 0);
 }
 
 void bus_i2c_init(void *base, int speed, int unused,
@@ -510,23 +492,32 @@ void bus_i2c_init(void *base, int speed, int unused,
 /*
  * Init I2C Bus
  */
-void i2c_init(int speed, int unused)
+void mxc_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)
 {
-	bus_i2c_init(get_base(), speed, unused, NULL, NULL);
+	bus_i2c_init(i2c_get_base(adap), speed, slaveaddr, NULL, NULL);
 }
 
 /*
  * Set I2C Speed
  */
-int i2c_set_bus_speed(unsigned int speed)
+uint mxc_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed)
 {
-	return bus_i2c_set_bus_speed(get_base(), speed);
+	return bus_i2c_set_bus_speed(i2c_get_base(adap), speed);
 }
 
 /*
- * Get I2C Speed
+ * Register mxc i2c adapters
  */
-unsigned int i2c_get_bus_speed(void)
-{
-	return bus_i2c_get_bus_speed(get_base());
-}
+U_BOOT_I2C_ADAP_COMPLETE(mxc0, mxc_i2c_init, mxc_i2c_probe,
+			 mxc_i2c_read, mxc_i2c_write,
+			 mxc_i2c_set_bus_speed, 100000, 0, 0)
+U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+			 mxc_i2c_read, mxc_i2c_write,
+			 mxc_i2c_set_bus_speed, 100000, 0, 1)
+#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
+	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||\
+	defined(CONFIG_MX6)
+U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
+			 mxc_i2c_read, mxc_i2c_write,
+			 mxc_i2c_set_bus_speed, 100000, 0, 2)
+#endif
-- 
1.7.4.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] i2c: update config using mxc driver to new subsystem
  2013-09-15 19:09 [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem Philippe Reynes
  2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
@ 2013-09-15 19:09 ` Philippe Reynes
  2013-09-17  4:51   ` Heiko Schocher
  2013-09-16 23:20 ` [U-Boot] [PATCH 0/2] i2c: port i2c " Eric Nelson
  2 siblings, 1 reply; 7+ messages in thread
From: Philippe Reynes @ 2013-09-15 19:09 UTC (permalink / raw)
  To: u-boot


Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
---
 include/configs/apf27.h           |    5 ++---
 include/configs/flea3.h           |    6 +++---
 include/configs/imx31_phycore.h   |    6 +++---
 include/configs/m53evk.h          |    6 +++---
 include/configs/mx25pdk.h         |    6 +++---
 include/configs/mx35pdk.h         |    6 +++---
 include/configs/mx53ard.h         |    6 +++---
 include/configs/mx53evk.h         |    6 +++---
 include/configs/mx53loco.h        |    6 +++---
 include/configs/mx53smd.h         |    6 +++---
 include/configs/mx6qsabreauto.h   |    3 ++-
 include/configs/nitrogen6x.h      |    3 ++-
 include/configs/titanium.h        |    3 ++-
 include/configs/vf610twr.h        |    6 +++---
 include/configs/woodburn_common.h |    6 +++---
 15 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index e7e258f..7e0a8a8 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -321,9 +321,8 @@
  */
 
 #ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		IMX_I2C1_BASE
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 #define CONFIG_SYS_I2C_NOPROBES		{ }
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index cfcaf1b..d91fdab 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -50,9 +50,9 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C3_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		2
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_I2C_SLAVE		0xfe
 #define CONFIG_MXC_SPI
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 720e1bf..bf1a2cb 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -35,9 +35,9 @@
  * Hardware drivers
  */
 
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		1
 #define CONFIG_SYS_I2C_CLK_OFFSET	I2C2_CLK_OFFSET
 #define CONFIG_SYS_I2C_SPEED		100000
 
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index ccb07e3..4e06537 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -161,9 +161,9 @@
  * I2C
  */
 #ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		1
 #define CONFIG_SYS_I2C_SPEED		100000
 #endif
 
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 543c415..22fb31b 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -111,9 +111,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		IMX_I2C_BASE
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* RTC */
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 68b225a..f9387a3 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -41,9 +41,9 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 122ffd0..e74fc5a 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -44,9 +44,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		1
 #define CONFIG_SYS_I2C_SPEED            100000
 
 /* MMC Configs */
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index d39ce7b..c7582f9 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -37,9 +37,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		1
 #define CONFIG_SYS_I2C_SPEED            100000
 
 /* PMIC Configs */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 7237da5..acac6e8 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -71,9 +71,9 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* I2C Configs */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* PMIC Controller */
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 7e4e1c9..d13e02c 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -34,9 +34,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		1
 #define CONFIG_SYS_I2C_SPEED            100000
 
 /* MMC Configs */
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 5530fc6..505b7aa 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -36,8 +36,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
 #endif                         /* __MX6QSABREAUTO_CONFIG_H */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 3454b86..e975401 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -51,9 +51,10 @@
 #endif
 
 /* I2C Configs */
+#define CONFIG_SYS_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* OCOTP Configs */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 077e25e..86c27b3 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -40,9 +40,10 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /* I2C Configs */
+#define CONFIG_SYS_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* MMC Configs */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 5a7a066..2f3c57f 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -70,9 +70,9 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C0_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_SYS_I2C_SPEED		100000
 
 #define CONFIG_BOOTDELAY		3
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 6b7e81f..de4e3cc 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -45,9 +45,9 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM		0
 #define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO
-- 
1.7.4.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] i2c: move to new subsystem
  2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
@ 2013-09-15 21:12   ` Albert ARIBAUD
  2013-09-17  4:41   ` Heiko Schocher
  1 sibling, 0 replies; 7+ messages in thread
From: Albert ARIBAUD @ 2013-09-15 21:12 UTC (permalink / raw)
  To: u-boot

Hi Philippe,

On Sun, 15 Sep 2013 21:09:41 +0200, Philippe Reynes <tremyfr@yahoo.fr>
wrote:

> 
> Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
> ---
>  README                         |    3 +
>  arch/arm/cpu/armv7/mx5/clock.c |    2 +-
>  arch/arm/cpu/armv7/mx6/clock.c |    2 +-
>  arch/arm/imx-common/Makefile   |    2 +-
>  drivers/i2c/Makefile           |    2 +-
>  drivers/i2c/mxc_i2c.c          |  109 ++++++++++++++++++---------------------
>  6 files changed, 57 insertions(+), 63 deletions(-)
> 
> diff --git a/README b/README
> index 63706be..7c734ba 100644
> --- a/README
> +++ b/README
> @@ -1995,6 +1995,9 @@ CBFS (Coreboot Filesystem) support
>  		  - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
>  		  - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
>  
> +		- drivers/i2c/i2c_mxc.c
> +		 - activate this driver with CONFIG_SYS_I2C_MXC
> +
>  		additional defines:
>  
>  		CONFIG_SYS_NUM_I2C_BUSES
> diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c
> index 6bef254..fb3b128 100644
> --- a/arch/arm/cpu/armv7/mx5/clock.c
> +++ b/arch/arm/cpu/armv7/mx5/clock.c
> @@ -94,7 +94,7 @@ void enable_usboh3_clk(bool enable)
>  			MXC_CCM_CCGR2_USBOH3_60M(cg));
>  }
>  
> -#ifdef CONFIG_I2C_MXC
> +#ifdef CONFIG_SYS_I2C_MXC
>  /* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
>  int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
>  {
> diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
> index 7efb0d2..8130827 100644
> --- a/arch/arm/cpu/armv7/mx6/clock.c
> +++ b/arch/arm/cpu/armv7/mx6/clock.c
> @@ -48,7 +48,7 @@ void enable_usboh3_clk(unsigned char enable)
>  
>  }
>  
> -#ifdef CONFIG_I2C_MXC
> +#ifdef CONFIG_SYS_I2C_MXC
>  /* i2c_num can be from 0 - 2 */
>  int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
>  {
> diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
> index 727a052..6c78dd9 100644
> --- a/arch/arm/imx-common/Makefile
> +++ b/arch/arm/imx-common/Makefile
> @@ -16,7 +16,7 @@ COBJS-y	= iomux-v3.o
>  endif
>  ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
>  COBJS-y	+= timer.o cpu.o speed.o
> -COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o
> +COBJS-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
>  endif
>  ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
>  COBJS-y	+= misc.o
> diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> index 37ccbd1..f9fcebe 100644
> --- a/drivers/i2c/Makefile
> +++ b/drivers/i2c/Makefile
> @@ -14,7 +14,7 @@ COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o
>  COBJS-$(CONFIG_DW_I2C) += designware_i2c.o
>  COBJS-$(CONFIG_I2C_MVTWSI) += mvtwsi.o
>  COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
> -COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
> +COBJS-$(CONFIG_SYS_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
> diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
> index 06ba4e3..3ac1865 100644
> --- a/drivers/i2c/mxc_i2c.c
> +++ b/drivers/i2c/mxc_i2c.c
> @@ -153,21 +153,6 @@ static int bus_i2c_set_bus_speed(void *base, int speed)
>  	return 0;
>  }
>  
> -/*
> - * Get I2C Speed
> - */
> -static unsigned int bus_i2c_get_bus_speed(void *base)
> -{
> -	struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base;
> -	u8 clk_idx = readb(&i2c_regs->ifdr);
> -	u8 clk_div;
> -
> -	for (clk_div = 0; i2c_clk_div[clk_div][1] != clk_idx; clk_div++)
> -		;
> -
> -	return mxc_get_clock(MXC_I2C_CLK) / i2c_clk_div[clk_div][0];
> -}
> -
>  #define ST_BUS_IDLE (0 | (I2SR_IBB << 8))
>  #define ST_BUS_BUSY (I2SR_IBB | (I2SR_IBB << 8))
>  #define ST_IIF (I2SR_IIF | (I2SR_IIF << 8))
> @@ -410,20 +395,30 @@ struct sram_data {
>   */
>  static struct sram_data __attribute__((section(".data"))) srdata;
>  
> -void *get_base(void)
> -{
> -#ifdef CONFIG_SYS_I2C_BASE
> -#ifdef CONFIG_I2C_MULTI_BUS
> -	void *ret = srdata.i2c_data[srdata.curr_i2c_bus].base;
> -	if (ret)
> -		return ret;
> -#endif
> -	return (void *)CONFIG_SYS_I2C_BASE;
> -#elif defined(CONFIG_I2C_MULTI_BUS)
> -	return srdata.i2c_data[srdata.curr_i2c_bus].base;
> +static void * const i2c_bases[] = {
> +#if defined(CONFIG_MX25)
> +	(void *)IMX_I2C_BASE,
> +	(void *)IMX_I2C2_BASE,
> +	(void *)IMX_I2C3_BASE
> +#elif defined(CONFIG_MX27)
> +	(void *)IMX_I2C1_BASE,
> +	(void *)IMX_I2C2_BASE
> +#elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
> +	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||	\
> +	defined(CONFIG_MX6)
> +	(void *)I2C1_BASE_ADDR,
> +	(void *)I2C2_BASE_ADDR,
> +	(void *)I2C3_BASE_ADDR
> +#elif defined(CONFIG_VF610)
> +	(void *)I2C0_BASE_ADDR
>  #else
> -	return srdata.i2c_data[0].base;
> +#error "architecture not supported"
>  #endif
> +};
> +
> +void *i2c_get_base(struct i2c_adapter *adap)
> +{
> +	return i2c_bases[adap->hwadapnr];
>  }
>  
>  static struct i2c_parms *i2c_get_parms(void *base)
> @@ -448,39 +443,26 @@ static int i2c_idle_bus(void *base)
>  	return 0;
>  }
>  
> -#ifdef CONFIG_I2C_MULTI_BUS
> -unsigned int i2c_get_bus_num(void)
> +int mxc_i2c_read(struct i2c_adapter *adap, uint8_t chip,
> +				uint addr, int alen, uint8_t *buffer,
> +				int len)
>  {
> -	return srdata.curr_i2c_bus;
> +	return bus_i2c_read(i2c_get_base(adap), chip, addr, alen, buffer, len);
>  }
>  
> -int i2c_set_bus_num(unsigned bus_idx)
> -{
> -	if (bus_idx >= ARRAY_SIZE(srdata.i2c_data))
> -		return -1;
> -	if (!srdata.i2c_data[bus_idx].base)
> -		return -1;
> -	srdata.curr_i2c_bus = bus_idx;
> -	return 0;
> -}
> -#endif
> -
> -int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
> +int mxc_i2c_write(struct i2c_adapter *adap, uint8_t chip,
> +				uint addr, int alen, uint8_t *buffer,
> +				int len)
>  {
> -	return bus_i2c_read(get_base(), chip, addr, alen, buf, len);
> -}
> -
> -int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
> -{
> -	return bus_i2c_write(get_base(), chip, addr, alen, buf, len);
> +	return bus_i2c_write(i2c_get_base(adap), chip, addr, alen, buffer, len);
>  }
>  
>  /*
>   * Test if a chip at a given address responds (probe the chip)
>   */
> -int i2c_probe(uchar chip)
> +int mxc_i2c_probe(struct i2c_adapter *adap, uint8_t chip)
>  {
> -	return bus_i2c_write(get_base(), chip, 0, 0, NULL, 0);
> +	return bus_i2c_write(i2c_get_base(adap), chip, 0, 0, NULL, 0);
>  }
>  
>  void bus_i2c_init(void *base, int speed, int unused,
> @@ -510,23 +492,32 @@ void bus_i2c_init(void *base, int speed, int unused,
>  /*
>   * Init I2C Bus
>   */
> -void i2c_init(int speed, int unused)
> +void mxc_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)
>  {
> -	bus_i2c_init(get_base(), speed, unused, NULL, NULL);
> +	bus_i2c_init(i2c_get_base(adap), speed, slaveaddr, NULL, NULL);
>  }
>  
>  /*
>   * Set I2C Speed
>   */
> -int i2c_set_bus_speed(unsigned int speed)
> +uint mxc_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed)
>  {
> -	return bus_i2c_set_bus_speed(get_base(), speed);
> +	return bus_i2c_set_bus_speed(i2c_get_base(adap), speed);
>  }
>  
>  /*
> - * Get I2C Speed
> + * Register mxc i2c adapters
>   */
> -unsigned int i2c_get_bus_speed(void)
> -{
> -	return bus_i2c_get_bus_speed(get_base());
> -}
> +U_BOOT_I2C_ADAP_COMPLETE(mxc0, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 0)
> +U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 1)
> +#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
> +	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||\
> +	defined(CONFIG_MX6)
> +U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 2)
> +#endif

Patch subject seems to imply that the whole of I2C moves to some new
subsystem. If I understand, only mxc moves. I guess "mxc" should appear
somewhere in the patch subject.

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem
  2013-09-15 19:09 [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem Philippe Reynes
  2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
  2013-09-15 19:09 ` [U-Boot] [PATCH 2/2] i2c: update config using mxc driver " Philippe Reynes
@ 2013-09-16 23:20 ` Eric Nelson
  2 siblings, 0 replies; 7+ messages in thread
From: Eric Nelson @ 2013-09-16 23:20 UTC (permalink / raw)
  To: u-boot

On 09/15/2013 12:09 PM, Philippe Reynes wrote:
> This serie is composed of two patches:
> - one to port the i2c mxc driver to new subsystem
> - one to update all configurations with i2c mxc driver
>
> This serie was tested with success on armadeus apf27.
>
> Philippe Reynes (2):
>    i2c: move to new subsystem
>    i2c: update config using mxc driver to new subsystem
>
>   README                            |    3 +
>   arch/arm/cpu/armv7/mx5/clock.c    |    2 +-
>   arch/arm/cpu/armv7/mx6/clock.c    |    2 +-
>   arch/arm/imx-common/Makefile      |    2 +-
>   drivers/i2c/Makefile              |    2 +-
>   drivers/i2c/mxc_i2c.c             |  109 +++++++++++++++++--------------------
>   include/configs/apf27.h           |    5 +-
>   include/configs/flea3.h           |    6 +-
>   include/configs/imx31_phycore.h   |    6 +-
>   include/configs/m53evk.h          |    6 +-
>   include/configs/mx25pdk.h         |    6 +-
>   include/configs/mx35pdk.h         |    6 +-
>   include/configs/mx53ard.h         |    6 +-
>   include/configs/mx53evk.h         |    6 +-
>   include/configs/mx53loco.h        |    6 +-
>   include/configs/mx53smd.h         |    6 +-
>   include/configs/mx6qsabreauto.h   |    3 +-
>   include/configs/nitrogen6x.h      |    3 +-
>   include/configs/titanium.h        |    3 +-
>   include/configs/vf610twr.h        |    6 +-
>   include/configs/woodburn_common.h |    6 +-
>   21 files changed, 98 insertions(+), 102 deletions(-)
>

Tested-by: Eric Nelson <eric.nelson@boundarydevices.com>

Tested on i.MX6Q (nitrogen6q) and i.MX6S (nitrogen6s) against
I2C busses 0-2 and a variety of devices (HDMI, touch controllers).

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] i2c: move to new subsystem
  2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
  2013-09-15 21:12   ` Albert ARIBAUD
@ 2013-09-17  4:41   ` Heiko Schocher
  1 sibling, 0 replies; 7+ messages in thread
From: Heiko Schocher @ 2013-09-17  4:41 UTC (permalink / raw)
  To: u-boot

Hello Philippe,

added stefano babic, as he is the imx custodian, to cc

Am 15.09.2013 21:09, schrieb Philippe Reynes:
> Signed-off-by: Philippe Reynes<tremyfr@yahoo.fr>
> ---
>   README                         |    3 +
>   arch/arm/cpu/armv7/mx5/clock.c |    2 +-
>   arch/arm/cpu/armv7/mx6/clock.c |    2 +-
>   arch/arm/imx-common/Makefile   |    2 +-
>   drivers/i2c/Makefile           |    2 +-
>   drivers/i2c/mxc_i2c.c          |  109 ++++++++++++++++++---------------------
>   6 files changed, 57 insertions(+), 63 deletions(-)

First, thanks for this work!

Could you please change your subject in something like

"i2c, mxc: switch to new multibus/multiadapter framework" ?

> diff --git a/README b/README
> index 63706be..7c734ba 100644
> --- a/README
> +++ b/README
> @@ -1995,6 +1995,9 @@ CBFS (Coreboot Filesystem) support
>   		  - CONFIG_SYS_I2C_PPC4XX_CH0 activate hardware channel 0
>   		  - CONFIG_SYS_I2C_PPC4XX_CH1 activate hardware channel 1
>
> +		- drivers/i2c/i2c_mxc.c
> +		 - activate this driver with CONFIG_SYS_I2C_MXC
> +

You should use some new defines for the speed setting ... did you?
If not please add them, thanks.

>   		additional defines:
>
>   		CONFIG_SYS_NUM_I2C_BUSES
[...]
> diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> index 37ccbd1..f9fcebe 100644
> --- a/drivers/i2c/Makefile
> +++ b/drivers/i2c/Makefile
> @@ -14,7 +14,7 @@ COBJS-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o
>   COBJS-$(CONFIG_DW_I2C) += designware_i2c.o
>   COBJS-$(CONFIG_I2C_MVTWSI) += mvtwsi.o
>   COBJS-$(CONFIG_I2C_MV) += mv_i2c.o
> -COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o
> +COBJS-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o

Please keep this list sorted.

>   COBJS-$(CONFIG_I2C_MXS) += mxs_i2c.o
>   COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
>   COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
> diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
> index 06ba4e3..3ac1865 100644
> --- a/drivers/i2c/mxc_i2c.c
> +++ b/drivers/i2c/mxc_i2c.c
> @@ -153,21 +153,6 @@ static int bus_i2c_set_bus_speed(void *base, int speed)
>   	return 0;
>   }
>
> -/*
> - * Get I2C Speed
> - */
> -static unsigned int bus_i2c_get_bus_speed(void *base)
> -{
> -	struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)base;
> -	u8 clk_idx = readb(&i2c_regs->ifdr);
> -	u8 clk_div;
> -
> -	for (clk_div = 0; i2c_clk_div[clk_div][1] != clk_idx; clk_div++)
> -		;
> -
> -	return mxc_get_clock(MXC_I2C_CLK) / i2c_clk_div[clk_div][0];
> -}
> -
>   #define ST_BUS_IDLE (0 | (I2SR_IBB<<  8))
>   #define ST_BUS_BUSY (I2SR_IBB | (I2SR_IBB<<  8))
>   #define ST_IIF (I2SR_IIF | (I2SR_IIF<<  8))
> @@ -410,20 +395,30 @@ struct sram_data {
>    */
>   static struct sram_data __attribute__((section(".data"))) srdata;
>
> -void *get_base(void)
> -{
> -#ifdef CONFIG_SYS_I2C_BASE
> -#ifdef CONFIG_I2C_MULTI_BUS
> -	void *ret = srdata.i2c_data[srdata.curr_i2c_bus].base;
> -	if (ret)
> -		return ret;
> -#endif
> -	return (void *)CONFIG_SYS_I2C_BASE;
> -#elif defined(CONFIG_I2C_MULTI_BUS)
> -	return srdata.i2c_data[srdata.curr_i2c_bus].base;
> +static void * const i2c_bases[] = {
> +#if defined(CONFIG_MX25)
> +	(void *)IMX_I2C_BASE,
> +	(void *)IMX_I2C2_BASE,
> +	(void *)IMX_I2C3_BASE
> +#elif defined(CONFIG_MX27)
> +	(void *)IMX_I2C1_BASE,
> +	(void *)IMX_I2C2_BASE
> +#elif defined(CONFIG_MX31) || defined(CONFIG_MX35) || \
> +	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||	\
> +	defined(CONFIG_MX6)
> +	(void *)I2C1_BASE_ADDR,
> +	(void *)I2C2_BASE_ADDR,
> +	(void *)I2C3_BASE_ADDR
> +#elif defined(CONFIG_VF610)
> +	(void *)I2C0_BASE_ADDR
>   #else
> -	return srdata.i2c_data[0].base;
> +#error "architecture not supported"
>   #endif
> +};
> +
> +void *i2c_get_base(struct i2c_adapter *adap)
> +{
> +	return i2c_bases[adap->hwadapnr];
>   }
>
>   static struct i2c_parms *i2c_get_parms(void *base)
> @@ -448,39 +443,26 @@ static int i2c_idle_bus(void *base)
>   	return 0;
>   }
>
> -#ifdef CONFIG_I2C_MULTI_BUS
> -unsigned int i2c_get_bus_num(void)
> +int mxc_i2c_read(struct i2c_adapter *adap, uint8_t chip,

static now

> +				uint addr, int alen, uint8_t *buffer,
> +				int len)
>   {
> -	return srdata.curr_i2c_bus;
> +	return bus_i2c_read(i2c_get_base(adap), chip, addr, alen, buffer, len);
>   }
>
> -int i2c_set_bus_num(unsigned bus_idx)
> -{
> -	if (bus_idx>= ARRAY_SIZE(srdata.i2c_data))
> -		return -1;
> -	if (!srdata.i2c_data[bus_idx].base)
> -		return -1;
> -	srdata.curr_i2c_bus = bus_idx;
> -	return 0;
> -}
> -#endif
> -
> -int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
> +int mxc_i2c_write(struct i2c_adapter *adap, uint8_t chip,

static now

> +				uint addr, int alen, uint8_t *buffer,
> +				int len)
>   {
> -	return bus_i2c_read(get_base(), chip, addr, alen, buf, len);
> -}
> -
> -int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
> -{
> -	return bus_i2c_write(get_base(), chip, addr, alen, buf, len);
> +	return bus_i2c_write(i2c_get_base(adap), chip, addr, alen, buffer, len);
>   }
>
>   /*
>    * Test if a chip at a given address responds (probe the chip)
>    */
> -int i2c_probe(uchar chip)
> +int mxc_i2c_probe(struct i2c_adapter *adap, uint8_t chip)

static now

>   {
> -	return bus_i2c_write(get_base(), chip, 0, 0, NULL, 0);
> +	return bus_i2c_write(i2c_get_base(adap), chip, 0, 0, NULL, 0);
>   }
>
>   void bus_i2c_init(void *base, int speed, int unused,
> @@ -510,23 +492,32 @@ void bus_i2c_init(void *base, int speed, int unused,
>   /*
>    * Init I2C Bus
>    */
> -void i2c_init(int speed, int unused)
> +void mxc_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)

static now

>   {
> -	bus_i2c_init(get_base(), speed, unused, NULL, NULL);
> +	bus_i2c_init(i2c_get_base(adap), speed, slaveaddr, NULL, NULL);
>   }
>
>   /*
>    * Set I2C Speed
>    */
> -int i2c_set_bus_speed(unsigned int speed)
> +uint mxc_i2c_set_bus_speed(struct i2c_adapter *adap, uint speed)

static now

>   {
> -	return bus_i2c_set_bus_speed(get_base(), speed);
> +	return bus_i2c_set_bus_speed(i2c_get_base(adap), speed);
>   }
>
>   /*
> - * Get I2C Speed
> + * Register mxc i2c adapters
>    */
> -unsigned int i2c_get_bus_speed(void)
> -{
> -	return bus_i2c_get_bus_speed(get_base());
> -}
> +U_BOOT_I2C_ADAP_COMPLETE(mxc0, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 0)
                                                 ^
shouldn;t we do this here configurable? Or is the speed and slave
setting for all imx boards the same?

> +U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 1)
> +#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
> +	defined(CONFIG_MX51) || defined(CONFIG_MX53) ||\
> +	defined(CONFIG_MX6)
> +U_BOOT_I2C_ADAP_COMPLETE(mxc2, mxc_i2c_init, mxc_i2c_probe,
> +			 mxc_i2c_read, mxc_i2c_write,
> +			 mxc_i2c_set_bus_speed, 100000, 0, 2)
> +#endif

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] i2c: update config using mxc driver to new subsystem
  2013-09-15 19:09 ` [U-Boot] [PATCH 2/2] i2c: update config using mxc driver " Philippe Reynes
@ 2013-09-17  4:51   ` Heiko Schocher
  0 siblings, 0 replies; 7+ messages in thread
From: Heiko Schocher @ 2013-09-17  4:51 UTC (permalink / raw)
  To: u-boot

Hello Phillipe,

added Stefano Babic to cc

Am 15.09.2013 21:09, schrieb Philippe Reynes:
> Signed-off-by: Philippe Reynes<tremyfr@yahoo.fr>
> ---
>   include/configs/apf27.h           |    5 ++---
>   include/configs/flea3.h           |    6 +++---
>   include/configs/imx31_phycore.h   |    6 +++---
>   include/configs/m53evk.h          |    6 +++---
>   include/configs/mx25pdk.h         |    6 +++---
>   include/configs/mx35pdk.h         |    6 +++---
>   include/configs/mx53ard.h         |    6 +++---
>   include/configs/mx53evk.h         |    6 +++---
>   include/configs/mx53loco.h        |    6 +++---
>   include/configs/mx53smd.h         |    6 +++---
>   include/configs/mx6qsabreauto.h   |    3 ++-
>   include/configs/nitrogen6x.h      |    3 ++-
>   include/configs/titanium.h        |    3 ++-
>   include/configs/vf610twr.h        |    6 +++---
>   include/configs/woodburn_common.h |    6 +++---
>   15 files changed, 41 insertions(+), 39 deletions(-)
>
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index e7e258f..7e0a8a8 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -321,9 +321,8 @@
>    */
>
>   #ifdef CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		IMX_I2C1_BASE
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
>   #define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
>   #define CONFIG_SYS_I2C_SLAVE		0x7F
>   #define CONFIG_SYS_I2C_NOPROBES		{ }
> diff --git a/include/configs/flea3.h b/include/configs/flea3.h
> index cfcaf1b..d91fdab 100644
> --- a/include/configs/flea3.h
> +++ b/include/configs/flea3.h
> @@ -50,9 +50,9 @@
>   /*
>    * Hardware drivers
>    */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C3_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		2
>   #define CONFIG_SYS_I2C_SPEED		100000
>   #define CONFIG_SYS_I2C_SLAVE		0xfe

Ah, here we have a different slave address as before -> we need this settings
configurable. Speed setting is equal for all boards, so we need only the slave
addr configurable at the moment.

>   #define CONFIG_MXC_SPI
> diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
> index 720e1bf..bf1a2cb 100644
> --- a/include/configs/imx31_phycore.h
> +++ b/include/configs/imx31_phycore.h
> @@ -35,9 +35,9 @@
>    * Hardware drivers
>    */
>
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		1
>   #define CONFIG_SYS_I2C_CLK_OFFSET	I2C2_CLK_OFFSET
>   #define CONFIG_SYS_I2C_SPEED		100000
>
> diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
> index ccb07e3..4e06537 100644
> --- a/include/configs/m53evk.h
> +++ b/include/configs/m53evk.h
> @@ -161,9 +161,9 @@
>    * I2C
>    */
>   #ifdef CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		1
>   #define CONFIG_SYS_I2C_SPEED		100000
>   #endif
>
> diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
> index 543c415..22fb31b 100644
> --- a/include/configs/mx25pdk.h
> +++ b/include/configs/mx25pdk.h
> @@ -111,9 +111,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		IMX_I2C_BASE
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		0
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   /* RTC */
> diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
> index 68b225a..f9387a3 100644
> --- a/include/configs/mx35pdk.h
> +++ b/include/configs/mx35pdk.h
> @@ -41,9 +41,9 @@
>   /*
>    * Hardware drivers
>    */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		0
>   #define CONFIG_SYS_I2C_SPEED		100000
>   #define CONFIG_MXC_SPI
>   #define CONFIG_MXC_GPIO
> diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
> index 122ffd0..e74fc5a 100644
> --- a/include/configs/mx53ard.h
> +++ b/include/configs/mx53ard.h
> @@ -44,9 +44,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		1
>   #define CONFIG_SYS_I2C_SPEED            100000
>
>   /* MMC Configs */
> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
> index d39ce7b..c7582f9 100644
> --- a/include/configs/mx53evk.h
> +++ b/include/configs/mx53evk.h
> @@ -37,9 +37,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		1
>   #define CONFIG_SYS_I2C_SPEED            100000
>
>   /* PMIC Configs */
> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
> index 7237da5..acac6e8 100644
> --- a/include/configs/mx53loco.h
> +++ b/include/configs/mx53loco.h
> @@ -71,9 +71,9 @@
>   #define CONFIG_MXC_USB_FLAGS	0
>
>   /* I2C Configs */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		0
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   /* PMIC Controller */
> diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
> index 7e4e1c9..d13e02c 100644
> --- a/include/configs/mx53smd.h
> +++ b/include/configs/mx53smd.h
> @@ -34,9 +34,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C2_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		1
>   #define CONFIG_SYS_I2C_SPEED            100000
>
>   /* MMC Configs */
> diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
> index 5530fc6..505b7aa 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -36,8 +36,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> +#define CONFIG_SYS_I2C
>   #define CONFIG_I2C_MULTI_BUS

This define is no longer needed. Please delete this line.

> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   #endif                         /* __MX6QSABREAUTO_CONFIG_H */
> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
> index 3454b86..e975401 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -51,9 +51,10 @@
>   #endif
>
>   /* I2C Configs */
> +#define CONFIG_SYS_I2C
>   #define CONFIG_CMD_I2C
>   #define CONFIG_I2C_MULTI_BUS

This define is no longer needed. Please delete this line, and all other.

> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   /* OCOTP Configs */
> diff --git a/include/configs/titanium.h b/include/configs/titanium.h
> index 077e25e..86c27b3 100644
> --- a/include/configs/titanium.h
> +++ b/include/configs/titanium.h
> @@ -40,9 +40,10 @@
>   #define CONFIG_MXC_UART_BASE		UART1_BASE
>
>   /* I2C Configs */
> +#define CONFIG_SYS_I2C
>   #define CONFIG_CMD_I2C
>   #define CONFIG_I2C_MULTI_BUS
> -#define CONFIG_I2C_MXC
> +#define CONFIG_SYS_I2C_MXC
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   /* MMC Configs */
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index 5a7a066..2f3c57f 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -70,9 +70,9 @@
>
>   /* I2C Configs */
>   #define CONFIG_CMD_I2C
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C0_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		0
>   #define CONFIG_SYS_I2C_SPEED		100000
>
>   #define CONFIG_BOOTDELAY		3
> diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
> index 6b7e81f..de4e3cc 100644
> --- a/include/configs/woodburn_common.h
> +++ b/include/configs/woodburn_common.h
> @@ -45,9 +45,9 @@
>   /*
>    * Hardware drivers
>    */
> -#define CONFIG_HARD_I2C
> -#define CONFIG_I2C_MXC
> -#define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_MXC
> +#define CONFIG_SYS_SPD_BUS_NUM		0
>   #define CONFIG_SYS_I2C_SPEED		100000
>   #define CONFIG_MXC_SPI
>   #define CONFIG_MXC_GPIO

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-09-17  4:51 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-15 19:09 [U-Boot] [PATCH 0/2] i2c: port i2c driver to new subsystem Philippe Reynes
2013-09-15 19:09 ` [U-Boot] [PATCH 1/2] i2c: move " Philippe Reynes
2013-09-15 21:12   ` Albert ARIBAUD
2013-09-17  4:41   ` Heiko Schocher
2013-09-15 19:09 ` [U-Boot] [PATCH 2/2] i2c: update config using mxc driver " Philippe Reynes
2013-09-17  4:51   ` Heiko Schocher
2013-09-16 23:20 ` [U-Boot] [PATCH 0/2] i2c: port i2c " Eric Nelson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox