All of lore.kernel.org
 help / color / mirror / Atom feed
From: robin.murphy@arm.com (Robin Murphy)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/6] drivers/bus: Move Arm CCN PMU driver
Date: Thu, 15 Feb 2018 18:51:41 +0000	[thread overview]
Message-ID: <6a67d4835622c146051e32381f856c67acc8ec93.1518717258.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1518717258.git.robin.murphy@arm.com>

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>
---
 .../devicetree/bindings/{arm/ccn.txt => perf/arm-ccn.txt}         | 0
 Documentation/{arm/CCN.txt => perf/arm-ccn.txt}                   | 0
 drivers/bus/Kconfig                                               | 8 --------
 drivers/bus/Makefile                                              | 2 --
 drivers/perf/Kconfig                                              | 7 +++++++
 drivers/perf/Makefile                                             | 1 +
 drivers/{bus => perf}/arm-ccn.c                                   | 0
 7 files changed, 8 insertions(+), 10 deletions(-)
 rename Documentation/devicetree/bindings/{arm/ccn.txt => perf/arm-ccn.txt} (100%)
 rename Documentation/{arm/CCN.txt => perf/arm-ccn.txt} (100%)
 rename drivers/{bus => perf}/arm-ccn.c (100%)

diff --git a/Documentation/devicetree/bindings/arm/ccn.txt b/Documentation/devicetree/bindings/perf/arm-ccn.txt
similarity index 100%
rename from Documentation/devicetree/bindings/arm/ccn.txt
rename to Documentation/devicetree/bindings/perf/arm-ccn.txt
diff --git a/Documentation/arm/CCN.txt b/Documentation/perf/arm-ccn.txt
similarity index 100%
rename from Documentation/arm/CCN.txt
rename to Documentation/perf/arm-ccn.txt
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index 57e011d36a79..116446c42c6b 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -48,14 +48,6 @@ config ARM_CCI5xx_PMU
 
 	  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
 	bool "Broadcom STB GISB bus arbiter"
 	depends on ARM || ARM64 || MIPS
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 9bcd0bf3954b..19733afddd0a 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -5,8 +5,6 @@
 
 # Interconnect bus drivers for ARM platforms
 obj-$(CONFIG_ARM_CCI)		+= arm-cci.o
-obj-$(CONFIG_ARM_CCN)		+= arm-ccn.o
-
 obj-$(CONFIG_BRCMSTB_GISB_ARB)	+= brcmstb_gisb.o
 obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
 obj-$(CONFIG_MIPS_CDMM)		+= mips_cdmm.o
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index da5724cd89cf..331b6d992b5a 100644
--- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig
@@ -5,6 +5,13 @@
 menu "Performance monitor support"
 	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
 	depends on ARM || ARM64
 	bool "ARM PMU framework"
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
index c2f27419bdf0..5004abee0f3a 100644
--- a/drivers/perf/Makefile
+++ b/drivers/perf/Makefile
@@ -1,4 +1,5 @@
 # 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_PMU) += arm_pmu.o arm_pmu_platform.o
 obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
diff --git a/drivers/bus/arm-ccn.c b/drivers/perf/arm-ccn.c
similarity index 100%
rename from drivers/bus/arm-ccn.c
rename to drivers/perf/arm-ccn.c
-- 
2.16.1.dirty

  reply	other threads:[~2018-02-15 18:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-15 18:51 [PATCH v2 0/6] Arm interconnect PMU driver tidyup Robin Murphy
2018-02-15 18:51 ` Robin Murphy [this message]
2018-02-15 18:51 ` [PATCH v2 2/6] drivers/bus: Split Arm CCI driver Robin Murphy
2018-02-15 18:51 ` [PATCH v2 3/6] perf/arm-cci: Simplify CPU hotplug Robin Murphy
2018-02-15 18:51 ` [PATCH v2 4/6] bus/arm-cci: Streamline devicetree handling a bit Robin Murphy
2018-02-15 18:51 ` [PATCH v2 5/6] perf/arm-cci: Clean up model discovery Robin Murphy
2018-02-15 18:51 ` [PATCH v2 6/6] perf/arm-cci: Untangle global cci_ctrl_base Robin Murphy
2018-03-06 16:38 ` [PATCH v2 0/6] Arm interconnect PMU driver tidyup Arnd Bergmann
2018-03-06 16:52   ` Robin Murphy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6a67d4835622c146051e32381f856c67acc8ec93.1518717258.git.robin.murphy@arm.com \
    --to=robin.murphy@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.