Browse Source

drivers/bus: Move Arm CCN PMU driver

The arm-ccn driver is purely a perf driver for the CCN PMU, not a bus
driver in the sense of the other residents of drivers/bus/, so let's
move it to the appropriate place for SoC PMU drivers. Not to mention
moving the documentation accordingly as well.

Acked-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Robin Murphy 7 years ago
parent
commit
1888d3ddc3

+ 0 - 0
Documentation/devicetree/bindings/arm/ccn.txt → Documentation/devicetree/bindings/perf/arm-ccn.txt


+ 0 - 0
Documentation/arm/CCN.txt → Documentation/perf/arm-ccn.txt


+ 0 - 8
drivers/bus/Kconfig

@@ -48,14 +48,6 @@ config ARM_CCI5xx_PMU
 
 
 	  If unsure, say Y
 	  If unsure, say Y
 
 
-config ARM_CCN
-	tristate "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
 config BRCMSTB_GISB_ARB
 	bool "Broadcom STB GISB bus arbiter"
 	bool "Broadcom STB GISB bus arbiter"
 	depends on ARM || ARM64 || MIPS
 	depends on ARM || ARM64 || MIPS

+ 0 - 2
drivers/bus/Makefile

@@ -5,8 +5,6 @@
 
 
 # Interconnect bus drivers for ARM platforms
 # Interconnect bus drivers for ARM platforms
 obj-$(CONFIG_ARM_CCI)		+= arm-cci.o
 obj-$(CONFIG_ARM_CCI)		+= arm-cci.o
-obj-$(CONFIG_ARM_CCN)		+= arm-ccn.o
-
 obj-$(CONFIG_BRCMSTB_GISB_ARB)	+= brcmstb_gisb.o
 obj-$(CONFIG_BRCMSTB_GISB_ARB)	+= brcmstb_gisb.o
 obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
 obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
 obj-$(CONFIG_MIPS_CDMM)		+= mips_cdmm.o
 obj-$(CONFIG_MIPS_CDMM)		+= mips_cdmm.o

+ 7 - 0
drivers/perf/Kconfig

@@ -5,6 +5,13 @@
 menu "Performance monitor support"
 menu "Performance monitor support"
 	depends on PERF_EVENTS
 	depends on PERF_EVENTS
 
 
+config ARM_CCN
+	tristate "ARM CCN driver support"
+	depends on ARM || ARM64
+	help
+	  PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
+	  interconnect.
+
 config ARM_PMU
 config ARM_PMU
 	depends on ARM || ARM64
 	depends on ARM || ARM64
 	bool "ARM PMU framework"
 	bool "ARM PMU framework"

+ 1 - 0
drivers/perf/Makefile

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 # SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_ARM_CCN) += arm-ccn.o
 obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o
 obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o
 obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
 obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
 obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
 obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o

+ 0 - 0
drivers/bus/arm-ccn.c → drivers/perf/arm-ccn.c