From patchwork Fri May 31 09:18:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17337 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2050B25CAB for ; Fri, 31 May 2013 09:21:14 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id d10sf1623171vea.4 for ; Fri, 31 May 2013 02:21:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to: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=3ivoV8Xs2CnRnA7l3LbpAEZOklVZwShJqKNbz8EfwBc=; b=GsIIVmd1rVrXxQqbGTzxVrliotH2HIKpTciVrq+hOhwBSNSIwPZ9XDLxtjmMASN3h5 OFebStuBNnz8TUJgxmQ+RM9pBaVO7LdSbPdD535PapPmRDizVICcdj09GhX6MFXkaPNh g9g8CadWUs0PN8mflrJV8S3fk7fqSLs0dytTkL2GETI17E64cvBwMkROvJXfOLY+d9xz HITNpHYZwK2HePsrnydbJzxy187BPvZfgppUi6XP3oVf+9Zi/HGGqRWth7l5ggcZwk0c AoRSArxWxyfVXnrSMcLxbjEUi9Ihycjfw1cVyF7Qa7ZL/mx5p3Wp/xTij8pADuYCusLX BSzg== X-Received: by 10.224.205.138 with SMTP id fq10mr6299765qab.1.1369992073666; Fri, 31 May 2013 02:21:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.117.104 with SMTP id kd8ls838252qeb.93.gmail; Fri, 31 May 2013 02:21:13 -0700 (PDT) X-Received: by 10.220.161.2 with SMTP id p2mr8756977vcx.72.1369992073451; Fri, 31 May 2013 02:21:13 -0700 (PDT) Received: from mail-vb0-x233.google.com (mail-vb0-x233.google.com [2607:f8b0:400c:c02::233]) by mx.google.com with ESMTPS id qu17si8549071vec.33.2013.05.31.02.21.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:13 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::233; Received: by mail-vb0-f51.google.com with SMTP id x16so891546vbf.10 for ; Fri, 31 May 2013 02:21:13 -0700 (PDT) X-Received: by 10.52.163.207 with SMTP id yk15mr7855128vdb.42.1369992073187; Fri, 31 May 2013 02:21:13 -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.220.229.199 with SMTP id jj7csp42428vcb; Fri, 31 May 2013 02:21:12 -0700 (PDT) X-Received: by 10.14.32.8 with SMTP id n8mr12617935eea.98.1369992072232; Fri, 31 May 2013 02:21:12 -0700 (PDT) Received: from eu1sys200aog102.obsmtp.com (eu1sys200aog102.obsmtp.com [207.126.144.113]) by mx.google.com with SMTP id 8si30058247eeg.109.2013.05.31.02.20.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:12 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.113 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.113; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob102.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrbLduSNUce7g/E0eYBipJwVMm5ds5@postini.com; Fri, 31 May 2013 09:21:09 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 20ED657; Fri, 31 May 2013 09:19:42 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 6062457; Fri, 31 May 2013 09:20:42 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 09D33A8065; Fri, 31 May 2013 11:20:38 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:41 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 23/39] ARM: u300: remove deps from debug macro Date: Fri, 31 May 2013 11:18:58 +0200 Message-ID: <1369991954-17406-24-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkwyWXeb+N2Qpp7ja2n5+b3Jf3Y/PO7cZORzPHNMedk7AuWb9bAC0ear9mIy8/si3odN3xF X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::233 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. Acked-by: Arnd Bergmann 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. */