Commit e885b4255f88d83461cf5a15b5a5782050687242

Authored by Vipul Kumar
Committed by Michal Simek
1 parent 5c32de202b

i2c: Added kconfig support for CONFIG_ZYNQ_I2C0 and CONFIG_ZYNQ_I2C1

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

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 16 changed files with 29 additions and 8 deletions Side-by-side Diff

configs/syzygy_hub_defconfig
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_FPGA_ZYNQPL=y
37 37 CONFIG_DM_GPIO=y
38 38 CONFIG_SYS_I2C_ZYNQ=y
  39 +CONFIG_ZYNQ_I2C1=y
39 40 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
40 41 CONFIG_MMC_SDHCI=y
41 42 CONFIG_MMC_SDHCI_ZYNQ=y
configs/topic_miami_defconfig
... ... @@ -33,6 +33,8 @@
33 33 CONFIG_FPGA_ZYNQPL=y
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_SYS_I2C_ZYNQ=y
  36 +CONFIG_ZYNQ_I2C0=y
  37 +CONFIG_ZYNQ_I2C1=y
36 38 CONFIG_MMC_SDHCI=y
37 39 CONFIG_MMC_SDHCI_ZYNQ=y
38 40 CONFIG_SPI_FLASH=y
configs/topic_miamilite_defconfig
... ... @@ -33,6 +33,8 @@
33 33 CONFIG_FPGA_ZYNQPL=y
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_SYS_I2C_ZYNQ=y
  36 +CONFIG_ZYNQ_I2C0=y
  37 +CONFIG_ZYNQ_I2C1=y
36 38 CONFIG_MMC_SDHCI=y
37 39 CONFIG_MMC_SDHCI_ZYNQ=y
38 40 CONFIG_SPI_FLASH=y
configs/topic_miamiplus_defconfig
... ... @@ -31,6 +31,8 @@
31 31 CONFIG_FPGA_ZYNQPL=y
32 32 CONFIG_DM_GPIO=y
33 33 CONFIG_SYS_I2C_ZYNQ=y
  34 +CONFIG_ZYNQ_I2C0=y
  35 +CONFIG_ZYNQ_I2C1=y
34 36 CONFIG_MMC_SDHCI=y
35 37 CONFIG_MMC_SDHCI_ZYNQ=y
36 38 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
... ... @@ -54,6 +54,8 @@
54 54 CONFIG_DM_GPIO=y
55 55 CONFIG_CMD_PCA953X=y
56 56 CONFIG_SYS_I2C_ZYNQ=y
  57 +CONFIG_ZYNQ_I2C0=y
  58 +CONFIG_ZYNQ_I2C1=y
57 59 CONFIG_MISC=y
58 60 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
59 61 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revA_defconfig
... ... @@ -54,6 +54,8 @@
54 54 CONFIG_DM_GPIO=y
55 55 CONFIG_CMD_PCA953X=y
56 56 CONFIG_SYS_I2C_ZYNQ=y
  57 +CONFIG_ZYNQ_I2C0=y
  58 +CONFIG_ZYNQ_I2C1=y
57 59 CONFIG_MISC=y
58 60 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
59 61 CONFIG_DM_MMC=y
configs/xilinx_zynqmp_zcu102_revB_defconfig
... ... @@ -54,6 +54,8 @@
54 54 CONFIG_DM_GPIO=y
55 55 CONFIG_CMD_PCA953X=y
56 56 CONFIG_SYS_I2C_ZYNQ=y
  57 +CONFIG_ZYNQ_I2C0=y
  58 +CONFIG_ZYNQ_I2C1=y
57 59 CONFIG_MISC=y
58 60 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
59 61 CONFIG_DM_MMC=y
configs/zynq_zc702_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_FPGA_ZYNQPL=y
43 43 CONFIG_DM_GPIO=y
44 44 CONFIG_SYS_I2C_ZYNQ=y
  45 +CONFIG_ZYNQ_I2C0=y
