arm/arm64: i2c platform cleanup
Subsystems (5)
v2 cover arm/arm64: i2c platform cleanup
Hi,
sending this v2 as follow up series based on
https://lists.denx.de/pipermail/u-boot/2019-January/357172.html
which converts all platform to DM_I2C and removes old driver.
Thanks,
Michal
Changes in v2:
- Extract Syzygy from Topic
- Add eeprom to i2c - needs to be checked by Syzygy team if this is correct
- Add dependency
Michal Simek (7):
ARM: zynq: Convert Syzygy to DM_I2C
ARM: zynq: Convert dlc20 and zc70x board to DM_I2C
ARM: zynq: Remove addresses for i2c controllers
arm64: zynqmp: Switch all platfroms to DM_I2C
arm64: zynqmp: Remove addresses for i2c controllers
i2c: Remove ancient zynq_i2c driver
xilinx: common: Remove !DM_i2C code for reading mac from eeprom
README | 5 - arch/arm/dts/zynq-syzygy-hub.dts | 6 + arch/arm/dts/zynqmp-zcu102-revA.dts | 1 + arch/arm/dts/zynqmp-zcu104-revC.dts | 1 + arch/arm/dts/zynqmp-zcu106-revA.dts | 1 + arch/arm/dts/zynqmp-zcu111-revA.dts | 1 + arch/arm/mach-zynq/include/mach/hardware.h | 2 - arch/arm/mach-zynqmp/include/mach/hardware.h | 3 - board/xilinx/common/board.c | 19 -- configs/avnet_ultra96_rev1_defconfig | 6 +- configs/syzygy_hub_defconfig | 5 +- configs/xilinx_zynqmp_zcu100_revC_defconfig | 6 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 12 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 13 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 13 +- configs/xilinx_zynqmp_zcu104_revA_defconfig | 11 +- configs/xilinx_zynqmp_zcu104_revC_defconfig | 11 +- configs/xilinx_zynqmp_zcu106_revA_defconfig | 12 +- configs/xilinx_zynqmp_zcu111_revA_defconfig | 12 +- configs/zynq_dlc20_rev1_0_defconfig | 9 +- configs/zynq_zc702_defconfig | 10 +- configs/zynq_zc706_defconfig | 10 +- configs/zynq_zybo_defconfig | 1 - drivers/i2c/Kconfig | 33 --- drivers/i2c/Makefile | 1 - drivers/i2c/zynq_i2c.c | 313 -------------------------- drivers/misc/Kconfig | 1 + include/configs/syzygy_hub.h | 4 - include/configs/xilinx_zynqmp.h | 5 - include/configs/xilinx_zynqmp_zcu100.h | 15 -- include/configs/xilinx_zynqmp_zcu102.h | 29 --- include/configs/xilinx_zynqmp_zcu104.h | 17 -- include/configs/xilinx_zynqmp_zcu104_revC.h | 3 - include/configs/xilinx_zynqmp_zcu106.h | 28 --- include/configs/xilinx_zynqmp_zcu111.h | 31 --- include/configs/zynq-common.h | 14 -- include/configs/zynq_zc70x.h | 16 -- 37 files changed, 90 insertions(+), 590 deletions(-) delete mode 100644 drivers/i2c/zynq_i2c.c delete mode 100644 include/configs/zynq_zc70x.h
Signature · 1 line
1.9.1
PATCH v2 1/7 ARM: zynq: Convert Syzygy to DM_I2C
Boards have only one controller enabled that's why move to DM_I2C is easy.
Add also i2c alias for not to be shown as i2c bus -1 because alias doesn't exist.
Config file points to MAC stored in eeprom but it is not listed that's why I have added 24c08 part.
---
Changes in v2:
- Extract Syzygy from Topic
- Add eeprom to i2c - needs to be checked by Syzygy team if this is correct
arch/arm/dts/zynq-syzygy-hub.dts | 6 ++++++ configs/syzygy_hub_defconfig | 5 ++--- include/configs/syzygy_hub.h | 4 ---- 3 files changed, 8 insertions(+), 7 deletions(-)
arch/arm/dts/zynq-syzygy-hub.dts +6 -0
@@ -16,6 +16,7 @@ ethernet0 = &gem0; serial0 = &uart0; mmc0 = &sdhci0; + i2c0 = &i2c1; }; memory at 0 {
@@ -26,6 +27,7 @@ chosen { bootargs = ""; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; }; usb_phy0: phy0 {
@@ -52,6 +54,10 @@ &i2c1 { status = "okay"; + eeprom: eeprom at 57 { + compatible = "atmel,24c08"; /* not sure if this is correct */ + reg = <0x57>; + }; }; &sdhci0 {
configs/syzygy_hub_defconfig +2 -3
@@ -16,7 +16,6 @@ CONFIG_IMAGE_FORMAT_LEGACY=y 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
@@ -35,8 +34,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
include/configs/syzygy_hub.h +0 -4
@@ -10,10 +10,6 @@#ifndef __CONFIG_SYZYGY_HUB_H#define __CONFIG_SYZYGY_HUB_H -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57 -#define CONFIG_ZYNQ_EEPROM_BUS 0 -#define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "bitstream_image=download.bit\0" \
Signature · 1 line
1.9.1
PATCH v2 1/7 ARM: zynq: Convert Syzygy to DM_I2C
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 15 lines
Boards have only one controller enabled that's why move to
DM_I2Cis easy.
Add also i2c alias for not to be shown as i2c bus -1 because alias doesn't exist.
Config file points to MAC stored in eeprom but it is not listed that's why I have added 24c08 part.Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- Extract Syzygy from Topic
- Add eeprom to i2c - needs to be checked by Syzygy team if this is correct
Quoted 4 lines
arch/arm/dts/zynq-syzygy-hub.dts | 6 ++++++ configs/syzygy_hub_defconfig | 5 ++--- include/configs/syzygy_hub.h | 4 ---- 3 files changed, 8 insertions(+), 7 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 2/7 ARM: zynq: Convert dlc20 and zc70x board to DM_I2C
In reply to Michal SimekAll 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.
---
Changes in v2: None
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
configs/zynq_dlc20_rev1_0_defconfig +6 -3
@@ -18,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_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y
@@ -43,8 +42,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
configs/zynq_zc702_defconfig +6 -4
@@ -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
@@ -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_MEMTEST=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set
@@ -44,10 +42,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
configs/zynq_zc706_defconfig +6 -4
@@ -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
@@ -21,7 +20,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
@@ -46,8 +44,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
include/configs/zynq-common.h +0 -14
@@ -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
include/configs/zynq_zc70x.h deleted +0 -16
@@ -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 */
Signature · 1 line
1.9.1
PATCH v2 2/7 ARM: zynq: Convert dlc20 and zc70x board to DM_I2C
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 10 lines
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 <[email protected]>---
Changes in v2: None
Quoted 7 lines
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
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 3/7 ARM: zynq: Remove addresses for i2c controllers
In reply to Michal SimekAll platforms have been converted to DM that's why there is no reason to keep addresses in headers. They are all read from DT now.
---
Changes in v2: None
arch/arm/mach-zynq/include/mach/hardware.h | 2 -- 1 file changed, 2 deletions(-)
arch/arm/mach-zynq/include/mach/hardware.h +0 -2
@@ -9,8 +9,6 @@#define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000#define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000#define ZYNQ_SCU_BASEADDR 0xF8F00000 -#define ZYNQ_I2C_BASEADDR0 0xE0004000 -#define ZYNQ_I2C_BASEADDR1 0xE0005000#define ZYNQ_QSPI_BASEADDR 0xE000D000#define ZYNQ_SMC_BASEADDR 0xE000E000#define ZYNQ_NAND_BASEADDR 0xE1000000
Signature · 1 line
1.9.1
PATCH v2 3/7 ARM: zynq: Remove addresses for i2c controllers
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 11 lines
All platforms have been converted to DM that's why there is no reason to keep addresses in headers. They are all read from DT now.
Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
arch/arm/mach-zynq/include/mach/hardware.h | 2 -- 1 file changed, 2 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 4/7 arm64: zynqmp: Switch all platfroms to DM_I2C
In reply to Michal SimekCONFIG_PCA953X is not needed because of PCA953X is integrated in gpio subsystem already. That's why also remove CMD_PCA953X which is only for this driver.
zcu102/zcu104-revC/zcu106/zcu111 contain links to eeprom which stores MAC address.
DM_I2C is not enabled for the whole SoC because it increase size for mini configurations and there is no I2C symbol present to setup dependencies.
---
Changes in v2: None
arch/arm/dts/zynqmp-zcu102-revA.dts | 1 + arch/arm/dts/zynqmp-zcu104-revC.dts | 1 + arch/arm/dts/zynqmp-zcu106-revA.dts | 1 + arch/arm/dts/zynqmp-zcu111-revA.dts | 1 + configs/avnet_ultra96_rev1_defconfig | 6 ++++-- configs/xilinx_zynqmp_zcu100_revC_defconfig | 6 ++++-- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 12 ++++++----- configs/xilinx_zynqmp_zcu102_revA_defconfig | 13 ++++++----- configs/xilinx_zynqmp_zcu102_revB_defconfig | 13 ++++++----- configs/xilinx_zynqmp_zcu104_revA_defconfig | 11 ++++++---- configs/xilinx_zynqmp_zcu104_revC_defconfig | 11 ++++++---- configs/xilinx_zynqmp_zcu106_revA_defconfig | 12 ++++++----- configs/xilinx_zynqmp_zcu111_revA_defconfig | 12 ++++++----- include/configs/xilinx_zynqmp.h | 5 ----- include/configs/xilinx_zynqmp_zcu100.h | 15 ------------- include/configs/xilinx_zynqmp_zcu102.h | 29 ------------------------- include/configs/xilinx_zynqmp_zcu104.h | 17 --------------- include/configs/xilinx_zynqmp_zcu104_revC.h | 3 --- include/configs/xilinx_zynqmp_zcu106.h | 28 ------------------------ include/configs/xilinx_zynqmp_zcu111.h | 31 --------------------------- 20 files changed, 63 insertions(+), 165 deletions(-)
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -0
@@ -36,6 +36,7 @@ chosen { bootargs = "earlycon"; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; }; memory at 0 {
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -0
@@ -34,6 +34,7 @@ chosen { bootargs = "earlycon"; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; }; memory at 0 {
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -0
@@ -36,6 +36,7 @@ chosen { bootargs = "earlycon"; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; }; memory at 0 {
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -0
@@ -35,6 +35,7 @@ chosen { bootargs = "earlycon"; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; }; memory at 0 {
configs/avnet_ultra96_rev1_defconfig +4 -2
@@ -49,8 +49,10 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_XILINX_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y
configs/xilinx_zynqmp_zcu100_revC_defconfig +4 -2
@@ -49,8 +49,10 @@ CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y CONFIG_XILINX_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +7 -5
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_CLK=y
@@ -60,15 +59,18 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y CONFIG_XILINX_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_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +CONFIG_SYS_I2C_EEPROM_ADDR=0x0 +CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0 CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +8 -5
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_CLK=y
@@ -60,15 +59,19 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y CONFIG_XILINX_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +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
configs/xilinx_zynqmp_zcu102_revB_defconfig +8 -5
@@ -23,7 +23,6 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_CLK=y
@@ -60,15 +59,19 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y CONFIG_XILINX_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_PCA953X=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +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
configs/xilinx_zynqmp_zcu104_revA_defconfig +7 -4
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y
@@ -50,10 +49,14 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=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
configs/xilinx_zynqmp_zcu104_revC_defconfig +7 -4
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y
@@ -50,11 +49,15 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +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
configs/xilinx_zynqmp_zcu106_revA_defconfig +7 -5
@@ -22,7 +22,6 @@ CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y
@@ -57,14 +56,17 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +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
configs/xilinx_zynqmp_zcu111_revA_defconfig +7 -5
@@ -19,7 +19,6 @@ CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y
@@ -49,14 +48,17 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y -CONFIG_CMD_PCA953X=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 +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
include/configs/xilinx_zynqmp.h +0 -5
@@ -108,11 +108,6 @@# define PHY_ANEG_TIMEOUT 20000#endif -/* I2C */ -#if defined(CONFIG_SYS_I2C_ZYNQ ) -# define CONFIG_SYS_I2C -#endif -/* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
include/configs/xilinx_zynqmp_zcu100.h +0 -15
@@ -9,21 +9,6 @@#ifndef __CONFIG_ZYNQMP_ZCU100_H#define __CONFIG_ZYNQMP_ZCU100_H -/* FIXME Will go away soon */ -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 9 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } -#include <configs/xilinx_zynqmp.h> #endif /* __CONFIG_ZYNQMP_ZCU100_H */
include/configs/xilinx_zynqmp_zcu102.h +0 -29
@@ -10,35 +10,6 @@#define __CONFIG_ZYNQMP_ZCU102_H#define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 18 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 -#define CONFIG_SPD_EEPROM #define CONFIG_DDR_SPD
include/configs/xilinx_zynqmp_zcu104.h +0 -17
@@ -10,23 +10,6 @@#define __CONFIG_ZYNQMP_ZCU104_H#define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 9 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 5} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 6} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1#include <configs/xilinx_zynqmp.h>
include/configs/xilinx_zynqmp_zcu104_revC.h +0 -3
@@ -11,7 +11,4 @@#include <configs/xilinx_zynqmp_zcu104.h> -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 -#define CONFIG_ZYNQ_EEPROM_BUS 1 -#endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */
include/configs/xilinx_zynqmp_zcu106.h +0 -28
@@ -10,34 +10,6 @@#define __CONFIG_ZYNQMP_ZCU106_H#define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 18 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54#include <configs/xilinx_zynqmp.h>
include/configs/xilinx_zynqmp_zcu111.h +0 -31
@@ -10,37 +10,6 @@#define __CONFIG_ZYNQMP_ZCU111_H#define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 21 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 3} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54#include <configs/xilinx_zynqmp.h>
Signature · 1 line
1.9.1
PATCH v2 4/7 arm64: zynqmp: Switch all platfroms to DM_I2C
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 28 lines
CONFIG_PCA953Xis not needed because of PCA953X is integrated in gpio subsystem already. That's why also removeCMD_PCA953Xwhich is only for this driver.zcu102/zcu104-revC/zcu106/zcu111 contain links to eeprom which stores MAC address.
DM_I2Cis not enabled for the whole SoC because it increase size for mini configurations and there is no I2C symbol present to setup dependencies.Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
arch/arm/dts/zynqmp-zcu102-revA.dts | 1 + arch/arm/dts/zynqmp-zcu104-revC.dts | 1 + arch/arm/dts/zynqmp-zcu106-revA.dts | 1 + arch/arm/dts/zynqmp-zcu111-revA.dts | 1 + configs/avnet_ultra96_rev1_defconfig | 6 ++++-- configs/xilinx_zynqmp_zcu100_revC_defconfig | 6 ++++-- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 12 ++++++----- configs/xilinx_zynqmp_zcu102_revA_defconfig | 13 ++++++----- configs/xilinx_zynqmp_zcu102_revB_defconfig | 13 ++++++----- configs/xilinx_zynqmp_zcu104_revA_defconfig | 11 ++++++---- configs/xilinx_zynqmp_zcu104_revC_defconfig | 11 ++++++---- configs/xilinx_zynqmp_zcu106_revA_defconfig | 12 ++++++----- configs/xilinx_zynqmp_zcu111_revA_defconfig | 12 ++++++-----
Quoted 8 lines
include/configs/xilinx_zynqmp.h | 5 ----- include/configs/xilinx_zynqmp_zcu100.h | 15 ------------- include/configs/xilinx_zynqmp_zcu102.h | 29 ------------------------- include/configs/xilinx_zynqmp_zcu104.h | 17 --------------- include/configs/xilinx_zynqmp_zcu104_revC.h | 3 --- include/configs/xilinx_zynqmp_zcu106.h | 28 ------------------------ include/configs/xilinx_zynqmp_zcu111.h | 31 --------------------------- 20 files changed, 63 insertions(+), 165 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 5/7 arm64: zynqmp: Remove addresses for i2c controllers
In reply to Michal SimekAll platforms have been converted to DM that's why there is no reason to keep addresses in headers. They are all read from DT now.
---
Changes in v2: None
arch/arm/mach-zynqmp/include/mach/hardware.h | 3 --- 1 file changed, 3 deletions(-)
arch/arm/mach-zynqmp/include/mach/hardware.h +0 -3
@@ -7,9 +7,6 @@#ifndef _ASM_ARCH_HARDWARE_H#define _ASM_ARCH_HARDWARE_H -#define ZYNQ_I2C_BASEADDR0 0xFF020000 -#define ZYNQ_I2C_BASEADDR1 0xFF030000 -#define ARASAN_NAND_BASEADDR 0xFF100000#define ZYNQMP_TCM_BASE_ADDR 0xFFE00000
Signature · 1 line
1.9.1
PATCH v2 5/7 arm64: zynqmp: Remove addresses for i2c controllers
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 10 lines
All platforms have been converted to DM that's why there is no reason to keep addresses in headers. They are all read from DT now.
Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
arch/arm/mach-zynqmp/include/mach/hardware.h | 3 --- 1 file changed, 3 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 6/7 i2c: Remove ancient zynq_i2c driver
In reply to Michal SimekThis driver is replaced by drivers/i2c/i2c-cdns.c DM based driver.
---
Changes in v2: None
README | 5 - drivers/i2c/Kconfig | 33 ------ drivers/i2c/Makefile | 1 - drivers/i2c/zynq_i2c.c | 313 ------------------------------------------------- 4 files changed, 352 deletions(-) delete mode 100644 drivers/i2c/zynq_i2c.c
README +0 -5
@@ -1696,11 +1696,6 @@ The following options need to be configured: - CONFIG_SYS_OMAP24_I2C_SPEED4 speed channel 4 - CONFIG_SYS_OMAP24_I2C_SLAVE4 slave addr channel 4 - - drivers/i2c/zynq_i2c.c - - activate this driver with CONFIG_SYS_I2C_ZYNQ - - set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting - - set CONFIG_SYS_I2C_ZYNQ_SLAVE for slave addr - - drivers/i2c/s3c24x0_i2c.c: - activate this driver with CONFIG_SYS_I2C_S3C24X0 - This driver adds i2c buses (11 for Exynos5250, Exynos5420
drivers/i2c/Kconfig +0 -33
@@ -456,39 +456,6 @@ config SYS_I2C_XILINX_XIIC help Support for Xilinx AXI I2C controller. -config SYS_I2C_ZYNQ - bool "Xilinx I2C driver" - depends on ARCH_ZYNQMP || ARCH_ZYNQ - depends on !DM_I2C - help - Support for Xilinx I2C controller. - -config SYS_I2C_ZYNQ_SLAVE - hex "Set slave addr" - depends on SYS_I2C_ZYNQ - default 0 - help - Set CONFIG_SYS_I2C_ZYNQ_SLAVE for slave addr. - -config SYS_I2C_ZYNQ_SPEED - int "Set I2C speed" - depends on SYS_I2C_ZYNQ - default 100000 - help - Set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting. - -config ZYNQ_I2C0 - bool "Xilinx I2C0 controller" - depends on SYS_I2C_ZYNQ - help - Enable Xilinx I2C0 controller. - -config ZYNQ_I2C1 - bool "Xilinx I2C1 controller" - depends on SYS_I2C_ZYNQ - help - Enable Xilinx I2C1 controller. - config SYS_I2C_IHS bool "gdsys IHS I2C driver" depends on DM_I2C
drivers/i2c/Makefile +0 -1
@@ -38,7 +38,6 @@ obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_SYS_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_SYS_I2C_XILINX_XIIC) += xilinx_xiic.o -obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o obj-$(CONFIG_TEGRA186_BPMP_I2C) += tegra186_bpmp_i2c.o obj-$(CONFIG_I2C_MUX) += muxes/
drivers/i2c/zynq_i2c.c deleted +0 -313
313 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 6/7 i2c: Remove ancient zynq_i2c driver
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 5 lines
This driver is replaced by
drivers/i2c/i2c-cdns.cDM based driver.Signed-off-by Michal Simek <[email protected]>---
Quoted 8 lines
Changes in v2: None
README | 5 - drivers/i2c/Kconfig | 33 ------ drivers/i2c/Makefile | 1 - drivers/i2c/zynq_i2c.c | 313 ------------------------------------------------- 4 files changed, 352 deletions(-)delete mode 100644
drivers/i2c/zynq_i2c.c
Hmm.. this patchseries depends on
[1] https://lists.denx.de/pipermail/u-boot/2019-January/357172.html
which is in my ToDo list ... but I want to wait there for Simons review ... so may it takes some time until [1] goes into mainline.
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 7/7 xilinx: common: Remove !DM_i2C code for reading mac from eeprom
In reply to Michal SimekAll platforms are converted to DM_I2C that's why there is no reason to keep this code here.
---
Changes in v2:
- Add dependency
board/xilinx/common/board.c | 19 ------------------- configs/zynq_zybo_defconfig | 1 - drivers/misc/Kconfig | 1 + 3 files changed, 1 insertion(+), 20 deletions(-)
board/xilinx/common/board.c +0 -19
@@ -8,24 +8,6 @@#include <dm/uclass.h> #include <i2c.h> -#if !defined(CONFIG_DM_I2C ) -int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) -{ -#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR ) && \ - defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) && \ - defined(CONFIG_ZYNQ_EEPROM_BUS ) -i2c_set_bus_num (CONFIG_ZYNQ_EEPROM_BUS ); - -if (eeprom_read (CONFIG_ZYNQ_GEM_EEPROM_ADDR , -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , - ethaddr,6 )) -printf ("I2C EEPROM MAC address read failed\n" ); -#endif - -return 0 ; -} - -#else int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) {int ret = -EINVAL ;
@@ -54,4 +36,3 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)return ret; } -#endif
configs/zynq_zybo_defconfig +0 -1
@@ -39,7 +39,6 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y
drivers/misc/Kconfig +1 -0
@@ -245,6 +245,7 @@ config SPL_I2C_EEPROM config ZYNQ_GEM_I2C_MAC_OFFSET hex "Set the I2C MAC offset" default 0x0 + depends on DM_I2C help Set the MAC offset for i2C.
Signature · 1 line
1.9.1
PATCH v2 7/7 xilinx: common: Remove !DM_i2C code for reading mac from eeprom
Hello Michal,
Am 05.02.2019 um 10:55 schrieb Michal Simek:
Quoted 6 lines
All platforms are converted to
DM_I2Cthat's why there is no reason to keep this code here.Signed-off-by Michal Simek <[email protected]>---
Quoted 7 lines
Changes in v2:
- Add dependencyboard/xilinx/common/board.c | 19 ------------------- configs/zynq_zybo_defconfig | 1 - drivers/misc/Kconfig | 1 + 3 files changed, 1 insertion(+), 20 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de