From patchwork Thu Sep 6 20:12:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1417781 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 EF9E2DFFCF for ; Thu, 6 Sep 2012 20:23:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9iZP-0002jI-4C; Thu, 06 Sep 2012 20:20:59 +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 1T9iZD-0002dD-FQ for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 20:20:50 +0000 Received: by obbta17 with SMTP id ta17so3391603obb.36 for ; Thu, 06 Sep 2012 13:20:46 -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=bkfMgWylN4y/ZS6UbgOG6Wa3mmeaO9fBvTBPzaijiYs=; b=0y6shrfM4fhQh0lzv7R/PiRuUYduUeTyAqUUFui2Xp4n/b5ZPGcEVvzTvDxS6QiIhA mykAynDgzDI40f7i8VPlqan8E1LcSja7MOtQr0DpK+TNqLcrcGOwXmCjU3WvvQcNTllB /chlI31ilarxcai2SH+xtrTTYbY2gMDkgbmSOylvfdWVwZ6IyshLQo6xPswYA+mi34ye aGrxNTYAzFAV8TpyRmJ09jWyu1gmrqBDGSVhi8/dPM1rFJ/6X8/P5sF6z/B/JD4s/KDX T9F5TGB1aP1UfacTpHlxmrvmbn5YV/QFdctPTnLJXHTIwCdJM4A8azWxxwSmx73cefEy JIIg== Received: by 10.182.154.70 with SMTP id vm6mr3716966obb.50.1346962396360; Thu, 06 Sep 2012 13:13:16 -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.15 (version=SSLv3 cipher=OTHER); Thu, 06 Sep 2012 13:13:15 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/12] ARM: mvebu: move debug macros to include/debug Date: Thu, 6 Sep 2012 15:12:47 -0500 Message-Id: <1346962375-26163-5-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: Andrew Lunn , Russell King , Jason Cooper , Arnd Bergmann , Rob Herring , Olof Johansson 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 mvebu debug-macro.S over to common debug macro directory. Signed-off-by: Rob Herring Cc: Jason Cooper Cc: Andrew Lunn --- arch/arm/Kconfig.debug | 8 ++++++++ .../mach/debug-macro.S => include/debug/mvebu.S} | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) rename arch/arm/{mach-mvebu/include/mach/debug-macro.S => include/debug/mvebu.S} (86%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 525d9bd..3bafdd2 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -261,6 +261,13 @@ choice Say Y here if you want the debug print routines to direct their output to the serial port on MSM 8960 devices. + config DEBUG_MVEBU_UART + bool "Kernel low-level debugging messages via MVEBU UART" + depends on ARCH_MVEBU + help + Say Y here if you want kernel low-level debugging support + on MVEBU based platforms. + config DEBUG_REALVIEW_STD_PORT bool "RealView Default UART" depends on ARCH_REALVIEW @@ -377,6 +384,7 @@ config DEBUG_LL_INCLUDE string default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/highbank.S" if DEBUG_HIGHBANK_UART + default "debug/mvebu.S" if DEBUG_MVEBU_UART default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 default "mach/debug-macro.S" diff --git a/arch/arm/mach-mvebu/include/mach/debug-macro.S b/arch/arm/include/debug/mvebu.S similarity index 86% rename from arch/arm/mach-mvebu/include/mach/debug-macro.S rename to arch/arm/include/debug/mvebu.S index 2282576..865c6d0 100644 --- a/arch/arm/mach-mvebu/include/mach/debug-macro.S +++ b/arch/arm/include/debug/mvebu.S @@ -11,7 +11,8 @@ * published by the Free Software Foundation. */ -#include +#define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 +#define ARMADA_370_XP_REGS_VIRT_BASE 0xfeb00000 .macro addruart, rp, rv, tmp ldr \rp, =ARMADA_370_XP_REGS_PHYS_BASE