i2c: update config using mxc driver to new subsystem

Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index e7e258fa60df1ed8c882969565c3a258bf84226d..1193013ea07f9f0bd61c15f8c146690b0b105890 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -321,11 +321,12 @@
  */
 
 #ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE            IMX_I2C1_BASE
-#define CONFIG_SYS_I2C_SPEED           100000  /* 100 kHz */
-#define CONFIG_SYS_I2C_SLAVE           0x7F
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_MXC_I2C1_SPEED      100000  /* 100 kHz */
+#define CONFIG_SYS_MXC_I2C1_SLAVE      0x7F
+#define CONFIG_SYS_MXC_I2C2_SPEED      100000  /* 100 kHz */
+#define CONFIG_SYS_MXC_I2C2_SLAVE      0x7F
 #define CONFIG_SYS_I2C_NOPROBES                { }
 
 #ifdef CONFIG_CMD_EEPROM

diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 655df67961e0e9851dd93e57a3fceaf7d3ecbd7a..1781089ec776ab634308402f8a41f8e2d1b1e3ef 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -50,11 +50,10 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE            I2C3_BASE_ADDR
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SLAVE           0xfe
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         2 /* I2C3 */
+#define CONFIG_SYS_MXC_I2C3_SLAVE      0xfe
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO
 

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 1e2b12cb25e99888e276d9c0ae20fe9b241214ca..6b99d1bd3f38395827321199e7da1c39c9e03acf 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -35,11 +35,10 @@
  * 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 /* I2C2 */
 #define CONFIG_SYS_I2C_CLK_OFFSET      I2C2_CLK_OFFSET
-#define CONFIG_SYS_I2C_SPEED           100000
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 024d3a5aaf830f5f3e3c55c9f6d39a894c494086..d7ca66b99930bf7c5948795c559bb1729f5bd1ec 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -161,10 +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_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         1 /* I2C2 */
 #endif
 
 /*

diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 543c4159efa182d8cfc971cc4b7b654dbb2c80c2..256b3c1bef99aff96cd34a8d1d98cfec40755ebf 100644 (file)
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -111,10 +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_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         0 /* I2C1 */
 
 /* RTC */
 #define CONFIG_RTC_IMXDI

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 2f59104b83181714af92cddd60a990e7c840ba3f..2d1b800c3a597e94f615a67676331dddbc43c253 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -40,10 +40,9 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
-#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         0 /* I2C1 */
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO
 

diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 7956083c3508259baa38480776e0d091d9b347ee..b404247efa897d3147d9a07d5dfe15294eda110e 100644 (file)
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -44,10 +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_SPEED            100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         1 /* I2C2 */
 
 /* MMC Configs */
 #define CONFIG_FSL_ESDHC

diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index fe5cf3c701253682578caf234aa7e68da248df7e..d9c7df5b2c70b24c46df37033f641d05f0a0eeca 100644 (file)
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -37,10 +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_SPEED            100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         1 /* I2C2 */
 
 /* PMIC Configs */
 #define CONFIG_POWER

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index bd2fa43b95070836beabc24afb7309d34ced2a3a..5f343b13bd300a016360dacdc72be5ac4f48a609 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -71,10 +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_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         0 /* I2C1 */
 
 /* PMIC Controller */
 #define CONFIG_POWER

diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 12b2c0de8679145d32ee4d958a90508c75f86959..2f7736d503742be63fe2841688cbfe0ff7af0606 100644 (file)
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -34,10 +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_SPEED            100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         1 /* I2C2 */
 
 /* MMC Configs */
 #define CONFIG_FSL_ESDHC

diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 5530fc6f2b768330446d39a0717d3bfb55b8939f..e0200c75f4c3ceb2963b34a5ca2f8c49f78034f1 100644 (file)
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -36,8 +36,8 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C
+#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 3454b862a8df6505fff04d3026bd706a495ef83c..d515e493026aac2923fdea08142042c19b3aa9c7 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -52,8 +52,8 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C
+#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 077e25e16e424e8e710b5ac299ee440d83449721..0769f07e5d64982b9e206deebbaa6d6abe2d49eb 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -41,8 +41,8 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C
+#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 5a7a066377ee28e2e14c84a4cee95fa1fa3ee0dd..34861f652d74efa7bbf215fc0c4955073ad73623 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -70,10 +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_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         0
 
 #define CONFIG_BOOTDELAY               3
 

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 5c442ad865c07fc979511800bdb94ff11e521459..8770e9c69183f257cf5df9f5f05f992fc5eaf239 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -45,10 +45,9 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
-#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_SPD_BUS_NUM         0
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO