[U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C

[Mike Looijmans]

On 22-01-19 15:52, Michal Simek wrote:
> On 22. 01. 19 14:51, Michal Simek wrote:
>> Both boards have only controllers enabled that's why move to DM_I2C is
>> easy.
>> Add also i2c alias for Syzygy not to be shown as i2c bus -1 because
>> alias doesn't exist.
>>
>> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
>> ---
>>
>>   arch/arm/dts/zynq-syzygy-hub.dts  | 1 +
>>   configs/syzygy_hub_defconfig      | 5 ++---
>>   configs/topic_miami_defconfig     | 5 ++---
>>   configs/topic_miamilite_defconfig | 5 ++---
>>   configs/topic_miamiplus_defconfig | 5 ++---
>>   5 files changed, 9 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/dts/zynq-syzygy-hub.dts b/arch/arm/dts/zynq-syzygy-hub.dts
>> index a30d667146d1..0f25cbe60923 100644
>> --- a/arch/arm/dts/zynq-syzygy-hub.dts
>> +++ b/arch/arm/dts/zynq-syzygy-hub.dts
>> @@ -16,6 +16,7 @@
>>   		ethernet0 = &gem0;
>>   		serial0 = &uart0;
>>   		mmc0 = &sdhci0;
>> +		i2c0 = &i2c1;
>>   	};
>>   
>>   	memory at 0 {
>> diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
>> index 75139d93b346..793156520021 100644
>> --- a/configs/syzygy_hub_defconfig
>> +++ b/configs/syzygy_hub_defconfig
>> @@ -17,7 +17,6 @@ CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
>>   CONFIG_SPL_STACK_R=y
>>   CONFIG_SPL_OS_BOOT=y
>>   CONFIG_SYS_PROMPT="Zynq> "
>> -CONFIG_CMD_EEPROM=y
>>   # CONFIG_CMD_FLASH is not set
>>   CONFIG_CMD_FPGA_LOADBP=y
>>   CONFIG_CMD_FPGA_LOADFS=y
>> @@ -36,8 +35,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
>>   CONFIG_FPGA_XILINX=y
>>   CONFIG_FPGA_ZYNQPL=y
>>   CONFIG_DM_GPIO=y
>> -CONFIG_SYS_I2C_ZYNQ=y
>> -CONFIG_ZYNQ_I2C1=y
>> +CONFIG_DM_I2C=y
>> +CONFIG_SYS_I2C_CADENCE=y
>>   CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
>>   CONFIG_MMC_SDHCI=y
>>   CONFIG_MMC_SDHCI_ZYNQ=y
>> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
>> index 70d07ac041ae..927ce9ad2848 100644
>> --- a/configs/topic_miami_defconfig
>> +++ b/configs/topic_miami_defconfig
>> @@ -34,9 +34,8 @@ CONFIG_DFU_RAM=y
>>   CONFIG_FPGA_XILINX=y
>>   CONFIG_FPGA_ZYNQPL=y
>>   CONFIG_DM_GPIO=y
>> -CONFIG_SYS_I2C_ZYNQ=y
>> -CONFIG_ZYNQ_I2C0=y
>> -CONFIG_ZYNQ_I2C1=y
>> +CONFIG_DM_I2C=y
>> +CONFIG_SYS_I2C_CADENCE=y
>>   CONFIG_MMC_SDHCI=y
>>   CONFIG_MMC_SDHCI_ZYNQ=y
>>   CONFIG_SPI_FLASH=y
>> diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
>> index 387f4cae0865..e4d52f6a915e 100644
>> --- a/configs/topic_miamilite_defconfig
>> +++ b/configs/topic_miamilite_defconfig
>> @@ -34,9 +34,8 @@ CONFIG_DFU_RAM=y
>>   CONFIG_FPGA_XILINX=y
>>   CONFIG_FPGA_ZYNQPL=y
>>   CONFIG_DM_GPIO=y
>> -CONFIG_SYS_I2C_ZYNQ=y
>> -CONFIG_ZYNQ_I2C0=y
>> -CONFIG_ZYNQ_I2C1=y
>> +CONFIG_DM_I2C=y
>> +CONFIG_SYS_I2C_CADENCE=y
>>   CONFIG_MMC_SDHCI=y
>>   CONFIG_MMC_SDHCI_ZYNQ=y
>>   CONFIG_SPI_FLASH=y
>> diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
>> index d820fff501d1..f742838d7c1f 100644
>> --- a/configs/topic_miamiplus_defconfig
>> +++ b/configs/topic_miamiplus_defconfig
>> @@ -33,9 +33,8 @@ CONFIG_DFU_RAM=y
>>   CONFIG_FPGA_XILINX=y
>>   CONFIG_FPGA_ZYNQPL=y
>>   CONFIG_DM_GPIO=y
>> -CONFIG_SYS_I2C_ZYNQ=y
>> -CONFIG_ZYNQ_I2C0=y
>> -CONFIG_ZYNQ_I2C1=y
>> +CONFIG_DM_I2C=y
>> +CONFIG_SYS_I2C_CADENCE=y
>>   CONFIG_MMC_SDHCI=y
>>   CONFIG_MMC_SDHCI_ZYNQ=y
>>   CONFIG_SPI_FLASH=y
>>
> 
> Note: this needs to be split because syzygy is not describing eeprom on
> i2c.
> Tom: Can you please tell me what eeprom you have on i2c?
> Mike: Feel free to check this just for your boards.

Attempted to do that, but somehow I can no longer get buildman to work on any 
of my systems (ubuntu 14 and 18).

Ah well, if it's okay on other boards it'll work on ours as well.  :)