[PATCH u-boot-marvell 2/3] arm: mvebu: turris_omnia: Use the i2c_eeprom misc driver for EEPROM reading in U-Boot proper

[Stefan Roese]

On 8/29/24 10:08, Marek Behún wrote:
> Use the i2c_eeprom miscellaneous driver for reading Turris Omnia EEPROM
> in U-Boot proper. Keep using dm_i2c_read() in SPL build, since adding
> the i2c_eeprom driver to SPL build increases the image by 1.5 KiB.
> 
> Signed-off-by: Marek Behún <kabel at kernel.org>
> ---
>   arch/arm/mach-mvebu/Kconfig              | 1 +
>   board/CZ.NIC/turris_omnia/turris_omnia.c | 9 +++++++--
>   configs/turris_omnia_defconfig           | 1 -
>   3 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 4a8328760eb..c1a1a333e6c 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -149,6 +149,7 @@ config TARGET_TURRIS_OMNIA
>   	select SPL_SYS_MALLOC_SIMPLE
>   	select SYS_I2C_MVTWSI
>   	select ATSHA204A
> +	select I2C_EEPROM
>   	select ARMADA_38X_SUPPORT_OLD_DDR3_TRAINING
>   
>   config TARGET_TURRIS_MOX
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index 392df53a6d8..46f20f05c05 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -23,6 +23,7 @@
>   #include <dt-bindings/gpio/gpio.h>
>   #include <fdt_support.h>
>   #include <hexdump.h>
> +#include <i2c_eeprom.h>
>   #include <time.h>
>   #include <turris-omnia-mcu-interface.h>
>   #include <linux/bitops.h>
> @@ -473,9 +474,13 @@ static bool omnia_read_eeprom(struct omnia_eeprom *oep)
>   	if (!eeprom)
>   		return false;
>   
> -	ret = dm_i2c_read(eeprom, 0, (void *)oep, sizeof(*oep));
> +	if (IS_ENABLED(CONFIG_SPL_BUILD))
> +		ret = dm_i2c_read(eeprom, 0, (void *)oep, sizeof(*oep));
> +	else
> +		ret = i2c_eeprom_read(eeprom, 0, (void *)oep, sizeof(*oep));

So whats the advantage using i2c_eeprom_read() here in U-Boot proper?
The only thing that stands out to me is that the code get more complex
because of the SPL/non-SPL distinction.

Thanks,
Stefan

> +
>   	if (ret) {
> -		printf("dm_i2c_read failed: %i, cannot read EEPROM\n", ret);
> +		printf("cannot read EEPROM: %d\n", ret);
>   		return false;
>   	}
>   
> diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
> index c8756a3a788..93f0bc53f9e 100644
> --- a/configs/turris_omnia_defconfig
> +++ b/configs/turris_omnia_defconfig
> @@ -92,7 +92,6 @@ CONFIG_SPL_OF_TRANSLATE=y
>   CONFIG_AHCI_PCI=y
>   CONFIG_AHCI_MVEBU=y
>   CONFIG_DM_PCA953X=y
> -CONFIG_I2C_EEPROM=y
>   CONFIG_MMC_SDHCI=y
>   CONFIG_MMC_SDHCI_MV=y
>   CONFIG_DM_MTD=y