45 46 CONFIG_MMC_SDHCI=y
46 47 CONFIG_MMC_SDHCI_ZYNQ=y
47 48 CONFIG_SPI_FLASH=y
configs/zynq_zc706_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_FPGA_ZYNQPL=y
43 43 CONFIG_DM_GPIO=y
44 44 CONFIG_SYS_I2C_ZYNQ=y
  45 +CONFIG_ZYNQ_I2C0=y
45 46 CONFIG_MMC_SDHCI=y
46 47 CONFIG_MMC_SDHCI_ZYNQ=y
47 48 CONFIG_SPI_FLASH=y
configs/zynq_zybo_defconfig
... ... @@ -41,6 +41,8 @@
41 41 CONFIG_FPGA_ZYNQPL=y
42 42 CONFIG_DM_GPIO=y
43 43 CONFIG_SYS_I2C_ZYNQ=y
  44 +CONFIG_ZYNQ_I2C0=y
  45 +CONFIG_ZYNQ_I2C1=y
44 46 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
45 47 CONFIG_MMC_SDHCI=y
46 48 CONFIG_MMC_SDHCI_ZYNQ=y
... ... @@ -288,6 +288,18 @@
288 288 help
289 289 Set CONFIG_SYS_I2C_ZYNQ_SPEED for speed setting.
290 290  
  291 +config ZYNQ_I2C0
  292 + bool "Xilinx I2C0 controller"
  293 + depends on SYS_I2C_ZYNQ
  294 + help
  295 + Enable Xilinx I2C0 controller.
  296 +
  297 +config ZYNQ_I2C1
  298 + bool "Xilinx I2C1 controller"
  299 + depends on SYS_I2C_ZYNQ
  300 + help
  301 + Enable Xilinx I2C1 controller.
  302 +
291 303 config SYS_I2C_IHS
292 304 bool "gdsys IHS I2C driver"
293 305 depends on DM_I2C
include/configs/syzygy_hub.h
... ... @@ -11,7 +11,6 @@
11 11 #ifndef __CONFIG_SYZYGY_HUB_H
12 12 #define __CONFIG_SYZYGY_HUB_H
13 13  
14   -#define CONFIG_ZYNQ_I2C1
15 14 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
16 15 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57
17 16  
include/configs/topic_miami.h
... ... @@ -10,8 +10,6 @@
10 10 #ifndef __CONFIG_TOPIC_MIAMI_H
11 11 #define __CONFIG_TOPIC_MIAMI_H
12 12  
13   -#define CONFIG_ZYNQ_I2C0
14   -#define CONFIG_ZYNQ_I2C1
15 13  
16 14 /* Speed up boot time by ignoring the environment which we never used */
17 15  
include/configs/xilinx_zynqmp_zcu102.h
... ... @@ -11,8 +11,6 @@
11 11 #define __CONFIG_ZYNQMP_ZCU102_H
12 12  
13 13 #define CONFIG_ZYNQ_SDHCI1
14   -#define CONFIG_ZYNQ_I2C0
15   -#define CONFIG_ZYNQ_I2C1
16 14 #define CONFIG_SYS_I2C_MAX_HOPS 1
17 15 #define CONFIG_SYS_NUM_I2C_BUSES 18
18 16 #define CONFIG_SYS_I2C_BUSES { \
include/configs/zynq_zc70x.h
... ... @@ -10,7 +10,6 @@
10 10 #ifndef __CONFIG_ZYNQ_ZC70X_H
11 11 #define __CONFIG_ZYNQ_ZC70X_H
12 12  
13   -#define CONFIG_ZYNQ_I2C0
14 13 #define CONFIG_ZYNQ_EEPROM
15 14  
16 15 #include <configs/zynq-common.h>
include/configs/zynq_zybo.h
... ... @@ -11,8 +11,6 @@
11 11 #ifndef __CONFIG_ZYNQ_ZYBO_H
12 12 #define __CONFIG_ZYNQ_ZYBO_H
13 13  
14   -#define CONFIG_ZYNQ_I2C0
15   -#define CONFIG_ZYNQ_I2C1
16 14 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
17 15 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50
18 16 #define CONFIG_DISPLAY