These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / bus / Kconfig

diff --git a/kernel/drivers/bus/Kconfig b/kernel/drivers/bus/Kconfig
index a1d4af6..116b363 100644 (file)
--- a/kernel/drivers/bus/Kconfig
+++ b/kernel/drivers/bus/Kconfig
@@ -7,21 +7,24 @@ menu "Bus devices"
 config ARM_CCI
        bool
 
 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"
 config ARM_CCI400_COMMON
        bool
        select ARM_CCI
 
 config ARM_CCI400_PMU
        bool "ARM CCI400 PMU support"

-       default y
-       depends on ARM || ARM64
-       depends on HW_PERF_EVENTS
+       depends on (ARM && CPU_V7) || ARM64
+       depends on PERF_EVENTS

        select ARM_CCI400_COMMON
        select ARM_CCI400_COMMON

+       select ARM_CCI_PMU

        help
        help

-         Support for PMU events monitoring on the ARM CCI cache coherent
-         interconnect.
-
-         If unsure, say Y
+         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
 
 config ARM_CCI400_PORT_CTRL
        bool


@@ -31,6 +34,19 @@ config ARM_CCI400_PORT_CTRL
          Low level power management driver for CCI400 cache coherent
          interconnect for ARM platforms.
 
          Low level power management driver for CCI400 cache coherent
          interconnect for ARM platforms.
 

+config ARM_CCI500_PMU
+       bool "ARM CCI500 PMU support"
+       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
 config ARM_CCN
        bool "ARM CCN driver support"
        depends on ARM || ARM64


@@ -104,6 +120,17 @@ config SIMPLE_PM_BUS
          Controller (BSC, sometimes called "LBSC within Bus Bridge", or
          "External Bus Interface") as found on several Renesas ARM SoCs.
 
          Controller (BSC, sometimes called "LBSC within Bus Bridge", or
          "External Bus Interface") as found on several Renesas ARM SoCs.
 

+config SUNXI_RSB
+       tristate "Allwinner sunXi Reduced Serial Bus Driver"
+         default MACH_SUN8I || MACH_SUN9I
+         depends on ARCH_SUNXI
+         select REGMAP
+         help
+         Say y here to enable support for Allwinner's Reduced Serial Bus
+         (RSB) support. This controller is responsible for communicating
+         with various RSB based devices, such as AXP223, AXP8XX PMICs,
+         and AC100/AC200 ICs.
+

 config VEXPRESS_CONFIG
        bool "Versatile Express configuration bus"
        default y if ARCH_VEXPRESS
 config VEXPRESS_CONFIG
        bool "Versatile Express configuration bus"
        default y if ARCH_VEXPRESS