From patchwork Tue Jul 1 15:11:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 32897 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1626203C0 for ; Tue, 1 Jul 2014 15:13:57 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kq14sf52698728pab.4 for ; Tue, 01 Jul 2014 08:13:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=rHYvDIcqrlHHlFn46r6hXFYHPfGBEFXCJhTrpDpLTFc=; b=HKLp8TpnT1JGUJFR4Bpk42OkexzcihkrAontLzS9Nzu6ne+Wyc4WYEoxgj0I7LIirU ex9c34LLlBmo/nHsdyrDQ34VreWKXOgo0e70VDPVMheIy62cAgcT/ea9Wc2I8RtKoRtV vLpP81MG1lYy4WeUVVVmBmJ7xanMgLt2tC1wrW7YrFnU3M0fQVm57gGAWy9TXwmFbJg6 Z0nJOpWEN4l3M0srcl/5um/bAE+dYG+86sUGfqxqOJqpXw3wqXXS8SX6QFPaEP8T+yY/ xzYKeVPKFUdamoP/PyQpNhKl3B/ClFBvIEt/xdk2z3JkFHPhtDiDKiy51TfJnEcZiNr4 qzmw== X-Gm-Message-State: ALoCoQlW1vR5QEiu+aQ1HTu1yWtLi+PD7pawoQu2+6fZOnG5PHcKedVGRBvzWpCQ3k5FrCpXJgPn X-Received: by 10.68.133.138 with SMTP id pc10mr25455781pbb.5.1404227637093; Tue, 01 Jul 2014 08:13:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.33 with SMTP id 30ls1995721qgw.13.gmail; Tue, 01 Jul 2014 08:13:56 -0700 (PDT) X-Received: by 10.220.68.83 with SMTP id u19mr1176190vci.52.1404227636905; Tue, 01 Jul 2014 08:13:56 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id k3si11544220vcg.20.2014.07.01.08.13.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Jul 2014 08:13:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jz11so9786025veb.31 for ; Tue, 01 Jul 2014 08:13:56 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr1167988veb.61.1404227636781; Tue, 01 Jul 2014 08:13:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp222493vcb; Tue, 1 Jul 2014 08:13:56 -0700 (PDT) X-Received: by 10.66.119.172 with SMTP id kv12mr60510508pab.34.1404227636095; Tue, 01 Jul 2014 08:13:56 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id yr10si27298620pac.82.2014.07.01.08.13.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Jul 2014 08:13:56 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1zje-0008UI-GZ; Tue, 01 Jul 2014 15:12:42 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1zj9-00084v-M0 for linux-arm-kernel@lists.infradead.org; Tue, 01 Jul 2014 15:12:12 +0000 Received: from leverpostej.cambridge.arm.com (leverpostej.cambridge.arm.com [10.1.205.151]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s61FBMwv008167; Tue, 1 Jul 2014 16:11:40 +0100 (BST) From: Mark Rutland To: will.deacon@arm.com Subject: [PATCH 7/8] arm: perf: add more specific platform device IDs Date: Tue, 1 Jul 2014 16:11:17 +0100 Message-Id: <1404227478-9645-8-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404227478-9645-1-git-send-email-mark.rutland@arm.com> References: <1404227478-9645-1-git-send-email-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140701_081212_096233_F8ABC03E X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mark.rutland@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 When described in DT, PMUs are given very specific compatible strings (e.g. "arm,cortex-a15-pmu") which makes it very easy to reorganise the way individual PMUs are handled (i.e. we can easily split them into separate drivers). The same is not true of PMUs described in board files, which are all use the platform_device_id "arm-pmu" and must all be handled by the same driver. To enable splitting the ARMv6, ARMv7, and XScale PMU drivers we need board files to identify which variant they provide. As a first step, this patch adds new platform_device_id values: "armv6-pmu", "armv7-pmu, and "xscale-pmu". Once board files are moved over and all existing uses of "arm-pmu" are gone, we can split the existing driver apart. Signed-off-by: Mark Rutland Cc: Will Deacon --- arch/arm/kernel/perf_event_cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index 191aff0..c63dc42 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@ -241,6 +241,9 @@ static struct of_device_id cpu_pmu_of_device_ids[] = { static struct platform_device_id cpu_pmu_plat_device_ids[] = { {.name = "arm-pmu"}, + {.name = "armv6-pmu"}, + {.name = "armv7-pmu"}, + {.name = "xscale-pmu"}, {}, };