[PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV

Thu Oct 21 07:31:33 CEST 2021

On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun at nic.cz>
> 
> 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 at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   configs/mvebu_db-88f3720_defconfig          | 1 +
>   configs/mvebu_espressobin-88f3720_defconfig | 1 +
>   configs/turris_mox_defconfig                | 1 +
>   configs/uDPU_defconfig                      | 1 +
>   drivers/i2c/Kconfig                         | 6 ++++++
>   drivers/i2c/Makefile                        | 2 +-
>   include/configs/mvebu_armada-37xx.h         | 5 -----
>   include/configs/turris_mox.h                | 5 -----
>   scripts/config_whitelist.txt                | 1 -
>   9 files changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
> index d401f4765f..6c2a2180a4 100644
> --- 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 01cf24aec9..b783246562 100644
> --- 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 e494aebecc..3cae32f69b 100644
> --- 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 a06a25378e..6a222f3d6c 100644
> --- 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 57cac4483f..b1c3a96dc0 100644
> --- a/drivers/i2c/Kconfig
> +++ b/drivers/i2c/Kconfig
> @@ -611,6 +611,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 67841bf3e0..7cfb3b9043 100644
> --- 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 755f59eee9..8c315eb563 100644
> --- 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 0fcf216eb1..ab7931d35b 100644
> --- 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 02d86d79cf..3475d0bc6d 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -601,7 +601,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
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de