From patchwork Thu Feb 15 18:51:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Murphy X-Patchwork-Id: 10223271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 53BF26055C for ; Thu, 15 Feb 2018 18:53:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42BF1262FF for ; Thu, 15 Feb 2018 18:53:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36DE328696; Thu, 15 Feb 2018 18:53:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B776E262FF for ; Thu, 15 Feb 2018 18:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xgvJ+7Y9vigskI77BbyZA6G1G/nA9i+XT4vqik/PDc4=; b=Ajvj3/34Qomm7C2WLL/U3l1vrP epm6EDcHMDcNCS/dhquOfb4gTCSo8YPwqk55/C/rAuLsjI+Sd9N4HXL6atrkE5xh1uCqam6X8aERZ bHGcTT9vH4ey+Gvvtkyq4iMmgDZSZ4//9+K38xs5bnQjuqYOdR3D4adngTkYuxnYkD5Nxhi6n3qY5 V+XfT7rUIVJ8yz/fUDWJDr2FQWmLYTbTU+/5xCw6eIDzaQCAme4KpLujcIBOvwO+Zrvgl6p7i8l3j y4cste443CQC7F3YlUw5fVPf6f4/NWuzxmzN3cGWAb4EuhiygVFslKkCCHM6ZPVtPTMofKlNeeP/2 7UUNsbHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emOf8-0000Vd-W7; Thu, 15 Feb 2018 18:53:43 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1emOdV-0007yd-Rz for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2018 18:52:06 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EAF5115AD; Thu, 15 Feb 2018 10:51:52 -0800 (PST) Received: from e110467-lin.cambridge.arm.com (e110467-lin.cambridge.arm.com [10.1.210.88]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DC6623F487; Thu, 15 Feb 2018 10:51:51 -0800 (PST) From: Robin Murphy To: arm@kernel.org Subject: [PATCH v2 1/6] drivers/bus: Move Arm CCN PMU driver Date: Thu, 15 Feb 2018 18:51:41 +0000 Message-Id: <6a67d4835622c146051e32381f856c67acc8ec93.1518717258.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.16.1.dirty In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180215_105202_012816_4F587654 X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org, pawel.moll@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Will Deacon Signed-off-by: Robin Murphy --- .../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