From patchwork Tue Sep 16 23:57:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 37487 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 838CE20549 for ; Tue, 16 Sep 2014 23:58:16 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id ty20sf330502lab.0 for ; Tue, 16 Sep 2014 16:58:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=bhqZfP+O6+r6MZ3dhD2irdWh7nS3pDJQcD5xJSsoHnQ=; b=bYygykChcT9yXa9Qvj66Rc+NYxYL/cR7Lx/gMKBxX0u5UQ1ZsCdJCkMYWa4bfZSPqs Jr0Y778iXv3fS55HRcygUF+S83sI/ofAiM65geWFn/CHXPMrI2IrsUtJoo/FX8b30Bap QIDPDktT8YUWR9uYC41+NwhJFmWYOUm1sBykUlyBpThbVw21RMXUVC+qb/1ZXDy7j2R4 WFD+s01nyrtsodNbOiXIc4NW9I9sC732xfYZ1979QzCmG+WJBXGQoSTE4RXIgORxQJKx M1TZdvxs2kRT+2OSfJjcBMAPIIwtECchr+tpe/ZhH3qvTBTAmYyM9I0VSfEYKFKhRkxD vLrw== X-Gm-Message-State: ALoCoQl/xymxVA1g/Y0lSYIgUTqTTSGcSm5eVvRwKeGhkaYkDi/EI1PIrdVXeWExD0rJEM1o7e4o X-Received: by 10.180.8.1 with SMTP id n1mr7230171wia.1.1410911895433; Tue, 16 Sep 2014 16:58:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.69 with SMTP id u5ls53030lal.100.gmail; Tue, 16 Sep 2014 16:58:14 -0700 (PDT) X-Received: by 10.153.4.39 with SMTP id cb7mr40202172lad.19.1410911894757; Tue, 16 Sep 2014 16:58:14 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx.google.com with ESMTPS id xq9si13128192lbb.112.2014.09.16.16.58.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 16:58:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id c11so821631lbj.29 for ; Tue, 16 Sep 2014 16:58:14 -0700 (PDT) X-Received: by 10.152.27.200 with SMTP id v8mr40719435lag.53.1410911894693; Tue, 16 Sep 2014 16:58:14 -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.112.130.169 with SMTP id of9csp489478lbb; Tue, 16 Sep 2014 16:58:13 -0700 (PDT) X-Received: by 10.68.95.129 with SMTP id dk1mr55430722pbb.25.1410911892591; Tue, 16 Sep 2014 16:58:12 -0700 (PDT) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by mx.google.com with ESMTPS id yo5si32010187pbb.166.2014.09.16.16.58.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 16:58:12 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.192.173 as permitted sender) client-ip=209.85.192.173; Received: by mail-pd0-f173.google.com with SMTP id ft15so832608pdb.4 for ; Tue, 16 Sep 2014 16:58:11 -0700 (PDT) X-Received: by 10.68.213.6 with SMTP id no6mr54920636pbc.53.1410911891717; Tue, 16 Sep 2014 16:58:11 -0700 (PDT) Received: from harvey.bri.st.com.com (70-35-38-154.static.wiline.com. [70.35.38.154]) by mx.google.com with ESMTPSA id st7sm15682757pab.7.2014.09.16.16.58.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Sep 2014 16:58:11 -0700 (PDT) From: Daniel Thompson To: Russell King Cc: Daniel Thompson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com, Arnd Bergmann , Paul Bolle , patches@linaro.org, linaro-kernel@lists.linaro.org, Greg Ungerer , Arnd Bergmann Subject: [PATCH v11 4/9] arm: ks8695: Migrate debug_ll macros to shared directory Date: Tue, 16 Sep 2014 16:57:52 -0700 Message-Id: <1410911877-24903-5-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1410911877-24903-1-git-send-email-daniel.thompson@linaro.org> References: <1410911877-24903-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) 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: , As part of the migration a couple of uart definitions have been copied from of the platform specific header files. Note that, in order to keep oldconfig working nicely we must defer the removal of arch/arm/mach-ks8695/include/mach/debug-macro.S until DEBUG_LL_UART_NONE has been removed. Signed-off-by: Daniel Thompson Cc: Russell King Cc: Greg Ungerer Cc: Arnd Bergmann --- arch/arm/Kconfig.debug | 8 ++++++++ .../include/mach/debug-macro.S => include/debug/ks8695.S} | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9c46729..97c3058 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -348,6 +348,13 @@ choice Say Y here if you want the debug print routines to direct their output to UART1 serial port on KEYSTONE2 devices. + config DEBUG_KS8695_UART + bool "KS8695 Debug UART" + depends on ARCH_KS8695 + help + Say Y here if you want kernel low-level debugging support + on KS8695. + config DEBUG_MMP_UART2 bool "Kernel low-level debugging message via MMP UART2" depends on ARCH_MMP @@ -1017,6 +1024,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART || \ DEBUG_IMX6SX_UART + default "debug/ks8695.S" if DEBUG_KS8695_UART default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/include/debug/ks8695.S similarity index 80% rename from arch/arm/mach-ks8695/include/mach/debug-macro.S rename to arch/arm/include/debug/ks8695.S index a79e489..961da1f 100644 --- a/arch/arm/mach-ks8695/include/mach/debug-macro.S +++ b/arch/arm/include/debug/ks8695.S @@ -1,5 +1,5 @@ /* - * arch/arm/mach-ks8695/include/mach/debug-macro.S + * arch/arm/include/debug/ks8695.S * * Copyright (C) 2006 Ben Dooks * Copyright (C) 2006 Simtec Electronics @@ -11,8 +11,12 @@ * published by the Free Software Foundation. */ -#include -#include +#define KS8695_UART_PA 0x03ffe000 +#define KS8695_UART_VA 0xf00fe000 +#define KS8695_URTH (0x04) +#define KS8695_URLS (0x14) +#define URLS_URTE (1 << 6) +#define URLS_URTHRE (1 << 5) .macro addruart, rp, rv, tmp ldr \rp, =KS8695_UART_PA @ physical base address