Convert CONFIG_SYS_I2C_DAVINCI to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_I2C_DAVINCI

Signed-off-by: Adam Ford <aford173@gmail.com>
lime2-spi
Adam Ford 6 years ago committed by Tom Rini
parent 9baa2bce28
commit 9f8cf76be2
  1. 1
      configs/da850_am18xxevm_defconfig
  2. 1
      configs/da850evm_defconfig
  3. 1
      configs/da850evm_direct_nor_defconfig
  4. 1
      configs/ea20_defconfig
  5. 1
      configs/k2e_evm_defconfig
  6. 1
      configs/k2e_hs_evm_defconfig
  7. 1
      configs/k2g_evm_defconfig
  8. 1
      configs/k2g_hs_evm_defconfig
  9. 1
      configs/k2hk_evm_defconfig
  10. 1
      configs/k2hk_hs_evm_defconfig
  11. 1
      configs/k2l_evm_defconfig
  12. 1
      configs/k2l_hs_evm_defconfig
  13. 1
      configs/legoev3_defconfig
  14. 1
      configs/omapl138_lcdk_defconfig
  15. 6
      drivers/i2c/Kconfig
  16. 1
      include/configs/da850evm.h
  17. 1
      include/configs/ea20.h
  18. 1
      include/configs/legoev3.h
  19. 1
      include/configs/omapl138_lcdk.h
  20. 1
      include/configs/ti_armv7_keystone2.h
  21. 1
      scripts/config_whitelist.txt

@ -40,6 +40,7 @@ CONFIG_DM=y
CONFIG_DA8XX_GPIO=y CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y CONFIG_DM_I2C_COMPAT=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_MTD_DEVICE=y CONFIG_MTD_DEVICE=y
CONFIG_MTD_PARTITIONS=y CONFIG_MTD_PARTITIONS=y
CONFIG_DM_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y

@ -42,6 +42,7 @@ CONFIG_DM_GPIO=y
CONFIG_DA8XX_GPIO=y CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y CONFIG_DM_I2C_COMPAT=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_MTD_DEVICE=y CONFIG_MTD_DEVICE=y
CONFIG_MTD_PARTITIONS=y CONFIG_MTD_PARTITIONS=y
CONFIG_DM_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y

@ -40,6 +40,7 @@ CONFIG_DM=y
CONFIG_DA8XX_GPIO=y CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y CONFIG_DM_I2C_COMPAT=y
CONFIG_SYS_I2C_DAVINCI=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_DM_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y

@ -31,6 +31,7 @@ CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DA8XX_GPIO=y CONFIG_DA8XX_GPIO=y
CONFIG_SYS_I2C_DAVINCI=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y

@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DM=y CONFIG_DM=y
# CONFIG_BLK is not set # CONFIG_BLK is not set
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y CONFIG_NAND=y

@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_DM=y CONFIG_DM=y
# CONFIG_BLK is not set # CONFIG_BLK is not set
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y CONFIG_NAND=y

@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -27,6 +27,7 @@ CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y

@ -23,6 +23,7 @@ CONFIG_CMD_SPI=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_DIAG=y CONFIG_CMD_DIAG=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y

@ -36,6 +36,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y CONFIG_DM_I2C_COMPAT=y
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

@ -96,6 +96,12 @@ config SYS_I2C_CADENCE
Say yes here to select Cadence I2C Host Controller. This controller is Say yes here to select Cadence I2C Host Controller. This controller is
e.g. used by Xilinx Zynq. e.g. used by Xilinx Zynq.
config SYS_I2C_DAVINCI
bool "Davinci I2C Controller"
depends on (ARCH_KEYSTONE || ARCH_DAVINCI)
help
Say yes here to add support for Davinci and Keystone I2C controller
config SYS_I2C_DW config SYS_I2C_DW
bool "Designware I2C Controller" bool "Designware I2C Controller"
default n default n

@ -138,7 +138,6 @@
* I2C Configuration * I2C Configuration
*/ */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_I2C_DAVINCI
#define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20
#endif #endif

@ -59,7 +59,6 @@
* I2C Configuration * I2C Configuration
*/ */
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_DAVINCI
#define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000
#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */

@ -54,7 +54,6 @@
* I2C Configuration * I2C Configuration
*/ */
#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_DAVINCI
#define CONFIG_SYS_DAVINCI_I2C_SPEED 400000 #define CONFIG_SYS_DAVINCI_I2C_SPEED 400000
#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */

@ -130,7 +130,6 @@
/* /*
* I2C Configuration * I2C Configuration
*/ */
#define CONFIG_SYS_I2C_DAVINCI
#define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 #define CONFIG_SYS_DAVINCI_I2C_SPEED 25000
#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */
#define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20

@ -141,7 +141,6 @@
#define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE #define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE
/* I2C Configuration */ /* I2C Configuration */
#define CONFIG_SYS_I2C_DAVINCI
#define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000
#define CONFIG_SYS_DAVINCI_I2C_SLAVE 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SLAVE 0x10 /* SMBus host address */
#define CONFIG_SYS_DAVINCI_I2C_SPEED1 100000 #define CONFIG_SYS_DAVINCI_I2C_SPEED1 100000

@ -3051,7 +3051,6 @@ CONFIG_SYS_I2C_BASE4
CONFIG_SYS_I2C_BASE5 CONFIG_SYS_I2C_BASE5
CONFIG_SYS_I2C_BUSES CONFIG_SYS_I2C_BUSES
CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_CLK_OFFSET
CONFIG_SYS_I2C_DAVINCI
CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DIRECT_BUS
CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_ADDR
CONFIG_SYS_I2C_DVI_BUS_NUM CONFIG_SYS_I2C_DVI_BUS_NUM

Loading…
Cancel
Save