From patchwork Wed Apr 9 19:45:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 3957521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 96A479F387 for ; Wed, 9 Apr 2014 19:49:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B185D206B2 for ; Wed, 9 Apr 2014 19:49:30 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AEDF2206B1 for ; Wed, 9 Apr 2014 19:49:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXyTR-000508-BI; Wed, 09 Apr 2014 19:47:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXyT7-0002CU-Cr; Wed, 09 Apr 2014 19:47:33 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXyS8-00025E-Hn for linux-arm-kernel@lists.infradead.org; Wed, 09 Apr 2014 19:46:49 +0000 Received: by mail-wi0-f179.google.com with SMTP id z2so3846149wiv.12 for ; Wed, 09 Apr 2014 12:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H6QvCPSOZH19VMIZtWDxbVEqD8l6NwNJxCWM1KVuooo=; b=eu2NDCkMS+6qD+9eUrBlspdEW5yOrTV9wFUjMtTVK5dCY1wdwFG809DOuFNdwGZMrg Dwk0hia17C8AFGjK756fTScxFz+/Gw0SU1WrNKGIooQ8e9VHiDUpk6aBR5ym83GfTf6O wKNYMf2cpTJX+v2ov9Mn+iJ7sx0Wuz749PCHATrsSMR4tSNENTc2/Q6uC4eHPiDloru4 63HSiEDLDxYRYFP4lz841IO4HQyePNBr1YZeaIlC5Rs3Xo5ER9tM5YlSb/n9GeF7LR9y 4XxPRPDH/ii8/9MRpYCQJfSo9ijmzq+yl4NXeaNaOrYLNRGVWhrdjYzcotmBoYT0tZZk B98Q== X-Received: by 10.180.78.200 with SMTP id d8mr38872411wix.34.1397072770672; Wed, 09 Apr 2014 12:46:10 -0700 (PDT) Received: from localhost.localdomain (87.Red-88-0-22.dynamicIP.rima-tde.net. [88.0.22.87]) by mx.google.com with ESMTPSA id vh3sm3069256wjc.18.2014.04.09.12.46.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 12:46:09 -0700 (PDT) From: Matthias Brugger To: linux-kernel@vger.kernel.org Subject: [PATCH 4/4] arm: mediatek: Add earlyprintk support for MT6589 Date: Wed, 9 Apr 2014 21:45:36 +0200 Message-Id: <1397072736-10793-5-git-send-email-matthias.bgg@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397072736-10793-1-git-send-email-matthias.bgg@gmail.com> References: <1397072736-10793-1-git-send-email-matthias.bgg@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140409_154638_724533_A788EBD3 X-CRM114-Status: GOOD ( 18.14 ) X-Spam-Score: -2.0 (--) Cc: mark.rutland@arm.com, andrew@lunn.ch, linux-doc@vger.kernel.org, thierry.reding@gmail.com, heiko.stuebner@bq.com, linux@arm.linux.org.uk, daniel.lezcano@linaro.org, florian.vaussard@epfl.ch, sebastian.hesselbarth@gmail.com, devicetree@vger.kernel.org, jason@lakedaemon.net, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, robh+dt@kernel.org, matthias.bgg@gmail.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, rdunlap@infradead.org, silvio.fricke@gmail.com, galak@codeaurora.org, olof@lixom.net, jic23@kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Matthias Brugger --- arch/arm/Kconfig.debug | 49 +++++++++++++++++++++++++++++++++++-- arch/arm/include/debug/mediatek.S | 38 ++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/debug/mediatek.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 4a2fc0b..dc51495 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -797,6 +797,38 @@ choice Say Y here if you want kernel low-level debugging support on Ux500 based platforms. + config DEBUG_MTK6589_UART0 + depends on ARCH_MEDIATEK + bool "Mediatek mt6589 UART0" + select DEBUG_UART_MEDIATEK + help + Say Y here if you want kernel low-level debugging support + on Mediatek mt6589 based platforms. + + config DEBUG_MTK6589_UART1 + depends on ARCH_MEDIATEK + bool "Mediatek mt6589 UART1" + select DEBUG_UART_MEDIATEK + help + Say Y here if you want kernel low-level debugging support + on Mediatek mt6589 based platforms. + + config DEBUG_MTK6589_UART2 + depends on ARCH_MEDIATEK + bool "Mediatek mt6589 UART2" + select DEBUG_UART_MEDIATEK + help + Say Y here if you want kernel low-level debugging support + on Mediatek mt6589 based platforms. + + config DEBUG_MTK6589_UART3 + depends on ARCH_MEDIATEK + bool "Mediatek mt6589 UART3" + select DEBUG_UART_MEDIATEK + help + Say Y here if you want kernel low-level debugging support + on Mediatek mt6589 based platforms. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -954,6 +986,10 @@ config DEBUG_MSM_UART bool depends on ARCH_MSM || ARCH_QCOM +config DEBUG_UART_MEDIATEK + bool + depends on ARCH_MEDIATEK + config DEBUG_LL_INCLUDE string default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250 @@ -971,6 +1007,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX53_UART ||\ DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART + default "debug/mediatek.S" if DEBUG_UART_MEDIATEK default "debug/msm.S" if DEBUG_MSM_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 @@ -1043,6 +1080,10 @@ config DEBUG_UART_PHYS default 0xd0012000 if DEBUG_MVEBU_UART default 0xd4017000 if DEBUG_MMP_UART2 default 0xd4018000 if DEBUG_MMP_UART3 + default 0x11006000 if DEBUG_MTK6589_UART0 + default 0x11007000 if DEBUG_MTK6589_UART1 + default 0x11008000 if DEBUG_MTK6589_UART2 + default 0x11009000 if DEBUG_MTK6589_UART3 default 0xe0000000 if ARCH_SPEAR13XX default 0xf0000be0 if ARCH_EBSA110 default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE @@ -1058,7 +1099,7 @@ config DEBUG_UART_PHYS default 0xfffff700 if ARCH_IOP33X depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ DEBUG_LL_UART_EFM32 || \ - DEBUG_UART_8250 || DEBUG_UART_PL01X + DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_UART_MEDIATEK config DEBUG_UART_VIRT hex "Virtual base address of debug UART" @@ -1087,6 +1128,10 @@ config DEBUG_UART_VIRT default 0xfe012000 if ARCH_ORION5X default 0xfe017000 if DEBUG_MMP_UART2 default 0xfe018000 if DEBUG_MMP_UART3 + default 0xF1006000 if DEBUG_MTK6589_UART0 + default 0xF1007000 if DEBUG_MTK6589_UART1 + default 0xF1008000 if DEBUG_MTK6589_UART2 + default 0xF1009000 if DEBUG_MTK6589_UART3 default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART default 0xfe230000 if DEBUG_PICOXCELL_UART default 0xfe300000 if DEBUG_BCM_KONA_UART @@ -1116,7 +1161,7 @@ config DEBUG_UART_VIRT default 0xff003000 if DEBUG_U300_UART default DEBUG_UART_PHYS if !MMU depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ - DEBUG_UART_8250 || DEBUG_UART_PL01X + DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_UART_MEDIATEK config DEBUG_UART_8250_SHIFT int "Register offset shift for the 8250 debug UART" diff --git a/arch/arm/include/debug/mediatek.S b/arch/arm/include/debug/mediatek.S new file mode 100644 index 0000000..98e8414 --- /dev/null +++ b/arch/arm/include/debug/mediatek.S @@ -0,0 +1,38 @@ +/* + * Low-level debug macro for Mediatek SoCs + * + * Copyright (c) 2014 MundoReader S.L. + * Author: Matthias Brugger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include + + .macro addruart, rp, rv, tmp + ldr \rp, =CONFIG_DEBUG_UART_PHYS + ldr \rv, =CONFIG_DEBUG_UART_VIRT + .endm + + .macro senduart,rd,rx + strb \rd, [\rx, #0x0] + .endm + + .macro waituart,rd,rx +1001: ldr \rd, [\rx, #0x14] + tst \rd, #0x40 + beq 1001b + .endm + + .macro busyuart,rd,rx +1002: ldr \rd, [\rx, #0x14] + tst \rd, #0x40 + beq 1002b + .endm