* [U-Boot] [PATCH 1/3] ARM: zynq: Disable i2c for Zybo/Zybo Z7
@ 2019-01-22 13:51 Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 3/3] ARM: zynq: Convert dlc20 and zc70x board " Michal Simek
0 siblings, 2 replies; 9+ messages in thread
From: Michal Simek @ 2019-01-22 13:51 UTC (permalink / raw)
To: u-boot
There is no i2c connected in base DT that's why disable I2C commands.
Also remove zynq_zybo which is not needed now.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
configs/zynq_zybo_defconfig | 6 ------
configs/zynq_zybo_z7_defconfig | 4 ----
include/configs/zynq_zybo.h | 18 ------------------
3 files changed, 28 deletions(-)
delete mode 100644 include/configs/zynq_zybo.h
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 46b63003b315..9e44e82549f7 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -1,5 +1,4 @@
CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="zynq_zybo"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_SPL=y
@@ -18,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y
@@ -26,7 +24,6 @@ CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y
@@ -43,9 +40,6 @@ 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_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
diff --git a/configs/zynq_zybo_z7_defconfig b/configs/zynq_zybo_z7_defconfig
index 7985ad6c6363..d729ca340c36 100644
--- a/configs/zynq_zybo_z7_defconfig
+++ b/configs/zynq_zybo_z7_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_FPGA_LOADFS=y
CONFIG_CMD_FPGA_LOADMK=y
CONFIG_CMD_FPGA_LOADP=y
CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y
@@ -41,9 +40,6 @@ 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_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
deleted file mode 100644
index 7d00b412a7e5..000000000000
--- a/include/configs/zynq_zybo.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2012 Xilinx
- * (C) Copyright 2014 Digilent Inc.
- *
- * Configuration for Zynq Development Board - ZYBO
- * See zynq-common.h for Zynq common configs
- */
-
-#ifndef __CONFIG_ZYNQ_ZYBO_H
-#define __CONFIG_ZYNQ_ZYBO_H
-
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50
-
-#include <configs/zynq-common.h>
-
-#endif /* __CONFIG_ZYNQ_ZYBO_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C
2019-01-22 13:51 [U-Boot] [PATCH 1/3] ARM: zynq: Disable i2c for Zybo/Zybo Z7 Michal Simek
@ 2019-01-22 13:51 ` Michal Simek
2019-01-22 14:52 ` Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 3/3] ARM: zynq: Convert dlc20 and zc70x board " Michal Simek
1 sibling, 1 reply; 9+ messages in thread
From: Michal Simek @ 2019-01-22 13:51 UTC (permalink / raw)
To: u-boot
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@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
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C
2019-01-22 13:51 ` [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C Michal Simek
@ 2019-01-22 14:52 ` Michal Simek
2019-01-25 8:20 ` Mike Looijmans
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2019-01-22 14:52 UTC (permalink / raw)
To: u-boot
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@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.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190122/129de824/attachment.sig>
^ permalink raw reply [flat|nested] 9+ messages in thread* [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C
2019-01-22 14:52 ` Michal Simek
@ 2019-01-25 8:20 ` Mike Looijmans
2019-01-25 8:36 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Mike Looijmans @ 2019-01-25 8:20 UTC (permalink / raw)
To: u-boot
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@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. :)
^ permalink raw reply [flat|nested] 9+ messages in thread* [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C
2019-01-25 8:20 ` Mike Looijmans
@ 2019-01-25 8:36 ` Michal Simek
2019-01-29 19:03 ` Tom McLeod
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2019-01-25 8:36 UTC (permalink / raw)
To: u-boot
On 25. 01. 19 9:20, Mike Looijmans wrote:
> 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@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. :)
>
buildman runs by travis for your board. If you look at that travis.yml
you will see instructions.
Thanks,
Michal
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/3] ARM: zynq: Convert dlc20 and zc70x board to DM_I2C
2019-01-22 13:51 [U-Boot] [PATCH 1/3] ARM: zynq: Disable i2c for Zybo/Zybo Z7 Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C Michal Simek
@ 2019-01-22 13:51 ` Michal Simek
1 sibling, 0 replies; 9+ messages in thread
From: Michal Simek @ 2019-01-22 13:51 UTC (permalink / raw)
To: u-boot
All these board have also eeprom enabled that's why it is also enabled
via defconfig.
There is also no need to have zc70x specific config file that's why also
remove it.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
configs/zynq_dlc20_rev1_0_defconfig | 9 ++++++---
configs/zynq_zc702_defconfig | 10 ++++++----
configs/zynq_zc706_defconfig | 10 ++++++----
include/configs/zynq-common.h | 14 --------------
include/configs/zynq_zc70x.h | 16 ----------------
5 files changed, 18 insertions(+), 41 deletions(-)
delete mode 100644 include/configs/zynq_zc70x.h
diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig
index 7ead19208f4f..489d54773c8a 100644
--- a/configs/zynq_dlc20_rev1_0_defconfig
+++ b/configs/zynq_dlc20_rev1_0_defconfig
@@ -19,7 +19,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y
@@ -44,8 +43,12 @@ 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_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 9734f24fdfed..d6c602b73b6e 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -1,5 +1,4 @@
CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_SPL=y
@@ -19,7 +18,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
@@ -45,10 +43,14 @@ 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_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 4a03351d1ee2..4f14636b912d 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -1,5 +1,4 @@
CONFIG_ARM=y
-CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
CONFIG_ARCH_ZYNQ=y
CONFIG_SYS_TEXT_BASE=0x4000000
CONFIG_SPL=y
@@ -22,7 +21,6 @@ CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_EEPROM=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_FPGA_LOADBP=y
@@ -47,8 +45,12 @@ 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_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x0
+CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1710feda9185..884f3cf01c8e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -102,20 +102,6 @@
# define DFU_ALT_INFO
#endif
-/* I2C */
-#if defined(CONFIG_SYS_I2C_ZYNQ)
-# define CONFIG_SYS_I2C
-#endif
-
-/* EEPROM */
-#ifdef CONFIG_ZYNQ_EEPROM
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54
-# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
-# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
-# define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */
-#endif
-
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
deleted file mode 100644
index b5a28dab878f..000000000000
--- a/include/configs/zynq_zc70x.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2013 Xilinx, Inc.
- *
- * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
- * See zynq-common.h for Zynq common configs
- */
-
-#ifndef __CONFIG_ZYNQ_ZC70X_H
-#define __CONFIG_ZYNQ_ZC70X_H
-
-#define CONFIG_ZYNQ_EEPROM
-
-#include <configs/zynq-common.h>
-
-#endif /* __CONFIG_ZYNQ_ZC70X_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-01-30 18:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-22 13:51 [U-Boot] [PATCH 1/3] ARM: zynq: Disable i2c for Zybo/Zybo Z7 Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami to DM_I2C Michal Simek
2019-01-22 14:52 ` Michal Simek
2019-01-25 8:20 ` Mike Looijmans
2019-01-25 8:36 ` Michal Simek
2019-01-29 19:03 ` Tom McLeod
2019-01-30 17:54 ` Michal Simek
2019-01-30 18:31 ` Michal Simek
2019-01-22 13:51 ` [U-Boot] [PATCH 3/3] ARM: zynq: Convert dlc20 and zc70x board " Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.