From 02253d4d12667b99dc7538b0427353a8c8221514 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 12:17:26 +0000 Subject: [PATCH] Kconfig: tegra: Migrate SYS_I2C_TEGRA Migrate SYS_I2C_TEGRA from headers to Kconfig Signed-off-by: Peter Robinson Cc: Tom Warren Cc: Stephen Warren Cc: Heiko Schocher Cc: Marcel Ziswiler Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach Cc: Stefan Agner Cc: Alban Bedel Cc: Allen Martin Signed-off-by: Tom Warren --- configs/apalis-tk1_defconfig | 1 + configs/apalis_t30_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/cei-tk1-som_defconfig | 1 + configs/colibri_t20_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/e2220-1170_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2371-0000_defconfig | 1 + configs/p2371-2180_defconfig | 1 + configs/p2571_defconfig | 1 + configs/p2771-0000-000_defconfig | 1 + configs/p2771-0000-500_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + drivers/i2c/Kconfig | 6 ++++++ include/configs/apalis-tk1.h | 3 --- include/configs/apalis_t30.h | 3 --- include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/cei-tk1-som.h | 3 --- include/configs/colibri_t20.h | 3 --- include/configs/colibri_t30.h | 3 --- include/configs/dalmore.h | 3 --- include/configs/e2220-1170.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/nyan-big.h | 3 --- include/configs/p2371-0000.h | 3 --- include/configs/p2371-2180.h | 3 --- include/configs/p2571.h | 3 --- include/configs/p2771-0000.h | 3 --- include/configs/seaboard.h | 3 --- include/configs/tec-ng.h | 3 --- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- scripts/config_whitelist.txt | 1 - 41 files changed, 26 insertions(+), 58 deletions(-) diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index e0d257564f..9219e5984d 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 490b93f0de..fa5b657c5e 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 77d1ad51d8..29b074f281 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index be55728e6f..0c49dfb2f2 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig index 74b17ef938..5f0fbbd4b7 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index b1cfd65572..7e680d79c4 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri" CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index fcbb30d82c..b6054c7fd9 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index c2ee3d890e..cc49404881 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index afa08a0289..2d45ee309a 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170" CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SYS_NS16550=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index c39c424e7b..57accff452 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 13d8f99cbe..4199e92451 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 015ac05308..6d06c0bbb1 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000" CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SYS_NS16550=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 81ce9a2d08..db4a9225f2 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180" CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_RTL8169=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 5482ac2563..fabc1ca6f2 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SYS_NS16550=y diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig index 2bf2e31359..ac85efa37b 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000" +CONFIG_SYS_I2C_TEGRA=y CONFIG_TEGRA186_BPMP_I2C=y CONFIG_DWC_ETH_QOS=y CONFIG_E1000=y diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig index 1e33c1f95b..df4d914d85 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500" +CONFIG_SYS_I2C_TEGRA=y CONFIG_TEGRA186_BPMP_I2C=y CONFIG_DWC_ETH_QOS=y CONFIG_E1000=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 5715665810..62ab59d6e5 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 250d7f0250..1fd54eeb6f 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 71bfbfc54e..82bd13ea00 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 856398b377..296989af1b 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" +CONFIG_SYS_I2C_TEGRA=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index b6bc678091..215624020f 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -400,6 +400,12 @@ config SYS_I2C_STM32F7 _ Optional clock stretching _ Software reset +config SYS_I2C_TEGRA + bool "NVIDIA Tegra internal I2C controller" + depends on TEGRA + help + Support for NVIDIA I2C controller available in Tegra SoCs. + config SYS_I2C_UNIPHIER bool "UniPhier I2C driver" depends on ARCH_UNIPHIER && DM_I2C diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 506a9e4f2f..05c958a8fe 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* SD/MMC support */ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index ac012225a7..254a3c4aa8 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -18,9 +18,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 8ea583ddfc..6d17750f40 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_BEAVER -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 2ad9320444..65c7d2c39b 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -26,9 +26,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_CARDHU -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index b595c48263..7ba17a6fd6 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -22,9 +22,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c34d6d055c..26d8e8eb0e 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -17,9 +17,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* USB host support */ #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 6b1a831da9..c933705de7 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -20,9 +20,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ CONFIG_TDX_CFG_BLOCK_OFFSET) diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index afd2dd2f64..1ae523409c 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -19,9 +19,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_DALMORE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 6fe2f66795..1e917345d8 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 192d821d4b..f93c81a6d4 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 4a0de70733..bb98201190 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 9e22bbb8cf..5843cc00eb 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 76c11ad7a0..3486cc8117 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -17,9 +17,6 @@ /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 5e34f22618..a64b6c42a5 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -18,9 +18,6 @@ #define CONFIG_SERIAL_MULTI #define CONFIG_TEGRA_ENABLE_UARTA -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index e8be81a66c..e546c1d73f 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -13,9 +13,6 @@ /* High-level configuration options */ #define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index ef3848d6df..53d9546dc6 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -26,9 +26,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 998e353c5e..205c90ff2f 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -16,9 +16,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 8972e1738a..4e2b57c1a4 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -23,9 +23,6 @@ /* SPI */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in SPI */ #define CONFIG_ENV_SPI_MAX_HZ 48000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_0 diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 8bb74aae1b..72e6d8a5db 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -18,9 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -/* I2C */ -#define CONFIG_SYS_I2C_TEGRA - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b3572568b..4c7602ab34 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3143,7 +3143,6 @@ CONFIG_SYS_I2C_SPEED2 CONFIG_SYS_I2C_SPEED3 CONFIG_SYS_I2C_TCA642X_ADDR CONFIG_SYS_I2C_TCA642X_BUS_NUM -CONFIG_SYS_I2C_TEGRA CONFIG_SYS_I2C_W83782G_ADDR CONFIG_SYS_IBAT CONFIG_SYS_IBAT0L -- 2.25.1