From patchwork Tue Sep 16 22:46:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 37475 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5610120549 for ; Tue, 16 Sep 2014 22:47:01 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id cc10sf92550wib.9 for ; Tue, 16 Sep 2014 15:47:00 -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=awuJzpp+mQc0HGR23oY0d/1lQYgNkf97rqCvspLkw8pi0TN9fXvLKzKMmllCcVR2fG qEV8I4LeooCOikBhMrDFFyiqInaZDoO9RE3yg+hcC/ZS265olSr1AC36tmyAOdxixH3z ar7Uzw49aMXEWjdEngyOxJkjuVd6JeJ18hgYLvswH/KcQqnptBPyey33SBEHX3pi7z5Y qw94eW3/QDE35MSLYv+M182mljwJPwgAc56ZOZiGvfLK+pt1KASbXw0Hsk21fayNkiKD 73apSDjL+osMGqQAOdvV6vv9i1C6fJtSIO+w6hpPWPNttrEGcsFqUKbLe/+dKVHmxgW+ wZDA== X-Gm-Message-State: ALoCoQlUxcB/VqjjFhQhB+79QcvGl9qxOIskh+a2vrlespgh+hQtt5sxdV6appvJ/NFvkr6gh9Xd X-Received: by 10.112.89.8 with SMTP id bk8mr8875896lbb.6.1410907620529; Tue, 16 Sep 2014 15:47:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.165 with SMTP id f5ls59010lam.33.gmail; Tue, 16 Sep 2014 15:47:00 -0700 (PDT) X-Received: by 10.112.14.33 with SMTP id m1mr37994977lbc.16.1410907620392; Tue, 16 Sep 2014 15:47:00 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id r1si23323342lar.58.2014.09.16.15.47.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 15:47:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id s18so769563lam.0 for ; Tue, 16 Sep 2014 15:47:00 -0700 (PDT) X-Received: by 10.112.199.197 with SMTP id jm5mr37470820lbc.19.1410907620207; Tue, 16 Sep 2014 15:47:00 -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 of9csp483622lbb; Tue, 16 Sep 2014 15:46:59 -0700 (PDT) X-Received: by 10.70.14.67 with SMTP id n3mr10667466pdc.132.1410907617754; Tue, 16 Sep 2014 15:46:57 -0700 (PDT) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by mx.google.com with ESMTPS id g7si31880511pat.202.2014.09.16.15.46.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Sep 2014 15:46:57 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.52 as permitted sender) client-ip=209.85.220.52; Received: by mail-pa0-f52.google.com with SMTP id kq14so710311pab.25 for ; Tue, 16 Sep 2014 15:46:56 -0700 (PDT) X-Received: by 10.69.26.105 with SMTP id ix9mr54791260pbd.29.1410907616666; Tue, 16 Sep 2014 15:46:56 -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 hz4sm15089762pbc.22.2014.09.16.15.46.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Sep 2014 15:46:56 -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 v10 4/9] arm: ks8695: Migrate debug_ll macros to shared directory Date: Tue, 16 Sep 2014 23:46:23 +0100 Message-Id: <1410907588-19957-5-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1410907588-19957-1-git-send-email-daniel.thompson@linaro.org> References: <1410907588-19957-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.215.41 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