From patchwork Wed Nov 19 11:50:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 41157 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 228C0241C9 for ; Wed, 19 Nov 2014 11:53:25 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id gd6sf294255lab.0 for ; Wed, 19 Nov 2014 03:53:24 -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=et8jKef4MPb+ZFLRqUEc+0WUSTBSxyxoguVuYJQa3e4=; b=NlFE1iPZpOQOSesUX9uETcabTPl6otxj9thE6VGLrOT7VZNpCJCEiNeg5/Z6mhKYcm 6AET+MOrNJQQ7cHOZ3Z6i3EXrU2PNF6KODhf6460jtwGu71MaLRd5wCU1tT4dWEv5kCP omXtTiZ8ip6UYzVP1HTot8h7SxCC2JSfGynRtf2Ql4BxsguYlDW6fngG9Bon/ggx3cmX v4OCIietkjHn2NI4oqNbVdvhs+rzQp/k0UC2iJ3tDtfdeoKIjUgKmMpP4qf6Lo8+2rgg zlHlP7yOtZKhtUQ+5LBfIuRXfFq3rkHu1CASSsKfnJq7/ElNNwthhNiXemItLjbix+T+ JofA== X-Gm-Message-State: ALoCoQnZKJ+BdNFOhLuc25+jDk3cR0deoUDDNmlSF1FkcFu8gKH6JvikYQgncGdG/lOkHzvLyjva X-Received: by 10.112.147.131 with SMTP id tk3mr10031473lbb.2.1416398004019; Wed, 19 Nov 2014 03:53:24 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.98 with SMTP id k2ls1349203lag.15.gmail; Wed, 19 Nov 2014 03:53:23 -0800 (PST) X-Received: by 10.152.2.41 with SMTP id 9mr4859420lar.47.1416398003858; Wed, 19 Nov 2014 03:53:23 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id bc18si1421373lab.128.2014.11.19.03.53.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 03:53:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so324083lbv.40 for ; Wed, 19 Nov 2014 03:53:23 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr4938274laz.27.1416398003720; Wed, 19 Nov 2014 03:53:23 -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 ew9csp68542lbc; Wed, 19 Nov 2014 03:53:22 -0800 (PST) X-Received: by 10.70.129.135 with SMTP id nw7mr20157020pdb.129.1416398002239; Wed, 19 Nov 2014 03:53:22 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id na5si2049001pdb.197.2014.11.19.03.53.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Nov 2014 03:53:22 -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 1Xr3nz-0008O0-4L; Wed, 19 Nov 2014 11:52:15 +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 1Xr3nM-0007n6-L5 for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 11:51:37 +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 sAJBoMwu024151; Wed, 19 Nov 2014 11:51:06 GMT From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] arm: omap: specify PMUs are for ARMv7 CPUs Date: Wed, 19 Nov 2014 11:50:00 +0000 Message-Id: <1416397800-12457-7-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_035137_023877_730C70A4 X-CRM114-Status: GOOD ( 10.32 ) 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 , Tony Lindgren , Olof Johansson , 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.217.181 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 omap board code. This will allow us to split the ARMv6, ARMv7, and XScale PMU drivers. The unnecessary include of asm/pmu.h is also removed. Signed-off-by: Mark Rutland Cc: Tony Lindgren Cc: Olof Johansson Cc: Arnd Bergmann Acked-by: Tony Lindgren --- arch/arm/mach-omap2/pmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c index 33c8846..a69e9a3 100644 --- a/arch/arm/mach-omap2/pmu.c +++ b/arch/arm/mach-omap2/pmu.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "soc.h" #include "omap_hwmod.h" @@ -37,7 +37,8 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[]) { int i; struct omap_hwmod *oh[3]; - char *dev_name = "arm-pmu"; + char *dev_name = cpu_architecture() == CPU_ARCH_ARMv6 ? + "armv6-pmu" : "armv7-pmu"; if ((!oh_num) || (oh_num > 3)) return -EINVAL;