From patchwork Wed Nov 19 11:49:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 41154 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DE4E6241C9 for ; Wed, 19 Nov 2014 11:52:44 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id r20sf588914wiv.1 for ; Wed, 19 Nov 2014 03:52:44 -0800 (PST) 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=HOl6ERHsXcZ3Z0xpkaNTUE0dKRzH9Ud073JGLOdzyLg=; b=AVNa6vs0hEwoW8X43KnScVEQKp3fuY0eDLgMBUSJ2rc28DyfBBsg37z+H5LaFar68I 7VOllvLV4mPMzbDo5A7kzr1kTcgbhce1o0kwxyLfwXK74T1+ySwoj/LE8gWayjGABW3/ Gbq5oZxzfTpX6583g4XJROCfbP9m/aN4QDUDHOEyKVhXYEYxnMGAW51KdsidXaMx6ZmK k3yghsW9jg3QRydoaFnS3aWHFge34EZB745rQsvFnepywbkRpSrtXN5YHdRq3n/TsMJ7 KUlnBjY7Fa7vSjDZ3NynoxBALrSccA0yx/hi5UoL0F7z3wzyJ2We+sCagKEi0IYcNT7C Mopg== X-Gm-Message-State: ALoCoQmSf7vG9mjCVIe6EEQ04ituzLTwgfm+Lw2CwyTvJBLRyWaQMznJtYwJmA2E2Csrl51OF9ga X-Received: by 10.180.85.97 with SMTP id g1mr4990959wiz.0.1416397964227; Wed, 19 Nov 2014 03:52:44 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.6 with SMTP id ci6ls1075886lad.30.gmail; Wed, 19 Nov 2014 03:52:44 -0800 (PST) X-Received: by 10.152.203.137 with SMTP id kq9mr4947470lac.51.1416397964076; Wed, 19 Nov 2014 03:52:44 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id d4si1513058lbb.116.2014.11.19.03.52.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 03:52:44 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id q1so356145lam.11 for ; Wed, 19 Nov 2014 03:52:44 -0800 (PST) X-Received: by 10.153.7.170 with SMTP id dd10mr4959487lad.44.1416397963970; Wed, 19 Nov 2014 03:52:43 -0800 (PST) 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.112.184.201 with SMTP id ew9csp68479lbc; Wed, 19 Nov 2014 03:52:43 -0800 (PST) X-Received: by 10.68.69.78 with SMTP id c14mr33703470pbu.68.1416397962467; Wed, 19 Nov 2014 03:52:42 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id gs10si2496153pac.6.2014.11.19.03.52.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2014 03:52:42 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=198.137.202.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 1Xr3nH-0007tc-6Q; Wed, 19 Nov 2014 11:51:31 +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 1Xr3mm-0007cW-13 for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 11:51:01 +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 sAJBoMwr024151; Wed, 19 Nov 2014 11:50:36 GMT From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/6] arm: vexpress: specify PMUs are for ARMv7 CPUs Date: Wed, 19 Nov 2014 11:49:57 +0000 Message-Id: <1416397800-12457-4-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416397800-12457-1-git-send-email-mark.rutland@arm.com> References: <1416397800-12457-1-git-send-email-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141119_035100_452660_56E64699 X-CRM114-Status: GOOD ( 10.54 ) 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 , Olof Johansson , Russell King , Arnd Bergmann , Pawel Moll 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.215.52 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 Now that we can specify which PMU variant we're likely to deal with, do so in the vexpress board code. This will allow us to split the ARMv6, ARMv7, and XScale PMU drivers. Signed-off-by: Mark Rutland Cc: Russell King Cc: Pawel Moll Cc: Olof Johansson Cc: Arnd Bergmann --- arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 27bea04..656a17f 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -139,7 +139,7 @@ static struct resource pmu_resources[] = { }; static struct platform_device pmu_device = { - .name = "arm-pmu", + .name = "armv7-pmu", .id = -1, .num_resources = ARRAY_SIZE(pmu_resources), .resource = pmu_resources,