From patchwork Thu Jan 17 02:53:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1994431 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 7B11FDF2A2 for ; Thu, 17 Jan 2013 02:57:40 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TvfcU-00035S-Ak; Thu, 17 Jan 2013 02:54:22 +0000 Received: from mail-oa0-f41.google.com ([209.85.219.41]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tvfc8-00031T-Hy for linux-arm-kernel@lists.infradead.org; Thu, 17 Jan 2013 02:54:02 +0000 Received: by mail-oa0-f41.google.com with SMTP id k14so2172702oag.28 for ; Wed, 16 Jan 2013 18:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=iT32XML4NB1gLFRHd4VvmOiIbATdtt0BeAjnzfC662M=; b=NIMNf8+wYzAcxiwIvGvM/tJNOafvfpCLBr87HVJ5n86JoCUXtJArMZBv9T2+2jH+hQ J757jFUkP+CIwWj/GJwRYdm+pF1M5Jl0CccrPTiVZLbuK5dFe3KmQsb7TRe2kD8lAxyh qxAXOHsjkPzioHlxfLMq2Fc5t7SoZntjt5yPn0XMSp1/WcX+tsGXoVfLIueLU05GG+o7 fM+SIQvJsDEMFml8uhFrjVjkTaaM5cprXxtLbzkpR4x0rcIWxHEQ2tK24eVMMtKLq0fo EkTDw/QdkcCugh0Zi5oqv//DgMvgCB9IENyFox7XroitLZJWkHWxk573ThtlElQb62MT uEww== X-Received: by 10.182.77.230 with SMTP id v6mr2754155obw.66.1358391240074; Wed, 16 Jan 2013 18:54:00 -0800 (PST) Received: from rob-laptop.grandenetworks.net (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPS id y4sm137749oea.7.2013.01.16.18.53.52 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Jan 2013 18:53:55 -0800 (PST) From: Rob Herring To: Nicolas Pitre , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] ARM: omap2: use get_auxcr for aux ctrl register read Date: Wed, 16 Jan 2013 20:53:25 -0600 Message-Id: <1358391205-23943-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358391205-23943-1-git-send-email-robherring2@gmail.com> References: <1358391205-23943-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130116_215401_493409_01D14E20 X-CRM114-Status: GOOD ( 12.18 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.41 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kevin Hilman , Tony Lindgren , Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring Use get_auxcr instead of inline assembly to read the CP15 aux ctrl register. Signed-off-by: Rob Herring Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Nicolas Pitre Acked-by: Santosh Shilimkar Acked-by: Tony Lindgren --- arch/arm/mach-omap2/pm34xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 7be3622..bef8ef6 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -33,6 +33,7 @@ #include +#include #include #include #include @@ -216,9 +217,8 @@ static void omap34xx_save_context(u32 *save) u32 val; /* Read Auxiliary Control Register */ - asm("mrc p15, 0, %0, c1, c0, 1" : "=r" (val)); *save++ = 1; - *save++ = val; + *save++ = get_auxcr(); /* Read L2 AUX ctrl register */ asm("mrc p15, 1, %0, c9, c0, 2" : "=r" (val));