Skip to contentSkip to conversation

i2c: Moved i2c u-boot headers to Kconfig

PATCH New Vipul Kumar 3 participants 11 messages Feb 16, 2018 – Feb 26, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover i2c: Moved i2c u-boot headers to Kconfig

This series of patch moved i2c u-boot headers to
the Kconfig and enabled in respective defconfig.

These are the configs:
-CONFIG_SYS_I2C_ZYNQ
-CONFIG_SYS_I2C_ZYNQ_SLAVE
-CONFIG_SYS_I2C_ZYNQ_SPEED
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
-CONFIG_ZYNQ_I2C0
-CONFIG_ZYNQ_I2C1

Vipul Kumar (6):
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ
i2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED
i2c: Added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

 configs/syzygy_hub_defconfig                  |  3 +++
 configs/topic_miami_defconfig                 |  3 +++
 configs/topic_miamilite_defconfig             |  3 +++
 configs/topic_miamiplus_defconfig             |  3 +++
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig |  4 ++++
 configs/xilinx_zynqmp_zcu102_revA_defconfig   |  4 ++++
 configs/xilinx_zynqmp_zcu102_revB_defconfig   |  4 ++++
 configs/zynq_zc702_defconfig                  |  2 ++
 configs/zynq_zc706_defconfig                  |  2 ++
 configs/zynq_zybo_defconfig                   |  4 ++++
 drivers/i2c/Kconfig                           | 30 +++++++++++++++++++++++++++
 drivers/misc/Kconfig                          |  6 ++++++
 include/configs/syzygy_hub.h                  |  2 --
 include/configs/topic_miami.h                 |  2 --
 include/configs/xilinx_zynqmp.h               |  2 --
 include/configs/xilinx_zynqmp_zcu102.h        |  4 ----
 include/configs/zynq-common.h                 |  6 ------
 include/configs/zynq_zc70x.h                  |  1 -
 include/configs/zynq_zybo.h                   |  3 ---
 19 files changed, 68 insertions(+), 20 deletions(-)

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#1 lore raw

PATCH 1/6 i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ.

---
 drivers/i2c/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/i2c/Kconfig +6 -0
index 7dbec77..62d134c 100644
@@ -268,6 +268,12 @@ config SYS_I2C_BUS_MAX
        help
          Define the maximum number of available I2C buses.
 
+config SYS_I2C_ZYNQ
+       bool "Xilinx I2C driver"
+       depends on ARCH_ZYNQMP || ARCH_ZYNQ || ZYNQ_I2C0 || ZYNQ_I2C1
+       help
+         Support for Xilinx I2C controller.
+
 config SYS_I2C_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#2 lore raw

PATCH 1/6 i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ

Hello Vipul,

Am 16.02.2018 um 14:37 schrieb Vipul Kumar:

Quoted 7 lines

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ.

---
  drivers/i2c/Kconfig | 6 ++++++
  1 file changed, 6 insertions(+)

Your patch does not apply to current mainline, see my tbot testresult from this night:

http://xeidos.ddns.net/tbot/id_647/tbot.txt
(search for "2018-02-20 02:42:15,870")

