Kconfig: tegra: Migrate SYS_I2C_TEGRA

Migrate SYS_I2C_TEGRA from headers to Kconfig

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Peter.Chubb@data61.csiro.au
Cc: Lucas Stach <dev@lynxeye.de>
Cc: Stefan Agner <stefan.agner@toradex.com>
Cc: Alban Bedel <alban.bedel@avionic-design.de>
Cc: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index e0d257564f2d5438605d2ee523063a0a06d4bd42..9219e5984ded1952fad90e634d9dc244139fbf87 100644 (file)
--- 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 490b93f0de1e662f5fea5fbf4247a31a1df6e32e..fa5b657c5e3d391deb9c529b7669595df3f6c12e 100644 (file)
--- 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 77d1ad51d8e8a7b67d40f9230d1c2c2df509ce50..29b074f2811c54df05999151c6c080cb72ffc963 100644 (file)
--- 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 be55728e6f9cff7a8f2a5c1d1da3d604794b3858..0c49dfb2f2241003fa1838b1b749dd7beac75173 100644 (file)
--- 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 74b17ef938a21087a413360ffb49b34f895ac451..5f0fbbd4b7d25588da15716ac6b54ee347397fc8 100644 (file)
--- 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 b1cfd65572c72733be59ac0165e5380d12e7b844..7e680d79c49cb088f537bc8eb5095ae2ee66da8b 100644 (file)
--- 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 fcbb30d82c8a7164223558e56066b2965d39022c..b6054c7fd95d68d8cbacfdca6fcfd778d32e497a 100644 (file)
--- 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 c2ee3d890ef8377c0a51985e7942c264d28db7f1..cc494048818691564bbcfbd3c1602e7c7715d6b6 100644 (file)
--- 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 afa08a0289a67df5c314609d0484888bb5c23b5e..2d45ee309afe1c73802a5babca756007e593877a 100644 (file)
--- 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 c39c424e7bcf37612da0e6ffaf61fccc67dd78b8..57accff45251b3e3a32b28c5d205a808c997db40 100644 (file)
--- 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 13d8f99cbe5079aefb26bef7a0a8a87e50fc6205..4199e92451346cef1f231c8fee7998880a465ccc 100644 (file)
--- 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 015ac053084e345df22cf5a158526ae6ccb69298..6d06c0bbb1ee11a09bacc56745a5158e7bbb4d23 100644 (file)
--- 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 81ce9a2d08ff757dba2a1fedf22247288097e903..db4a9225f2c52250334de5a84f636b5acfde6ca4 100644 (file)
--- 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 5482ac256318c6526bd86635a49bde3e3718d294..fabc1ca6f21b7180482d2ad3edab37cdb4f709eb 100644 (file)
--- 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 2bf2e313599df6be547271ddb1a05428d3dd4b29..ac85efa37b3bf3ad5c3666c2c65d706dfb4b56c8 100644 (file)
--- 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 1e33c1f95b0a6dc969f4591f83cb68d4a64d55b3..df4d914d85cfe26da49904acb1c7b027d4348dc8 100644 (file)
--- 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 57156658103eca12cc7dd063ca6da9b5787d2832..62ab59d6e52f05377a0c0b7408a522409333065c 100644 (file)
--- 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 250d7f0250a11c3be7cb3d48bc5a761fa3db5750..1fd54eeb6fb36d45d66cf1630cd4c80b07f3db3f 100644 (file)
--- 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 71bfbfc54eb2afea2e40a1830f556accdd4bfc04..82bd13ea007edf4c4273ab9d7f64832e85e293cb 100644 (file)
--- 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 856398b37707df41e72387335657884aa537e702..296989af1bdcf26cfca0397c3146e8cca3ad6e5d 100644 (file)
--- 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 b6bc678091dea586cc9513465b72232bef47fd1e..215624020f6d23a899cc9c00befd54b3519ede42 100644 (file)
--- 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 506a9e4f2fe8462c7e1db44ba707f3353bcb4328..05c958a8fea8ca84aa7be1fc0f0540a535c97104 100644 (file)
--- 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 ac012225a77e094d055441be3fdc27f124aaf8b0..254a3c4aa8c7aee56cbba8c6fed908b32e8a2298 100644 (file)
--- 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 8ea583ddfc472fe3adcaeeb6344e69bb551f3255..6d17750f400e880cac1ff5ff47356f6f9afc0b55 100644 (file)
--- 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 2ad93204443aed90f32ee56fe8d464a7ef551677..65c7d2c39b226c1796cf6bc55a845eb2866d103e 100644 (file)
--- 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 b595c4826326a1cf151f7347d4a3d9994699ac2f..7ba17a6fd63922cc3dbfdf2d60b62bc810db042b 100644 (file)
--- 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 c34d6d055c3fcd27db590f884911040bacef8646..26d8e8eb0edbf1a4230e4911b204146651bd38a7 100644 (file)
--- 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 6b1a831da9a18b88973bff5bbad339e0a6e16656..c933705de7e306c81551cb67dc759493b7ab79b8 100644 (file)
--- 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 afd2dd2f64c971b5a2fe773d5a7d2d6fdaec9d84..1ae523409cc6b5f9163c37351e6754134502456f 100644 (file)
--- 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 6fe2f66795775d746fe87625c7ba1b5b9af6dafb..1e917345d811e42be5be7b8ca77bd72211189872 100644 (file)
--- 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 192d821d4b2d0be6fbc96a0c313d09115ef8de16..f93c81a6d4208c284e550441dfcc1dbfc048f755 100644 (file)
--- 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 4a0de7073359761d4c02feea6520335c1dda196d..bb9820119065521da27a9355b41b998636ba8bc4 100644 (file)
--- 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 9e22bbb8cf4e3c3380c1d5dd784aefbdbd6b75fb..5843cc00eb1d96151d9fb5a32e6bc59625a7b524 100644 (file)
--- 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 76c11ad7a0c185a13176ad961d94a7c627e02028..3486cc8117e4c499e48b3b58dfce50f9b5a965a4 100644 (file)
--- 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 5e34f22618f6804f5b5664a1f59773847bc079f6..a64b6c42a5d9dc5ad97830b45ec2910278e7229e 100644 (file)
--- 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 e8be81a66cf54fbb87364aba0008c8383cef6b4d..e546c1d73fd2eeb853c44159b0d3a2627df9009c 100644 (file)
--- 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 ef3848d6df0324a6fcd96839c07e6cb855a19d73..53d9546dc6efb33659e691bf0c52297ec0a64737 100644 (file)
--- 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 998e353c5e599ba68badde17731e19d2628909da..205c90ff2fa61852a2424e9ca42648fe20b45fc6 100644 (file)
--- 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 8972e1738a59088d116a63b0263099e933610ee9..4e2b57c1a4352dede6951b71fdd3614a3cdef6f0 100644 (file)
--- 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 8bb74aae1b14ab347d8ccaff93e73633e5049c76..72e6d8a5db019af1a251fb2f24b42a3d75064304 100644 (file)
--- 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 2b3572568b1ccb8c9d253ee553665f01eeb709ca..4c7602ab34df2ee19d16f00e92b8e0199c31e901 100644 (file)
--- 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