arm: mvebu: a3720: Create Kconfig option for I2C_MV

Move the config option CONFIG_I2C_MV to a Kconfig option
CONFIG_SYS_I2C_MV and move the default definition from config header
files into defconfigs.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index ba7ee9211e1dc791ff365eff4a1983edf9dd5982..931ca9c2fc83a6844528eab570e8d738636705d4 100644 (file)
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -45,6 +45,7 @@ CONFIG_CLK=y
 CONFIG_CLK_MVEBU=y
 # CONFIG_MVEBU_GPIO is not set
 CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
 CONFIG_MISC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y

diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index bf3f080422a4970c2b46ecbbf489bf2fc36f1b93..3a69954fcde373c2fc0ad0e174b0410de03741be 100644 (file)
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -54,6 +54,7 @@ CONFIG_AHCI_MVEBU=y
 CONFIG_CLK=y
 CONFIG_CLK_MVEBU=y
 CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
 CONFIG_MISC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index e494aebecc3cf9717fb45faeef3c68ed4aa18f87..3cae32f69b003f8a0521ca46a1420dfadfe66210 100644 (file)
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -61,6 +61,7 @@ CONFIG_CLK=y
 CONFIG_CLK_MVEBU=y
 # CONFIG_MVEBU_GPIO is not set
 CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y

diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
index 17278ae4cc5b9f3472d26cfdc25cf08de7a098af..fa2293bd3ec5870e10c10ec75766c238dfb8ca5b 100644 (file)
--- a/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@ -54,6 +54,7 @@ CONFIG_CLK=y
 CONFIG_CLK_MVEBU=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_GPIO=y
+CONFIG_SYS_I2C_MV=y
 CONFIG_MISC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 66bd6fe2f34bc832d8eeba7feed2e3d6ebc66053..7c447a8aa0a035191bb6644b5bc4c4f13400193e 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -627,6 +627,12 @@ config SYS_I2C_VERSATILE
          Add support for the Arm Ltd Versatile Express I2C driver. The I2C host
          controller is present in the development boards manufactured by Arm Ltd.
 
+config SYS_I2C_MV
+       bool "Marvell PXA (Armada 3720) I2C driver"
+       help
+         Support for PXA based I2C controller used on Armada 3720 SoC.
+         In Linux, this driver is called i2c-pxa.
+
 config SYS_I2C_MVTWSI
        bool "Marvell I2C driver"
        help

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 916427452a56c5a3abac3cfdc1bc188c250ae076..fca6b157f8abfa07cd8d918402801e52485c4a4f 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_$(SPL_)DM_I2C_GPIO) += i2c-gpio.o
 obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
 obj-$(CONFIG_$(SPL_)I2C_CROS_EC_LDO) += cros_ec_ldo.o
 
-obj-$(CONFIG_I2C_MV) += mv_i2c.o
 obj-$(CONFIG_$(SPL_)SYS_I2C_LEGACY) += i2c_core.o
 obj-$(CONFIG_SYS_I2C_ASPEED) += ast_i2c.o
 obj-$(CONFIG_SYS_I2C_AT91) += at91_i2c.o
@@ -29,6 +28,7 @@ obj-$(CONFIG_SYS_I2C_IPROC) += iproc_i2c.o
 obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o
 obj-$(CONFIG_SYS_I2C_LPC32XX) += lpc32xx_i2c.o
 obj-$(CONFIG_SYS_I2C_MESON) += meson_i2c.o
+obj-$(CONFIG_SYS_I2C_MV) += mv_i2c.o
 obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
 obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
 obj-$(CONFIG_SYS_I2C_NEXELL) += nx_i2c.o

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 755f59eee98755a6ced9e8e84e37f46aaecd9b0e..8c315eb56314b8e5da3ac7db027d37c7bad07bc0 100644 (file)
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -36,11 +36,6 @@
 /* End of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
 
-/*
- * I2C
- */
-#define CONFIG_I2C_MV
-
 /*
  * Environment
  */

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0fcf216eb183c8b23d84617abb50a31c6f52481a..ab7931d35bdc729e65b7d76714a6fe8017f3f97f 100644 (file)
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -34,11 +34,6 @@
 /* End of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
 
-/*
- * I2C
- */
-#define CONFIG_I2C_MV
-
 /* Environment in SPI NOR flash */
 
 /*

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cd94b5777abf5004a87980cee6eae05f4f6cb1ae..022a27288c933df97557fbd4e512362f245912ff 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -593,7 +593,6 @@ CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_GSC
 CONFIG_I2C_MBB_TIMEOUT
 CONFIG_I2C_MULTI_BUS
-CONFIG_I2C_MV
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE
 CONFIG_I2C_MVTWSI_BASE0