[U-Boot] v2 Tegra cleanups and Kconfig migrations
The following patches are the remaining bits from my previous series that is rebased on your PR from yesterday.
Peter
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(-)
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index e0d257564f2..9219e5984de 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 490b93f0de1..fa5b657c5e3 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 77d1ad51d8e..29b074f2811 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 be55728e6f9..0c49dfb2f22 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 74b17ef938a..5f0fbbd4b7d 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 b1cfd65572c..7e680d79c49 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 fcbb30d82c8..b6054c7fd95 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 c2ee3d890ef..cc494048818 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 afa08a0289a..2d45ee309af 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 c39c424e7bc..57accff4525 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 13d8f99cbe5..4199e924513 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 015ac053084..6d06c0bbb1e 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 81ce9a2d08f..db4a9225f2c 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 5482ac25631..fabc1ca6f21 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 57156658103..62ab59d6e52 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 250d7f0250a..1fd54eeb6fb 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 71bfbfc54eb..82bd13ea007 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 856398b3770..296989af1bd 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 b6bc678091d..215624020f6 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 2b3572568b1..4c7602ab34d 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
Migrate USB_EHCI_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: Marek Vasut marex@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/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2371-0000_defconfig | 1 + configs/p2371-2180_defconfig | 1 + configs/p2571_defconfig | 1 + configs/paz00_defconfig | 1 + configs/plutux_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + drivers/usb/host/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 | 4 ---- include/configs/colibri_t30.h | 3 --- include/configs/dalmore.h | 3 --- include/configs/e2220-1170.h | 3 --- include/configs/harmony.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/medcom-wide.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/paz00.h | 3 --- include/configs/plutux.h | 3 --- include/configs/seaboard.h | 3 --- include/configs/tec-ng.h | 3 --- include/configs/tec.h | 3 --- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- include/configs/ventana.h | 3 --- 49 files changed, 30 insertions(+), 73 deletions(-)
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 9219e5984de..cf239ec3ec2 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -47,6 +47,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index fa5b657c5e3..71e77777980 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -39,6 +39,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 29b074f2811..51843ce2d4a 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -43,6 +43,7 @@ CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 0c49dfb2f22..20f4a300550 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -37,5 +37,6 @@ CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig index 5f0fbbd4b7d..bd318466680 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -46,6 +46,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 7e680d79c49..1487b22f18c 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index b6054c7fd95..106f0460f6f 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index cc494048818..c03a8514c2e 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -37,6 +37,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index 2d45ee309af..fbca72ace6e 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -32,6 +32,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index f0987fc064c..1b89580b823 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -41,6 +41,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 57accff4525..a7dd360f0ff 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -47,6 +47,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index a55d8d4cfae..0a3250988a1 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 4199e924513..2a0e1071997 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -64,6 +64,7 @@ CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 6d06c0bbb1e..c25872128e0 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -33,6 +33,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index db4a9225f2c..b662ef14314 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -40,6 +40,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index fabc1ca6f21..5f0f8c519b4 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -33,6 +33,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index dc785c88657..f23773c37ed 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -30,6 +30,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_VIDEO=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 05b388cce3b..318eada004a 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -27,5 +27,6 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 62ab59d6e52..304a292133b 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_KEYBOARD=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 1fd54eeb6fb..c6b9333d86f 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -32,5 +32,6 @@ CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/tec_defconfig b/configs/tec_defconfig index c5bb4955af5..7017aade686 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 82bd13ea007..8d92bedb95d 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -38,5 +38,6 @@ CONFIG_TEGRA20_SFLASH=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 296989af1bd..0c66338a283 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -36,6 +36,7 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" CONFIG_USB_GADGET_VENDOR_NUM=0x0955 diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 2d63b219cf0..4cb0fef51a6 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -29,6 +29,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_KEYBOARD=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 60f37f40fd9..ba1e6bfa43b 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -179,6 +179,12 @@ config USB_EHCI_PCI help Enables support for the PCI-based EHCI controller.
+config USB_EHCI_TEGRA + bool "Support for NVIDIA Tegra on-chip EHCI USB controller" + depends on TEGRA + ---help--- + Enable support for Tegra on-chip EHCI USB controller + config USB_EHCI_ZYNQ bool "Support for Xilinx Zynq on-chip EHCI USB controller" depends on ARCH_ZYNQ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 05c958a8fea..1d296ba51a0 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* PCI host support */ #undef CONFIG_PCI_SCAN_SHOW
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 254a3c4aa8c..77a5968cc2b 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* PCI networking support */ #define CONFIG_E1000_NO_NVM
diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 6d17750f400..a11a800a718 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -33,9 +33,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 65c7d2c39b2..6b2553c73b5 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -37,9 +37,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 7ba17a6fd63..74305f1b6e7 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -32,9 +32,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 26d8e8eb0ed..6c4e9d41540 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -17,10 +17,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 1536 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index c933705de7e..7ece00e646a 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - /* General networking support */ #define CONFIG_IP_DEFRAG #define CONFIG_TFTP_BLOCKSIZE 16352 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 1ae523409cc..9b25a9d59d6 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -29,9 +29,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 1e917345d81..30c0c7fee78 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 7365dfeb46c..f873cea2653 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -32,9 +32,6 @@ /* Environment in NAND (which is 512M), aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index f93c81a6d42..7b2c7947e94 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 88976fed64c..d212a7f680f 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index bb982011906..3d43839e413 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -31,9 +31,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #define CONFIG_KEYBOARD
#undef CONFIG_LOADADDR diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 5843cc00eb1..59866997e3f 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 3486cc8117e..c97b2260277 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/p2571.h b/include/configs/p2571.h index a64b6c42a5d..4920896e9cb 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB2.0 Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 5c52a4e02b8..b76958c36d8 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index f61af5ae28d..43856bad2c1 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 53d9546dc6e..c5fa9cc4208 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,9 +31,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 205c90ff2fa..85914ec6952 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -27,9 +27,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - /* Tag support */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/tec.h b/include/configs/tec.h index e40bfb9ba12..907c8d5e230 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -25,9 +25,6 @@ /* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 4e2b57c1a43..4b1eb7b1c86 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -30,9 +30,6 @@ /* 1MiB flash, environment located as high as possible */ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 72e6d8a5db0..a86ae212f26 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -28,9 +28,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h"
diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 7391262b499..09f90db1f51 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2
-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA - #include "tegra-common-post.h"
#endif /* __CONFIG_H */
On 2/20/19 1:17 PM, Peter Robinson wrote:
Migrate USB_EHCI_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: Marek Vasut marex@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 to me, Reviewed-by: Marek Vasut marex@denx.de
Is there a tegra maintainer or shall I take it via -usb ?
On Wed, Feb 20, 2019 at 5:17 PM Marek Vasut marex@denx.de wrote:
On 2/20/19 1:17 PM, Peter Robinson wrote:
Migrate USB_EHCI_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: Marek Vasut marex@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 to me, Reviewed-by: Marek Vasut marex@denx.de
Is there a tegra maintainer or shall I take it via -usb ?
That would be Tom Warren and I believe he's already queued it in a PR
-----Original Message----- From: Peter Robinson pbrobinson@gmail.com Sent: Wednesday, February 20, 2019 10:23 AM To: Marek Vasut marex@denx.de Cc: Tom Warren TWarren@nvidia.com; u-boot@lists.denx.de; Stephen Warren swarren@nvidia.com; Marcel Ziswiler marcel.ziswiler@toradex.com; Peter.Chubb@data61.csiro.au; Lucas Stach dev@lynxeye.de; Stefan Agner stefan.agner@toradex.com; Alban Bedel alban.bedel@avionic-design.de; Allen Martin AMartin@nvidia.com Subject: Re: [PATCH 2/4] Kconfig: tegra: Migrate USB_EHCI_TEGRA
On Wed, Feb 20, 2019 at 5:17 PM Marek Vasut marex@denx.de wrote:
On 2/20/19 1:17 PM, Peter Robinson wrote:
Migrate USB_EHCI_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: Marek Vasut marex@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 to me, Reviewed-by: Marek Vasut marex@denx.de
Is there a tegra maintainer or shall I take it via -usb ?
That would be Tom Warren and I believe he's already queued it in a PR
Sorry, yes, I've sent an updated PR to TomR for u-boot-tegra/master w/all of Peter's changes.
Tom
-- nvpublic
On 2/20/19 6:48 PM, Tom Warren wrote:
-----Original Message----- From: Peter Robinson pbrobinson@gmail.com Sent: Wednesday, February 20, 2019 10:23 AM To: Marek Vasut marex@denx.de Cc: Tom Warren TWarren@nvidia.com; u-boot@lists.denx.de; Stephen Warren swarren@nvidia.com; Marcel Ziswiler marcel.ziswiler@toradex.com; Peter.Chubb@data61.csiro.au; Lucas Stach dev@lynxeye.de; Stefan Agner stefan.agner@toradex.com; Alban Bedel alban.bedel@avionic-design.de; Allen Martin AMartin@nvidia.com Subject: Re: [PATCH 2/4] Kconfig: tegra: Migrate USB_EHCI_TEGRA
On Wed, Feb 20, 2019 at 5:17 PM Marek Vasut marex@denx.de wrote:
On 2/20/19 1:17 PM, Peter Robinson wrote:
Migrate USB_EHCI_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: Marek Vasut marex@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 to me, Reviewed-by: Marek Vasut marex@denx.de
Is there a tegra maintainer or shall I take it via -usb ?
That would be Tom Warren and I believe he's already queued it in a PR
Sorry, yes, I've sent an updated PR to TomR for u-boot-tegra/master w/all of Peter's changes.
Cool, thanks.
Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard uses it but we drop CONFIG_KEYBOARD as the driver doesn't use the legacy drv_keyboard_init.
Signed-off-by: Peter Robinson pbrobinson@gmail.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com --- configs/seaboard_defconfig | 1 + drivers/input/Kconfig | 6 ++++++ include/configs/seaboard.h | 4 ---- scripts/config_whitelist.txt | 1 - 4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 304a292133b..aa46f068c36 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_I2C_TEGRA=y +CONFIG_TEGRA_KEYBOARD=y CONFIG_SPL_DM=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 7afdafed948..a3bdd9fa346 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -73,6 +73,12 @@ config I8042_KEYB variable 'keymap' to "de" to select German. Keyboard repeat is handled by the keyboard itself.
+config TEGRA_KEYBOARD + bool "NVIDIA Tegra internal matrix keyboard controller support" + help + A matrix keyboard connected directly to the internal keyboard + controller on Tegra SoCs. + config TWL4030_INPUT bool "Enable TWL4030 Input controller" help diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index c5fa9cc4208..5df013b0b32 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,10 +31,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2
-/* Enable keyboard */ -#define CONFIG_TEGRA_KEYBOARD -#define CONFIG_KEYBOARD - /* NAND support */ #define CONFIG_TEGRA_NAND
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4c7602ab34d..2c323b62de3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4393,7 +4393,6 @@ CONFIG_TEGRA_ENABLE_UARTC CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_ENABLE_UARTE CONFIG_TEGRA_GPU -CONFIG_TEGRA_KEYBOARD CONFIG_TEGRA_LP0 CONFIG_TEGRA_NAND CONFIG_TEGRA_PMU
The CONFIG_KEYBOARD does nothing as it's legacy and unused so just drop it from the config.
Signed-off-by: Peter Robinson pbrobinson@gmail.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com Cc: Allen Martin amartin@nvidia.com --- include/configs/nyan-big.h | 2 -- 1 file changed, 2 deletions(-)
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 3d43839e413..933f84028f4 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -31,8 +31,6 @@ #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
-#define CONFIG_KEYBOARD - #undef CONFIG_LOADADDR #define CONFIG_LOADADDR 0x82408000
participants (3)
-
Marek Vasut -
Peter Robinson -
Tom Warren