From patchwork Fri Oct 24 10:54:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 39431 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0590324026 for ; Fri, 24 Oct 2014 10:59:08 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gi9sf1692900lab.6 for ; Fri, 24 Oct 2014 03:59:07 -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=hCA6uSBG3nL4ZEGlULeTn1ikBd0jISVgapthGfXCf1U=; b=FgGdJCV48bla6uvqz7Hl3qCEOkw5rgSe/sAors6+XSJzVCxZbQ0Sx5rl4kBLXMRkgG RiikcXLeUxllmEoeRHFvng/4GfzD7ozPNjy+cnxCaMU65SSarXIdNFscc4g0eP6xZGKV dBDINFdhjsWFG5ThneqTJAbRqq4AwPZZIWwQCVXGjhhOK/tDpabFWUvz4spUtHuvcO+H LTR4vRWlX0iCiSQUvLkvev3wKeJOtsMKbgETDcwgFzxs3o+FCDE8uya1LLxw/CAxKbB4 Y2pJszmPbJ7KYyB+x52NIc3FbJuwSUEt4Q7jnutD9MeNLQ+EV8O070kS3in5w6G88X7Q 33LA== X-Gm-Message-State: ALoCoQkFGtFcZhzIUd9w5hz528pt3tRPgWYz5/LPWvDAL0htJ/GWAeFxdRGz19rwdnP4IZPaKim0 X-Received: by 10.180.182.164 with SMTP id ef4mr692139wic.0.1414148347839; Fri, 24 Oct 2014 03:59:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.194 with SMTP id t2ls405971laa.14.gmail; Fri, 24 Oct 2014 03:59:07 -0700 (PDT) X-Received: by 10.112.54.162 with SMTP id k2mr3548080lbp.63.1414148347522; Fri, 24 Oct 2014 03:59:07 -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 d5si6429168lag.46.2014.10.24.03.59.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Oct 2014 03:59:07 -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 pn19so2408875lab.14 for ; Fri, 24 Oct 2014 03:59:07 -0700 (PDT) X-Received: by 10.112.189.10 with SMTP id ge10mr3563558lbc.23.1414148347298; Fri, 24 Oct 2014 03:59:07 -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.84.229 with SMTP id c5csp405675lbz; Fri, 24 Oct 2014 03:59:06 -0700 (PDT) X-Received: by 10.180.75.116 with SMTP id b20mr3126069wiw.49.1414148346731; Fri, 24 Oct 2014 03:59:06 -0700 (PDT) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com. [74.125.82.44]) by mx.google.com with ESMTPS id ba7si4831796wjb.133.2014.10.24.03.59.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Oct 2014 03:59:06 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 74.125.82.44 as permitted sender) client-ip=74.125.82.44; Received: by mail-wg0-f44.google.com with SMTP id y10so782154wgg.27 for ; Fri, 24 Oct 2014 03:59:06 -0700 (PDT) X-Received: by 10.181.13.20 with SMTP id eu20mr3238065wid.36.1414148346524; Fri, 24 Oct 2014 03:59:06 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id f7sm1601214wiz.13.2014.10.24.03.59.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Oct 2014 03:59:05 -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 , Srinivas Kandagatla , patches@linaro.org, linaro-kernel@lists.linaro.org, Greg Ungerer , Arnd Bergmann Subject: [PATCH v12 10/15] arm: ks8695: Migrate debug_ll macros to shared directory Date: Fri, 24 Oct 2014 11:54:31 +0100 Message-Id: <1414148076-12685-11-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1414148076-12685-1-git-send-email-daniel.thompson@linaro.org> References: <1414148076-12685-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. 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 5881c94..c8f623c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -365,6 +365,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_MESON_UARTAO bool "Kernel low-level debugging via Meson6 UARTAO" depends on ARCH_MESON @@ -1050,6 +1057,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