From patchwork Mon Nov 17 14:49:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 40920 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4FDFC21F5F for ; Mon, 17 Nov 2014 14:49:31 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf11737901lbj.3 for ; Mon, 17 Nov 2014 06:49:30 -0800 (PST) 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=0MB7Brsz3OXLV6DPxuGsFEgdaghEuHN2wguGxfZrf2Y=; b=l/Q9XhX/fQNUcXShxuNB59bLiOKYCBWHZi3/aHJ3EWu/FfmVaShux8N6y+206xiggd AZDnX9r2zj+0ueKJH65q7UatczTNepgf17BQtEzeg8zFYpD1HBo9iW1Vdp0oBn6dAew/ UqdwCMdBT9Kpdk7vsUpdvhiYI5bOUEKnAgJYQZqgyG4iDMund++g5KSHYLAONAWqptL8 +vRi0zGP4CvWm6qJJm5Tla2DPkhCF/v5uxA9QKdePv1VCBXaVds/C3L7v6yo0J+QYpEp 7qyiomtpOrcGX9rwPg08uk5oWHlCjQU1iTWmhlPysN5eRw7RHVcx3rjQU9uV1bLsh2dl sr0A== X-Gm-Message-State: ALoCoQkNo8CofNLGe2uE/CodZCYVd6C1vVrFV7joNNmwoY8CDIieNb6AWJ560TN/NnJ/c8KdgzvD X-Received: by 10.152.42.196 with SMTP id q4mr571558lal.6.1416235770012; Mon, 17 Nov 2014 06:49:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.39 with SMTP id b7ls997790lae.38.gmail; Mon, 17 Nov 2014 06:49:29 -0800 (PST) X-Received: by 10.112.132.67 with SMTP id os3mr326716lbb.90.1416235769445; Mon, 17 Nov 2014 06:49:29 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id dv6si52198167lbc.52.2014.11.17.06.49.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 06:49:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id b6so16106213lbj.16 for ; Mon, 17 Nov 2014 06:49:29 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr27673170laj.67.1416235769260; Mon, 17 Nov 2014 06:49:29 -0800 (PST) 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.184.201 with SMTP id ew9csp1164840lbc; Mon, 17 Nov 2014 06:49:28 -0800 (PST) X-Received: by 10.180.91.137 with SMTP id ce9mr32103772wib.60.1416235768596; Mon, 17 Nov 2014 06:49:28 -0800 (PST) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com. [74.125.82.44]) by mx.google.com with ESMTPS id n5si16549927wiz.31.2014.11.17.06.49.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 06:49:28 -0800 (PST) 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 x12so25029872wgg.17 for ; Mon, 17 Nov 2014 06:49:28 -0800 (PST) X-Received: by 10.180.90.241 with SMTP id bz17mr32053068wib.41.1416235768273; Mon, 17 Nov 2014 06:49:28 -0800 (PST) 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 mw7sm15545580wib.14.2014.11.17.06.49.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 06:49:27 -0800 (PST) From: Daniel Thompson To: Russell King , Arnd Bergmann Cc: Daniel Thompson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com, Paul Bolle , Srinivas Kandagatla , John Stultz , Sumit Semwal , patches@linaro.org, linaro-kernel@lists.linaro.org, Greg Ungerer , Arnd Bergmann Subject: [PATCH v13 4/9] arm: ks8695: Migrate debug_ll macros to shared directory Date: Mon, 17 Nov 2014 14:49:05 +0000 Message-Id: <1416235750-4766-5-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1416235750-4766-1-git-send-email-daniel.thompson@linaro.org> References: <1416235750-4766-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.171 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 1316c2b9a222..6dc39e69fe12 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 a79e48981202..961da1f32ab3 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