Or in the "nice log":
http://xeidos.ddns.net/tbot/id_647/html_log.html
(at the end, unfold the "control" fields ...

Could you rebase and resend your series?

Beside of this your patchset looks good for me, you can add my

Thanks!

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
#3 lore raw

PATCH 1/6 i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ

In reply to Vipul Kumar
Quoted 13 lines · Vipul Kumar

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ.

---
 drivers/i2c/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/i2c/Kconfig +0 -0
index 7dbec77..62d134c 100644

drivers/i2c/Kconfig config SYS_I2C_BUS_MAX · line 273

Quoted 6 lines
drivers/i2c/Kconfig +3 -0
@@ -268,6 +268,12 @@ config SYS_I2C_BUS_MAX
 	help
 	  Define the maximum number of available I2C buses.
 
+config SYS_I2C_ZYNQ
+	bool "Xilinx I2C driver"
+	depends on ARCH_ZYNQMP || ARCH_ZYNQ || ZYNQ_I2C0 || ZYNQ_I2C1

This can't depend on non existing symbol but I have fixed it myself and applied.

M

Quoted 7 lines
drivers/i2c/Kconfig +3 -0
+	help
+	  Support for Xilinx I2C controller.
+
 config SYS_I2C_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C
#4 lore raw

PATCH 2/6 i2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig

In reply to Vipul Kumar

This patch enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig.

---
 configs/syzygy_hub_defconfig                  | 1 +
 configs/topic_miami_defconfig                 | 1 +
 configs/topic_miamilite_defconfig             | 1 +
 configs/topic_miamiplus_defconfig             | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 1 +
 configs/zynq_zc702_defconfig                  | 1 +
 configs/zynq_zc706_defconfig                  | 1 +
 configs/zynq_zybo_defconfig                   | 1 +
 include/configs/xilinx_zynqmp_zcu102.h        | 1 -
 include/configs/zynq-common.h                 | 4 ----
 12 files changed, 10 insertions(+), 5 deletions(-)
configs/syzygy_hub_defconfig +1 -0
index 996ecdb..334b840 100644
@@ -34,6 +34,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
configs/topic_miami_defconfig +1 -0
index d5929a1..bd8eff7 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/topic_miamilite_defconfig +1 -0
index a318e50..dcf8f47 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/topic_miamiplus_defconfig +1 -0
index 7281f7b..4f771f0 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index d0a1467..12a0d64 100644
@@ -53,6 +53,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index ecefb00..b6e8a0e 100644
@@ -53,6 +53,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index c2add99..c5bc4cd 100644
@@ -53,6 +53,7 @@ CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
configs/zynq_zc702_defconfig +1 -0
index 878bc79..b20744a 100644
@@ -40,6 +40,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zc706_defconfig +1 -0
index 7b2e072..882150f 100644
@@ -40,6 +40,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zybo_defconfig +1 -0
index 138b249..4e3d6c5 100644
@@ -39,6 +39,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
+CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
include/configs/xilinx_zynqmp_zcu102.h +0 -1
index 85f78ba..88819c6 100644
@@ -36,7 +36,6 @@
                                {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \
                                }
 
-#define CONFIG_SYS_I2C_ZYNQ
 #define CONFIG_PCA953X
 
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
include/configs/zynq-common.h +0 -4
index 2dfac6f..b47a9ad 100644
@@ -120,10 +120,6 @@
 # define DFU_ALT_INFO
 #endif
 
-#if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
-#define CONFIG_SYS_I2C_ZYNQ
-#endif
-
 /* I2C */
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_SYS_I2C

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#5 lore raw

PATCH 3/6 i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE

In reply to Vipul Kumar

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE and set it default to 0.

---
 drivers/i2c/Kconfig             | 7 +++++++
 include/configs/xilinx_zynqmp.h | 1 -
 include/configs/zynq-common.h   | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/i2c/Kconfig +7 -0
index 62d134c..f4871d8 100644
@@ -274,6 +274,13 @@ config SYS_I2C_ZYNQ
        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_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C
include/configs/xilinx_zynqmp.h +0 -1
index 5533831..c81eb28 100644
@@ -142,7 +142,6 @@
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_SYS_I2C
 # define CONFIG_SYS_I2C_ZYNQ_SPEED             100000
-# define CONFIG_SYS_I2C_ZYNQ_SLAVE             0
 #endif
 
 /* EEPROM */
include/configs/zynq-common.h +0 -1
index b47a9ad..c879bfa 100644
@@ -124,7 +124,6 @@
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_SYS_I2C
 # define CONFIG_SYS_I2C_ZYNQ_SPEED             100000
-# define CONFIG_SYS_I2C_ZYNQ_SLAVE             0
 #endif
 
 /* EEPROM */

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#6 lore raw

PATCH 4/6 i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED

In reply to Vipul Kumar

This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED and set it to default value 100000.

---
 drivers/i2c/Kconfig             | 7 +++++++
 include/configs/xilinx_zynqmp.h | 1 -
 include/configs/zynq-common.h   | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/i2c/Kconfig +7 -0
index f4871d8..dc2ffd1 100644
@@ -281,6 +281,13 @@ config SYS_I2C_ZYNQ_SLAVE
        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 SYS_I2C_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C
include/configs/xilinx_zynqmp.h +0 -1
index c81eb28..88ecf38 100644
@@ -141,7 +141,6 @@
 /* I2C */
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_SYS_I2C
-# define CONFIG_SYS_I2C_ZYNQ_SPEED             100000
 #endif
 
 /* EEPROM */
include/configs/zynq-common.h +0 -1
index c879bfa..4452919 100644
@@ -123,7 +123,6 @@
 /* I2C */
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_SYS_I2C
-# define CONFIG_SYS_I2C_ZYNQ_SPEED             100000
 #endif
 
 /* EEPROM */

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#7 lore raw

PATCH 5/6 i2c: Added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET

In reply to Vipul Kumar

This patch added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET and enabled it in respective defconfig.

---
 configs/syzygy_hub_defconfig                  | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 1 +
 configs/zynq_zybo_defconfig                   | 1 +
 drivers/misc/Kconfig                          | 6 ++++++
 include/configs/syzygy_hub.h                  | 1 -
 include/configs/xilinx_zynqmp_zcu102.h        | 1 -
 include/configs/zynq_zybo.h                   | 1 -
 9 files changed, 11 insertions(+), 3 deletions(-)
configs/syzygy_hub_defconfig +1 -0
index 334b840..8454a19 100644
@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index 12a0d64..02cd710 100644
@@ -55,6 +55,7 @@ CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
 CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index b6e8a0e..9176e8e 100644
@@ -55,6 +55,7 @@ CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
 CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index c5bc4cd..3c2a865 100644
@@ -55,6 +55,7 @@ CONFIG_DM_GPIO=y
 CONFIG_CMD_PCA953X=y
 CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/zynq_zybo_defconfig +1 -0
index 4e3d6c5..dab98d8 100644
@@ -40,6 +40,7 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
drivers/misc/Kconfig +6 -0
index f1c15cb..d774569 100644
@@ -214,6 +214,12 @@ config SPL_I2C_EEPROM
          This option is an SPL-variant of the I2C_EEPROM option.
          See the help of I2C_EEPROM for details.
 
+config ZYNQ_GEM_I2C_MAC_OFFSET
+       hex "Set the I2C MAC offset"
+       default 0x0
+       help
+         Set the MAC offset for i2C.
+
 if I2C_EEPROM
 
 config SYS_I2C_EEPROM_ADDR
include/configs/syzygy_hub.h +0 -1
index 4147b45..19e201f 100644
@@ -14,7 +14,6 @@
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x57
-#define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA
 
 #define CONFIG_EXTRA_ENV_SETTINGS       \
        "fit_image=fit.itb\0"           \
include/configs/xilinx_zynqmp_zcu102.h +0 -1
index 88819c6..0095f61 100644
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_EEPROM_BUS         5
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x54
-#define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0x20
 
 #include <configs/xilinx_zynqmp.h>
 
include/configs/zynq_zybo.h +0 -1
index 808967c..a589c92 100644
@@ -15,7 +15,6 @@
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x50
-#define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA
 #define CONFIG_DISPLAY
 #define CONFIG_I2C_EDID
 

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#8 lore raw

PATCH 6/6 i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

In reply to Vipul Kumar

This patch added Kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1 and enabled it in respective defconfig.

---
 configs/syzygy_hub_defconfig                  |  1 +
 configs/topic_miami_defconfig                 |  2 ++
 configs/topic_miamilite_defconfig             |  2 ++
 configs/topic_miamiplus_defconfig             |  2 ++
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig |  2 ++
 configs/xilinx_zynqmp_zcu102_revA_defconfig   |  2 ++
 configs/xilinx_zynqmp_zcu102_revB_defconfig   |  2 ++
 configs/zynq_zc702_defconfig                  |  1 +
 configs/zynq_zc706_defconfig                  |  1 +
 configs/zynq_zybo_defconfig                   |  2 ++
 drivers/i2c/Kconfig                           | 10 ++++++++++
 include/configs/syzygy_hub.h                  |  1 -
 include/configs/topic_miami.h                 |  2 --
 include/configs/xilinx_zynqmp_zcu102.h        |  2 --
 include/configs/zynq_zc70x.h                  |  1 -
 include/configs/zynq_zybo.h                   |  2 --
 16 files changed, 27 insertions(+), 8 deletions(-)
configs/syzygy_hub_defconfig +1 -0
index 8454a19..78815cc 100644
@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C1=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/topic_miami_defconfig +2 -0
index bd8eff7..d18d5ae 100644
@@ -32,6 +32,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/topic_miamilite_defconfig +2 -0
index dcf8f47..3a3c47a 100644
@@ -32,6 +32,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/topic_miamiplus_defconfig +2 -0
index 4f771f0..8363838 100644
@@ -30,6 +30,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +2 -0
index 02cd710..1df5b0b 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +2 -0
index 9176e8e..c8a8362 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +2 -0
index 3c2a865..8f85b5f 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/zynq_zc702_defconfig +1 -0
index b20744a..7783467 100644
@@ -41,6 +41,7 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C0=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zc706_defconfig +1 -0
index 882150f..4d15ab3 100644
@@ -41,6 +41,7 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C0=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zybo_defconfig +2 -0
index dab98d8..bdd2c60 100644
@@ -40,6 +40,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
drivers/i2c/Kconfig +10 -0
index dc2ffd1..946b8ae 100644
@@ -288,6 +288,16 @@ config SYS_I2C_ZYNQ_SPEED
        help
          Set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting.
 
+config ZYNQ_I2C0
+       bool "Xilinx I2C0 controller"
+       help
+         Enable Xilinx I2C0 controller.
+
+config ZYNQ_I2C1
+       bool "Xilinx I2C1 controller"
+       help
+         Enable Xilinx I2C1 controller.
+
 config SYS_I2C_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C
include/configs/syzygy_hub.h +0 -1
index 19e201f..73c9189 100644
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_SYZYGY_HUB_H
 #define __CONFIG_SYZYGY_HUB_H
 
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x57
 
include/configs/topic_miami.h +0 -2
index 400a7fc..0dfdafb 100644
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_TOPIC_MIAMI_H
 #define __CONFIG_TOPIC_MIAMI_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 
 /* Speed up boot time by ignoring the environment which we never used */
 
include/configs/xilinx_zynqmp_zcu102.h +0 -2
index 0095f61..27d9d6a 100644
@@ -11,8 +11,6 @@
 #define __CONFIG_ZYNQMP_ZCU102_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_MAX_HOPS                1
 #define CONFIG_SYS_NUM_I2C_BUSES       18
 #define CONFIG_SYS_I2C_BUSES   { \
include/configs/zynq_zc70x.h +0 -1
index fc46fec..720f953 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
-#define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
 
 #include <configs/zynq-common.h>
include/configs/zynq_zybo.h +0 -2
index a589c92..8f4e088 100644
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_ZYNQ_ZYBO_H
 #define __CONFIG_ZYNQ_ZYBO_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x50
 #define CONFIG_DISPLAY

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#9 lore raw

PATCH 6/6 i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

Quoted 158 lines · Vipul Kumar

This patch added Kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1 and enabled it in respective defconfig.

---
 configs/syzygy_hub_defconfig                  |  1 +
 configs/topic_miami_defconfig                 |  2 ++
 configs/topic_miamilite_defconfig             |  2 ++
 configs/topic_miamiplus_defconfig             |  2 ++
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig |  2 ++
 configs/xilinx_zynqmp_zcu102_revA_defconfig   |  2 ++
 configs/xilinx_zynqmp_zcu102_revB_defconfig   |  2 ++
 configs/zynq_zc702_defconfig                  |  1 +
 configs/zynq_zc706_defconfig                  |  1 +
 configs/zynq_zybo_defconfig                   |  2 ++
 drivers/i2c/Kconfig                           | 10 ++++++++++
 include/configs/syzygy_hub.h                  |  1 -
 include/configs/topic_miami.h                 |  2 --
 include/configs/xilinx_zynqmp_zcu102.h        |  2 --
 include/configs/zynq_zc70x.h                  |  1 -
 include/configs/zynq_zybo.h                   |  2 --
 16 files changed, 27 insertions(+), 8 deletions(-)
configs/syzygy_hub_defconfig +1 -0
index 8454a19..78815cc 100644
@@ -35,6 +35,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C1=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/topic_miami_defconfig +2 -0
index bd8eff7..d18d5ae 100644
@@ -32,6 +32,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/topic_miamilite_defconfig +2 -0
index dcf8f47..3a3c47a 100644
@@ -32,6 +32,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/topic_miamiplus_defconfig +2 -0
index 4f771f0..8363838 100644
@@ -30,6 +30,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +2 -0
index 02cd710..1df5b0b 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +2 -0
index 9176e8e..c8a8362 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +2 -0
index 3c2a865..8f85b5f 100644
@@ -54,6 +54,8 @@ 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_MISC=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
configs/zynq_zc702_defconfig +1 -0
index b20744a..7783467 100644
@@ -41,6 +41,7 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C0=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zc706_defconfig +1 -0
index 882150f..4d15ab3 100644
@@ -41,6 +41,7 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
+CONFIG_ZYNQ_I2C0=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/zynq_zybo_defconfig +2 -0
index dab98d8..bdd2c60 100644
@@ -40,6 +40,8 @@ CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=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
drivers/i2c/Kconfig +0 -0
index dc2ffd1..946b8ae 100644
@@ -288,6 +288,16 @@ config SYS_I2C_ZYNQ_SPEED
 	help
 	  Set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting.

drivers/i2c/Kconfig config SYS_I2C_ZYNQ_SPEED · line 299

Quoted 10 lines
drivers/i2c/Kconfig +9 -0
 
+config ZYNQ_I2C0
+	bool "Xilinx I2C0 controller"
+	help
+	  Enable Xilinx I2C0 controller.
+
+config ZYNQ_I2C1
+	bool "Xilinx I2C1 controller"
+	help
+	  Enable Xilinx I2C1 controller.

Both depends on SYS_I2C_ZYNQ. I have added this dependency and applied.

M

Quoted 68 lines
drivers/i2c/Kconfig +1 -0
+
 config SYS_I2C_IHS
         bool "gdsys IHS I2C driver"
         depends on DM_I2C
include/configs/syzygy_hub.h +0 -1
index 19e201f..73c9189 100644
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_SYZYGY_HUB_H
 #define __CONFIG_SYZYGY_HUB_H
 
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x57
 
include/configs/topic_miami.h +0 -2
index 400a7fc..0dfdafb 100644
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_TOPIC_MIAMI_H
 #define __CONFIG_TOPIC_MIAMI_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 
 /* Speed up boot time by ignoring the environment which we never used */
 
include/configs/xilinx_zynqmp_zcu102.h +0 -2
index 0095f61..27d9d6a 100644
@@ -11,8 +11,6 @@
 #define __CONFIG_ZYNQMP_ZCU102_H
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_MAX_HOPS		1
 #define CONFIG_SYS_NUM_I2C_BUSES	18
 #define CONFIG_SYS_I2C_BUSES	{ \
include/configs/zynq_zc70x.h +0 -1
index fc46fec..720f953 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
-#define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
 
 #include <configs/zynq-common.h>
include/configs/zynq_zybo.h +0 -2
index a589c92..8f4e088 100644
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_ZYNQ_ZYBO_H
 #define __CONFIG_ZYNQ_ZYBO_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR	0x50
 #define CONFIG_DISPLAY
#10 lore raw

cover i2c: Moved i2c u-boot headers to Kconfig

In reply to Vipul Kumar
Quoted 31 lines · Vipul Kumar

This series of patch moved i2c u-boot headers to
the Kconfig and enabled in respective defconfig.

These are the configs:

(quoted diff) +0 -6
-CONFIG_SYS_I2C_ZYNQ
-CONFIG_SYS_I2C_ZYNQ_SLAVE
-CONFIG_SYS_I2C_ZYNQ_SPEED
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
-CONFIG_ZYNQ_I2C0
-CONFIG_ZYNQ_I2C1

Vipul Kumar (6):
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ
i2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE
i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED
i2c: Added Kconfig support for CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

 configs/syzygy_hub_defconfig                  |  3 +++
 configs/topic_miami_defconfig                 |  3 +++
 configs/topic_miamilite_defconfig             |  3 +++
 configs/topic_miamiplus_defconfig             |  3 +++
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig |  4 ++++
 configs/xilinx_zynqmp_zcu102_revA_defconfig   |  4 ++++
 configs/xilinx_zynqmp_zcu102_revB_defconfig   |  4 ++++
 configs/zynq_zc702_defconfig                  |  2 ++
 configs/zynq_zc706_defconfig                  |  2 ++
 configs/zynq_zybo_defconfig                   |  4 ++++
 drivers/i2c/Kconfig                           | 30 +++++++++++++++++++++++++++
 drivers/misc/Kconfig                          |  6 ++++++
Quoted 9 lines
 include/configs/syzygy_hub.h                  |  2 --
 include/configs/topic_miami.h                 |  2 --
 include/configs/xilinx_zynqmp.h               |  2 --
 include/configs/xilinx_zynqmp_zcu102.h        |  4 ----
 include/configs/zynq-common.h                 |  6 ------
 include/configs/zynq_zc70x.h                  |  1 -
 include/configs/zynq_zybo.h                   |  3 ---
 19 files changed, 68 insertions(+), 20 deletions(-)

Applied the whole series with two fixes.

Thanks,
Michal