From patchwork Thu May 2 16:16:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16600 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 343C4238EC for ; Thu, 2 May 2013 16:17:56 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 1sf1307538qee.3 for ; Thu, 02 May 2013 09:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=n1aSCqDrhR9/EMmNSamR2ZKQbnp7DQxkn2uR+TDh/ho=; b=cmxDNVjda962Io9pq5KM5eOdZwSrZM+naif+c9+qMwfC1r4LnWeExot1rSQUiAvwkN 4qe2lOtXHIGPku8LyhX4aycwRO7/VZpG/ak0TeFckMtiE6UwcEvH4QJX9VxdfwwpJaxU m6aLeu1Icdf1RMwcV6T6mrJWyjKW3RIUxN62n48tJGAr/WUjXjjhHlKqARUCEIKiDxEU nrgsLQWJf9rr0Af1pA4uMdagNG3kb1KNdwjRjFvKj9FDoQqqhwM8cx1b1Q58R5W1Weq3 wsnLwKXADPRqWSaEBbKAJZ3rEmFxKWb/vJNCeDxfohxnRfDcvqNEu+tSnF5gmYgrCwC1 bL0A== X-Received: by 10.58.133.132 with SMTP id pc4mr6481289veb.4.1367511468138; Thu, 02 May 2013 09:17:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.33 with SMTP id v1ls1261474qej.76.gmail; Thu, 02 May 2013 09:17:47 -0700 (PDT) X-Received: by 10.52.70.206 with SMTP id o14mr2120318vdu.63.1367511467904; Thu, 02 May 2013 09:17:47 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id gr9si3222371veb.1.2013.05.02.09.17.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 09:17:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ha12so640038vcb.8 for ; Thu, 02 May 2013 09:17:47 -0700 (PDT) X-Received: by 10.58.48.166 with SMTP id m6mr2346289ven.59.1367511467789; Thu, 02 May 2013 09:17:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp209662veb; Thu, 2 May 2013 09:17:47 -0700 (PDT) X-Received: by 10.180.183.139 with SMTP id em11mr14512870wic.16.1367511465921; Thu, 02 May 2013 09:17:45 -0700 (PDT) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by mx.google.com with SMTP id m7si8733894eey.102.2013.05.02.09.17.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 09:17:45 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.119; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKUYKRkmG+MMeF2sbVCq11F4sha9jqwWeo@postini.com; Thu, 02 May 2013 16:17:45 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 9BEDEDB; Thu, 2 May 2013 16:09:13 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 4368618AD; Thu, 2 May 2013 16:17:19 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 0DA1524C080; Thu, 2 May 2013 18:17:10 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 2 May 2013 18:17:17 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 2/7] ARM: u300: remove deps from debug macro Date: Thu, 2 May 2013 18:16:50 +0200 Message-ID: <1367511416-4312-3-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> References: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkVMSNJ4TTpyM2XEalV6FDr5kQkte/NrYQlprxz4Nx/8CppTXKrP4VxkJNa0lkrgYJleDxm X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij This rids the dependency to (which is an implicit dependency to ) from the U300 debug macro. Take this opportunity to update the file header. Signed-off-by: Linus Walleij --- arch/arm/include/debug/u300.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/debug/u300.S b/arch/arm/include/debug/u300.S index 8ae8e4a..6f04f08 100644 --- a/arch/arm/include/debug/u300.S +++ b/arch/arm/include/debug/u300.S @@ -1,14 +1,11 @@ /* - * - * arch-arm/mach-u300/include/mach/debug-macro.S - * - * - * Copyright (C) 2006-2009 ST-Ericsson AB + * Copyright (C) 2006-2013 ST-Ericsson AB * License terms: GNU General Public License (GPL) version 2 * Debugging macro include header. * Author: Linus Walleij */ -#include +#define U300_SLOW_PER_PHYS_BASE 0xc0010000 +#define U300_SLOW_PER_VIRT_BASE 0xff000000 .macro addruart, rp, rv, tmp /* If we move the address using MMU, use this. */