Convert CONFIG_SYS_I2C_SPEED et al to Kconfig

This converts the following to Kconfig: CONFIG_SYS_I2C_SPEED CONFIG_SYS_I2C_SLAVE Signed-off-by: Tom Rini <trini@konsulko.com>
2021-08-18 23:12:32 -04:00
parent 1edef7693b
commit a5752f8a25
171 changed files with 193 additions and 174 deletions
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -223,8 +223,4 @@
 #endif

 #define CONFIG_NET_RETRY_COUNT         10
-
-/* I2C configuration */
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		1
 #endif	/* ! __CONFIG_AM335X_SHC_H */
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -39,7 +39,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_MXC_I2C3_SPEED	400000

 /* MMC Configs */
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -51,7 +51,6 @@

 /* I2C Configuration */
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_SYS_I2C_SPEED	400000
 /* EEPROM */
 #define  EEPROM_I2C_BUS		0 /* I2C0 */
 #define  EEPROM_I2C_ADDR	0x50
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -33,7 +33,6 @@
 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C2		/* Enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		100000

 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR	0x20
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -170,7 +170,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_MXC_I2C3_SPEED	400000

 /* SATA */
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -25,9 +25,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	1

-/* I2C configs */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -37,7 +37,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_MXC_I2C3_SPEED	400000

 /* MMC Configs */
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -26,7 +26,6 @@

 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_SPEED		100000

 #define CONFIG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_I2C_PXA
 #define CONFIG_PXA_STD_I2C
 #define CONFIG_PXA_PWR_I2C
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 /* LCD support */
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -50,7 +50,6 @@
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 /* Miscellaneous configurable options */
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -18,8 +18,6 @@

 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -12,8 +12,6 @@

 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /*
 * SATA/SCSI/AHCI configuration
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -19,8 +19,6 @@

 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -37,11 +37,6 @@
 #define CONFIG_DMA_LPC32XX
 #endif

-/*
- * I2C
- */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 /*
 * GPIO
 */
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -29,9 +29,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_FACTORYSET

 /* Define own nand partitions */
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -21,8 +21,6 @@

 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /* PCIe support */
 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -154,8 +154,6 @@
 */
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_I2C_MVTWSI_BASE0		ORION5X_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 /*
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED			100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000

 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -86,9 +86,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120

--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_I2C_GSC			0
 #define CONFIG_I2C_EDID

--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -178,8 +178,6 @@

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_ETHPRIME			"FEC"

 #define CONFIG_FEC_XCV_TYPE		RGMII
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -128,9 +128,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-/* I2C */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 /* FEC*/
 #define CONFIG_ETHPRIME                 "FEC"
 #define CONFIG_FEC_XCV_TYPE             RGMII
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -94,8 +94,6 @@

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_ETHPRIME                 "FEC"

 #define CONFIG_FEC_XCV_TYPE             RGMII
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -94,7 +94,4 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-/* I2C */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #endif /* __IMX8MM_ICORE_MX8MM_H */
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -112,9 +112,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-/* I2C */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 /* FEC */
 #define CONFIG_ETHPRIME                 "eth0"
 #define CONFIG_FEC_XCV_TYPE             RGMII
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -93,6 +93,4 @@

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-#define CONFIG_SYS_I2C_SPEED		100000
-
 #endif
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -118,6 +118,4 @@

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-#define CONFIG_SYS_I2C_SPEED		100000
-
 #endif
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -138,9 +138,6 @@

 #define CONFIG_MXC_GPIO

-/* I2C Configs */
-#define CONFIG_SYS_I2C_SPEED		  100000
-
 #define CONFIG_OF_SYSTEM_SETUP

 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -183,9 +183,6 @@

 #define CONFIG_MXC_GPIO

-/* I2C Configs */
-#define CONFIG_SYS_I2C_SPEED		  100000
-
 #define CONFIG_OF_SYSTEM_SETUP

 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -192,7 +192,6 @@
 * I2C
 */
 #define CONFIG_SYS_I2C_INIT_BOARD
-#define CONFIG_SYS_I2C_SPEED		100000

 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_SYS_I2C_MAX_HOPS		1
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -18,8 +18,6 @@

 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /* SPI NOR flash default params, used by sf commands */

--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -55,7 +55,6 @@
 * I2C
 */
 #define CONFIG_I2C_MV
