From patchwork Thu Sep 6 20:12:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1417661 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 551683FC85 for ; Thu, 6 Sep 2012 20:16: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 1T9iSK-0006GK-VX; Thu, 06 Sep 2012 20:13:41 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9iRr-0006Cr-K1 for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 20:13:12 +0000 Received: by obbta17 with SMTP id ta17so3374893obb.36 for ; Thu, 06 Sep 2012 13:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vvLRzAeSJajSAzZqMEUm4b1d1WvuX3NaE++7vO87YTQ=; b=cRJTHSS5dsEo83Tql+WNucdmR4nQrpnwIGpYLDHoo2RP+FrKxRfoWnP05LR2BMIEYK OfyRVN6fkvf5eAf4zxhklDaF7RYXumv1u1eLXuYOuVOL30F9Iwqom9xVznWjq4FPFTLL OjkmvxpMLFndtUDznszHUaLGkMSWNBPNUVuybGBmb+1OQv7DsVZfAwi20nv8cpa4dEPO FD/fm6WCnSAsaW7I4oWP9+EQIm42/E7BpNpS2raXiw0A/WvsHp6z5HYL4Bft2Kt/UR+B LIXFghQrwNbvxkhDeqlyxiRWRQFs99lOtZ3GSzfQYF33JMWe0tCXkGn/QhNbzPkv2JlN GH+Q== Received: by 10.182.75.9 with SMTP id y9mr3640491obv.86.1346962391072; Thu, 06 Sep 2012 13:13:11 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id n8sm2259708oec.5.2012.09.06.13.13.09 (version=SSLv3 cipher=OTHER); Thu, 06 Sep 2012 13:13:10 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/12] ARM: highbank: move debug macros to include/debug Date: Thu, 6 Sep 2012 15:12:45 -0500 Message-Id: <1346962375-26163-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346962375-26163-1-git-send-email-robherring2@gmail.com> References: <1346962375-26163-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed 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.214.177 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: Olof Johansson , Russell King , Rob Herring , Arnd Bergmann 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 Move highbank debug-macro.S over to common debug macro directory. Also, remove v7 specific movw/movt instructions so this can compile under v6 mode. Signed-off-by: Rob Herring --- arch/arm/Kconfig.debug | 1 + .../debug-macro.S => include/debug/highbank.S} | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename arch/arm/{mach-highbank/include/mach/debug-macro.S => include/debug/highbank.S} (83%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4f9760b..d9d8eff 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -376,6 +376,7 @@ endchoice config DEBUG_LL_INCLUDE string default "debug/icedcc.S" if DEBUG_ICEDCC + default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "mach/debug-macro.S" config EARLY_PRINTK diff --git a/arch/arm/mach-highbank/include/mach/debug-macro.S b/arch/arm/include/debug/highbank.S similarity index 83% rename from arch/arm/mach-highbank/include/mach/debug-macro.S rename to arch/arm/include/debug/highbank.S index cb57fe5..8cad432 100644 --- a/arch/arm/mach-highbank/include/mach/debug-macro.S +++ b/arch/arm/include/debug/highbank.S @@ -10,10 +10,8 @@ */ .macro addruart,rp,rv,tmp - movw \rv, #0x6000 - movt \rv, #0xfee3 - movw \rp, #0x6000 - movt \rp, #0xfff3 + ldr \rv, =0xfee36000 + ldr \rp, =0xfff36000 .endm #include