From patchwork Mon Jan 5 12:40:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 42737 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1267E26670 for ; Mon, 5 Jan 2015 12:42:13 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id u56sf3767140wes.7 for ; Mon, 05 Jan 2015 04:42:12 -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=2ubeiIJf+SkQgIu5wNM18GfOurpsiOQiRYzgHakI18g=; b=ej1HOC7IBmvHAwy35kjsyg5Tpnl+yeSpx508Hbpn3XUIIiKA/eiJmuU0BGAQYAeiSW UYiHlQcxOAE2rH5jrw0w4x6pzVqkG6xnoZHY5mI48/coivMY/GEOFXLE/NEx+XFcHOmh 6JiUXH7s+aDggOzNTIMvbq6g+hlE8KtDOGK62ZC+M0XXIxWa4xD0wcIR4pRh1CW0kMIz QHWLqDVlWglnzyDmiAnqgILqW/ur1JeYyerMZeBUjvMpIuGsUNuuKagdjWobbmSjvhyN 7fcR55dqNPA9Ga0xZVREqB+psO7hOFwclGZFVdgrrPJ3/U187azxCJDSvDpeFz5n+9hW +UAg== X-Gm-Message-State: ALoCoQmY/YCAdorkC912/UgxqQqlhIujuaO/kMmRGmB+rSX2TGheqv0UlV8KS7q+2pfWoFxIj763 X-Received: by 10.112.160.41 with SMTP id xh9mr241188lbb.12.1420461732309; Mon, 05 Jan 2015 04:42:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.202 with SMTP id u10ls1814997lau.68.gmail; Mon, 05 Jan 2015 04:42:12 -0800 (PST) X-Received: by 10.112.150.102 with SMTP id uh6mr79256712lbb.66.1420461732103; Mon, 05 Jan 2015 04:42:12 -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 z7si48096942laa.61.2015.01.05.04.42.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Jan 2015 04:42:12 -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 w7so17929178lbi.16 for ; Mon, 05 Jan 2015 04:42:12 -0800 (PST) X-Received: by 10.152.5.226 with SMTP id v2mr91865046lav.34.1420461731982; Mon, 05 Jan 2015 04:42:11 -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.9.200 with SMTP id c8csp870127lbb; Mon, 5 Jan 2015 04:42:10 -0800 (PST) X-Received: by 10.180.73.178 with SMTP id m18mr25035788wiv.65.1420461729938; Mon, 05 Jan 2015 04:42:09 -0800 (PST) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com. [74.125.82.173]) by mx.google.com with ESMTPS id m10si113041790wjx.45.2015.01.05.04.42.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Jan 2015 04:42:09 -0800 (PST) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 74.125.82.173 as permitted sender) client-ip=74.125.82.173; Received: by mail-we0-f173.google.com with SMTP id q58so7789394wes.4 for ; Mon, 05 Jan 2015 04:42:09 -0800 (PST) X-Received: by 10.194.85.161 with SMTP id i1mr178470333wjz.35.1420461729622; Mon, 05 Jan 2015 04:42:09 -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 ep9sm9796927wid.3.2015.01.05.04.42.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jan 2015 04:42:08 -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 3.19-rc2 v15 4/8] arm: ks8695: Migrate debug_ll macros to shared directory Date: Mon, 5 Jan 2015 12:40:20 +0000 Message-Id: <1420461624-4410-5-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1420461624-4410-1-git-send-email-daniel.thompson@linaro.org> References: <1420461624-4410-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 6ee9b0d361ee..eba36e35bad2 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -397,6 +397,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 @@ -1174,6 +1181,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/renesas-scif.S" if DEBUG_R7S72100_SCIF2 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