-#define CONFIG_SYS_I2C_SLAVE		0x0

 /*
 * Environment
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000

 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -21,7 +21,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000
 #endif

 #define CONFIG_EXTRA_ENV_SETTINGS \
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -111,7 +111,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -145,7 +145,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 /* Network */
 #define CONFIG_FEC_MXC
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -41,7 +41,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -22,7 +22,6 @@

 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_SPEED		100000

 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_I2C_EDID

 /* MMC Configs */
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -57,7 +57,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_SPEED		100000
 #define CONFIG_SYS_SPD_BUS_NUM		0

 /* I2C EEPROM */
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -38,7 +38,6 @@
 /* I2C configs */
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_SPEED		100000
 #endif

 /* Miscellaneous configurable options */
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -117,9 +117,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-/* I2C */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 /* ENET1 */
 #define CONFIG_ETHPRIME			"FEC"
 #define CONFIG_FEC_XCV_TYPE		RGMII
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -115,7 +115,4 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1

-/* I2C */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #endif /* __PHYCORE_IMX8MP_H */
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -128,7 +128,6 @@

 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_SPEED		100000

 /* environment organization */
 /* Environment starts at 768k = 768 * 1024 = 786432 */
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -131,7 +131,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2
 #define CONFIG_SYS_I2C_MXC_I2C3
 #define CONFIG_SYS_I2C_MXC_I2C4
-#define CONFIG_SYS_I2C_SPEED		100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -162,9 +162,6 @@

 #define CONFIG_MXC_GPIO

-/* I2C Configs */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_OF_SYSTEM_SETUP

 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -32,9 +32,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		400000
-
 #define CONFIG_FACTORYSET

 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -34,9 +34,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120

--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -23,9 +23,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define CONFIG_FACTORYSET

 /* Watchdog */
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -194,15 +194,6 @@


 /* I2C */
-#if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \
-    defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \
-    defined CONFIG_I2C4_ENABLE || defined CONFIG_R_I2C_ENABLE
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_SPEED		400000
-#define CONFIG_SYS_I2C_SLAVE		0x7f
-#endif
-#endif
-
 #if defined(CONFIG_VIDEO_LCD_PANEL_I2C)
 /* We use pin names in Kconfig and sunxi_name_to_gpio() */
 #define CONFIG_SOFT_I2C_GPIO_SDA	soft_i2c_gpio_sda
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -25,8 +25,6 @@
 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 #define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
-#define CONFIG_SYS_I2C_SLAVE		0x0
-#define CONFIG_SYS_I2C_SPEED		100000

 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -27,9 +27,6 @@
 /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */

-/* I2C Configuration */
-#define CONFIG_SYS_I2C_SPEED		100000
-
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120

--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -36,7 +36,6 @@

 /* I2C Configs */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_I2C_SPEED		100000

 /* I2C EEPROM (M24C64) */
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS		5 /* 32 Bytes */
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -60,7 +60,6 @@
 * I2C
 */
 #define CONFIG_I2C_MV
-#define CONFIG_SYS_I2C_SLAVE		0x0

 /* Environment in SPI NOR flash */

--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -73,7 +73,6 @@
 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1
-#define CONFIG_SYS_I2C_SPEED		100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -110,7 +110,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
-#define CONFIG_SYS_I2C_SPEED		100000

 /* ENET */
 #define CONFIG_ETHPRIME                 "FEC"
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C3		/* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_SPEED		  100000

 /* PMIC */
 #define CONFIG_POWER
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -137,7 +137,6 @@

 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_SPEED		100000

 /* environment organization */

--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -43,20 +43,6 @@
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 /* FIXME: remove "Waiting for PHY auto negotiation to complete..." message */

-/*
- * I2C driver
- */
-
-#define CONFIG_SYS_I2C_SPEED 350000
-
-/*
- * I2C EEPROM
- */
-
-/*
- * I2C RTC
- */
-
 #define CONFIG_RTC_DS1374

 /*
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1		/* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C4		/* enable I2C bus 4 */
-#define CONFIG_SYS_I2C_SPEED		100000

 /* Miscellaneous configurable options */

--- a/include/i2c.h
+++ b/include/i2c.h
@@ -746,16 +746,6 @@ extern struct i2c_bus_hose	i2c_bus[];
 # endif
 #endif

-/*
- * Many boards/controllers/drivers don't support an I2C slave interface so
- * provide a default slave address for them for use in common code.  A real
- * value for CONFIG_SYS_I2C_SLAVE should be defined for any board which does
- * support a slave interface.
- */
-#ifndef	CONFIG_SYS_I2C_SLAVE
-#define	CONFIG_SYS_I2C_SLAVE	0xfe
-#endif
-
 /*
 * Initialization, must be called once on start up, may be called
 * repeatedly to change the speed and slave addresses.