aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-02-20 12:28:57 -0500
committerTom Rini <trini@konsulko.com>2019-02-20 12:28:57 -0500
commit888f9aa5cac4227e540a5c91a744ac7bed386e70 (patch)
tree27e0c1da87d75b80ab673d13084fb1489c985893 /drivers
parent0c41e59a37fbd5b10d4837ae30c288a084997465 (diff)
parenta3c9021771608f5b514c75874fa0d8fbee2873d6 (diff)
downloadu-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.zip
u-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.tar.gz
u-boot-888f9aa5cac4227e540a5c91a744ac7bed386e70.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/Kconfig6
-rw-r--r--drivers/input/Kconfig6
-rw-r--r--drivers/usb/host/Kconfig6
3 files changed, 18 insertions, 0 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index b6bc678..2156240 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/drivers/input/Kconfig b/drivers/input/Kconfig
index 7afdafe..a3bdd9f 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/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 60f37f4..ba1e6bf 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