| Message ID | 20180916172301.25982-4-pbrobinson@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Warren |
| Headers | show |
| Series | [U-Boot,1/6] tegra: cleanup dangling comments in include/configs | expand |
On Sun, 2018-09-16 at 18:22 +0100, Peter Robinson wrote: > 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> Looks good. Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> BTW: I was wondering whether the following handling should not also better be moved into its Kconfig: https://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/tegra-common -post.h;h=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hb=HEAD#l108 > --- > 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 83721b403b5..ca5ded8e946 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 0e6547b72c4..05b1a57ff26 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 28cb04c38be..d8513a0b8c8 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 c046ef5d8be..545b3ee8db4 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 c782fef89e9..5ea257e778d 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 dcb2bcf617b..496f4be0238 100644 > --- a/configs/colibri_t20_defconfig > +++ b/configs/colibri_t20_defconfig > @@ -33,6 +33,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 c8b82a9b582..07f34359d1d 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 9c08aadc0d1..f07dc020786 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 89035a051d6..b13ad39abe8 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 76f3376e3ce..ba7a463d47a 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 ae6d76dfb20..4a8e864b7e1 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 02a75692051..30d28f6ee5c 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 d9dcf7e014e..3ad43ff5cd8 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 5cbb1c3201a..75b7e9c5482 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 2bf2e313599..ac85efa37b3 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 1e33c1f95b0..df4d914d85c 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 69e159b43e1..6c56c7bdedf 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 65ac1c2e5b1..dd29589c5de 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 6dfb3fbda80..c3bbe41ce61 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 12043180c00..bcbdbe345fb 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 ae3b5015551..b45d09823c6 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 506a9e4f2fe..05c958a8fea 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 ac012225a77..254a3c4aa8c 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 8ea583ddfc4..6d17750f400 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 2ad93204443..65c7d2c39b2 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 b595c482632..7ba17a6fd63 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 c34d6d055c3..26d8e8eb0ed 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 6b1a831da9a..c933705de7e 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 afd2dd2f64c..1ae523409cc 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 6fe2f667957..1e917345d81 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 192d821d4b2..f93c81a6d42 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 4a0de707335..bb982011906 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 9e22bbb8cf4..5843cc00eb1 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 76c11ad7a0c..3486cc8117e 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 5e34f22618f..a64b6c42a5d 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 e8be81a66cf..e546c1d73fd 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 ef3848d6df0..53d9546dc6e 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 998e353c5e5..205c90ff2fa 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 8972e1738a5..4e2b57c1a43 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 8bb74aae1b1..72e6d8a5db0 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 fc37099cbe0..dbf4abc2f1b 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -3179,7 +3179,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
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 83721b403b5..ca5ded8e946 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 0e6547b72c4..05b1a57ff26 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 28cb04c38be..d8513a0b8c8 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 c046ef5d8be..545b3ee8db4 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 c782fef89e9..5ea257e778d 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 dcb2bcf617b..496f4be0238 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -33,6 +33,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 c8b82a9b582..07f34359d1d 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 9c08aadc0d1..f07dc020786 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 89035a051d6..b13ad39abe8 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 76f3376e3ce..ba7a463d47a 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 ae6d76dfb20..4a8e864b7e1 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 02a75692051..30d28f6ee5c 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 d9dcf7e014e..3ad43ff5cd8 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 5cbb1c3201a..75b7e9c5482 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 2bf2e313599..ac85efa37b3 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 1e33c1f95b0..df4d914d85c 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 69e159b43e1..6c56c7bdedf 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 65ac1c2e5b1..dd29589c5de 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 6dfb3fbda80..c3bbe41ce61 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 12043180c00..bcbdbe345fb 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 ae3b5015551..b45d09823c6 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 506a9e4f2fe..05c958a8fea 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 ac012225a77..254a3c4aa8c 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 8ea583ddfc4..6d17750f400 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 2ad93204443..65c7d2c39b2 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 b595c482632..7ba17a6fd63 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 c34d6d055c3..26d8e8eb0ed 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 6b1a831da9a..c933705de7e 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 afd2dd2f64c..1ae523409cc 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 6fe2f667957..1e917345d81 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 192d821d4b2..f93c81a6d42 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 4a0de707335..bb982011906 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 9e22bbb8cf4..5843cc00eb1 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 76c11ad7a0c..3486cc8117e 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 5e34f22618f..a64b6c42a5d 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 e8be81a66cf..e546c1d73fd 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 ef3848d6df0..53d9546dc6e 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 998e353c5e5..205c90ff2fa 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 8972e1738a5..4e2b57c1a43 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 8bb74aae1b1..72e6d8a5db0 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 fc37099cbe0..dbf4abc2f1b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3179,7 +3179,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
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> --- 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(-)