Merge branch 'master' of git://git.denx.de/u-boot-tegra

This commit is contained in:
Tom Rini
2019-02-20 12:28:57 -05:00
72 changed files with 169 additions and 282 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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