Merge tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / drivers / bus / Kconfig

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index cbddbaddb34780dd1295f8ea22ceaaef16bd2f0f..1a82f3a17681b77926a11c29ba23cbdc27d8b6b5 100644 (file)
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -4,6 +4,58 @@
 
 menu "Bus devices"
 
+config ARM_CCI
+       bool
+
+config ARM_CCI_PMU
+       bool
+       select ARM_CCI
+
+config ARM_CCI400_COMMON
+       bool
+       select ARM_CCI
+
+config ARM_CCI400_PMU
+       bool "ARM CCI400 PMU support"
+       depends on (ARM && CPU_V7) || ARM64
+       depends on PERF_EVENTS
+       select ARM_CCI400_COMMON
+       select ARM_CCI_PMU
+       help
+         Support for PMU events monitoring on the ARM CCI-400 (cache coherent
+         interconnect). CCI-400 supports counting events related to the
+         connected slave/master interfaces.
+
+config ARM_CCI400_PORT_CTRL
+       bool
+       depends on ARM && OF && CPU_V7
+       select ARM_CCI400_COMMON
+       help
+         Low level power management driver for CCI400 cache coherent
+         interconnect for ARM platforms.
+
+config ARM_CCI500_PMU
+       bool "ARM CCI500 PMU support"
+       default y
+       depends on (ARM && CPU_V7) || ARM64
+       depends on PERF_EVENTS
+       select ARM_CCI_PMU
+       help
+         Support for PMU events monitoring on the ARM CCI-500 cache coherent
+         interconnect. CCI-500 provides 8 independent event counters, which
+         can count events pertaining to the slave/master interfaces as well
+         as the internal events to the CCI.
+
+         If unsure, say Y
+
+config ARM_CCN
+       bool "ARM CCN driver support"
+       depends on ARM || ARM64
+       depends on PERF_EVENTS
+       help
+         PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
+         interconnect.
+
 config BRCMSTB_GISB_ARB
        bool "Broadcom STB GISB bus arbiter"
        depends on ARM || MIPS
@@ -40,15 +92,6 @@ config MVEBU_MBUS
          Driver needed for the MBus configuration on Marvell EBU SoCs
          (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).
 
-config OMAP_OCP2SCP
-       tristate "OMAP OCP2SCP DRIVER"
-       depends on ARCH_OMAP2PLUS
-       help
-         Driver to enable ocp2scp module which transforms ocp interface
-         protocol to scp protocol. In OMAP4, USB PHY is connected via
-         OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via
-         OCP2SCP.
-
 config OMAP_INTERCONNECT
        tristate "OMAP INTERCONNECT DRIVER"
        depends on ARCH_OMAP2PLUS
@@ -56,20 +99,27 @@ config OMAP_INTERCONNECT
        help
          Driver to enable OMAP interconnect error handling driver.
 
-config ARM_CCI
-       bool "ARM CCI driver support"
-       depends on ARM && OF && CPU_V7
+config OMAP_OCP2SCP
+       tristate "OMAP OCP2SCP DRIVER"
+       depends on ARCH_OMAP2PLUS
        help
-         Driver supporting the CCI cache coherent interconnect for ARM
-         platforms.
+         Driver to enable ocp2scp module which transforms ocp interface
+         protocol to scp protocol. In OMAP4, USB PHY is connected via
+         OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via
+         OCP2SCP.
 
-config ARM_CCN
-       bool "ARM CCN driver support"
-       depends on ARM || ARM64
-       depends on PERF_EVENTS
+config SIMPLE_PM_BUS
+       bool "Simple Power-Managed Bus Driver"
+       depends on OF && PM
+       depends on ARCH_SHMOBILE || COMPILE_TEST
        help
-         PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
-         interconnect.
+         Driver for transparent busses that don't need a real driver, but
+         where the bus controller is part of a PM domain, or under the control
+         of a functional clock, and thus relies on runtime PM for managing
+         this PM domain and/or clock.
+         An example of such a bus controller is the Renesas Bus State
+         Controller (BSC, sometimes called "LBSC within Bus Bridge", or
+         "External Bus Interface") as found on several Renesas ARM SoCs.
 
 config VEXPRESS_CONFIG
        bool "Versatile Express configuration bus"