From patchwork Wed Nov 19 11:49:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 41156 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C2FA5241C9 for ; Wed, 19 Nov 2014 11:53:14 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id q1sf288388lam.9 for ; Wed, 19 Nov 2014 03:53:13 -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=NP8XNUv030UB/MI5A4oBo7ywIllrtyPQ/OUIwDtvmxw=; b=jfsue5uy6OHVy5aYqOowTU3anPCtHFWCwbI3Ie2bNJeHftabUiXRtY1HgKM6DjGmQz P1KQFM/Urfnoi3i2NCGJIlRenXVryGUiBjPwmMqwJITwhA1+psep+pDWbMxcG4T7Y8H/ yhdciljo83bV+JbZhizjH+itZbN2kPljl3L/O3WZEWbWGH/3Iy+uShd5RyvHzCrAYOjv hPo8VDL08OvmGaosVumve9G312BFCguWlvQ1n2lDRjS7RjBKSWylL/4dLYa1ISHsyRXZ fFCb4KlwgVvQ1DiGesy41CBVcuxaCbJK9ENWKRegOtcayt/SgJhJ6Ip03ZeyMCYx+5WV QacA== X-Gm-Message-State: ALoCoQmxcnwA//hZwbEaoYMPx6dpjP8Kf8UG/bP2ebaSr+VOti+W/svMFM67QwEcbMo4x6fr2pss X-Received: by 10.112.119.194 with SMTP id kw2mr325933lbb.16.1416397993720; Wed, 19 Nov 2014 03:53:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.9 with SMTP id p9ls1456054lag.80.gmail; Wed, 19 Nov 2014 03:53:13 -0800 (PST) X-Received: by 10.152.21.167 with SMTP id w7mr4918381lae.70.1416397993579; Wed, 19 Nov 2014 03:53:13 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id li6si1537866lbc.87.2014.11.19.03.53.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 03:53:13 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id pv20so345320lab.23 for ; Wed, 19 Nov 2014 03:53:13 -0800 (PST) X-Received: by 10.152.8.170 with SMTP id s10mr4881184laa.56.1416397993493; Wed, 19 Nov 2014 03:53:13 -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 ew9csp68527lbc; Wed, 19 Nov 2014 03:53:12 -0800 (PST) X-Received: by 10.70.41.13 with SMTP id b13mr45247400pdl.20.1416397991809; Wed, 19 Nov 2014 03:53:11 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id gh6si2344396pbc.117.2014.11.19.03.53.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2014 03:53:11 -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 1Xr3nk-0008CC-4I; Wed, 19 Nov 2014 11:52:00 +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 1Xr3n5-0007hC-Qn for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 11:51:20 +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 sAJBoMwt024151; Wed, 19 Nov 2014 11:50:56 GMT From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] arm: shmobile: specify PMUs are for ARMv7 CPUs Date: Wed, 19 Nov 2014 11:49:59 +0000 Message-Id: <1416397800-12457-6-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_035120_261204_8B53DC30 X-CRM114-Status: GOOD ( 11.83 ) 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 , Simon Horman , Magnus Damm , Arnd Bergmann 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.50 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 shmobile board code. This will allow us to split the ARMv6, ARMv7, and XScale PMU drivers Signed-off-by: Mark Rutland Cc: Simon Horman Cc: Magnus Damm Cc: Olof Johansson Cc: Arnd Bergmann --- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 8894e1b..f3abc9e 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -659,7 +659,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, diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index b7bd8e5..23aa1c1 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -546,7 +546,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,