Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/kernel/linux-rpi.git] / drivers / bus / Kconfig

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index 7875105..b9e8cfc 100644 (file)
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -150,6 +150,13 @@ config TEGRA_ACONNECT
          Driver for the Tegra ACONNECT bus which is used to interface with
          the devices inside the Audio Processing Engine (APE) for Tegra210.
 
+config TEGRA_GMI
+       tristate "Tegra Generic Memory Interface bus driver"
+       depends on ARCH_TEGRA
+       help
+         Driver for the Tegra Generic Memory Interface bus which can be used
+         to attach devices such as NOR, UART, FPGA and more.
+
 config UNIPHIER_SYSTEM_BUS
        tristate "UniPhier System Bus driver"
        depends on ARCH_UNIPHIER && OF
@@ -167,4 +174,13 @@ config VEXPRESS_CONFIG
        help
          Platform configuration infrastructure for the ARM Ltd.
          Versatile Express.
+
+config DA8XX_MSTPRI
+       bool "TI da8xx master peripheral priority driver"
+       depends on ARCH_DAVINCI_DA8XX
+       help
+         Driver for Texas Instruments da8xx master peripheral priority
+         configuration. Allows to adjust the priorities of all master
+         peripherals.
+
 endmenu