From patchwork Mon Dec 31 19:00:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 13758 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 51EFE23E03 for ; Mon, 31 Dec 2012 19:07:38 +0000 (UTC) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by fiordland.canonical.com (Postfix) with ESMTP id F2638A198E2 for ; Mon, 31 Dec 2012 19:07:37 +0000 (UTC) Received: by mail-vb0-f42.google.com with SMTP id fa15so13073905vbb.15 for ; Mon, 31 Dec 2012 11:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=bgX98rhrBSs/8aIP3dHOJGBuq9hKkJ1I0oFvhibCDbg=; b=bA6Gw7E0NhqTm613YPT4wASu0eFZv8QfrqLIQ0bqz7qU7sAeOZdc9q9u85grX3fqjo 99Y4B2leDB5+v1VD8SBkDkymz+m/39L1WEyi/U/iUhF5OGi3Di6MwzPY5iqltQaOrAkk eQi74UBoApLlnRZoSzU7dn4jjzzoDWTnuTpVGXToMCB7Sx3SlEu4Qy2WerbEVWqHxNk3 tSGJ9eCXSA6r2pWhVoR/qN/8L5L0b4SGFilZS3U5omvr+5PDaYMeFhU/yAeJIJ8YjDor jIP784NtfMhbXAKa+SgyiQEbckZeI+SOGYumlPkPQ21C9lKnHB014z4+w2Qql/UzSJ33 Otmw== X-Received: by 10.220.218.197 with SMTP id hr5mr63976098vcb.8.1356980857283; Mon, 31 Dec 2012 11:07:37 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.214.195 with SMTP id oc3csp171873vec; Mon, 31 Dec 2012 11:07:36 -0800 (PST) X-Received: by 10.101.23.10 with SMTP id a10mr11386619anj.54.1356980856505; Mon, 31 Dec 2012 11:07:36 -0800 (PST) Received: from mail-gg0-f178.google.com (mail-gg0-f178.google.com [209.85.161.178]) by mx.google.com with ESMTPS id s47si40662472yhb.67.2012.12.31.11.07.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Dec 2012 11:07:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=209.85.161.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: by mail-gg0-f178.google.com with SMTP id u1so2003926ggl.9 for ; Mon, 31 Dec 2012 11:07:35 -0800 (PST) X-Received: by 10.236.135.238 with SMTP id u74mr39282322yhi.52.1356980855206; Mon, 31 Dec 2012 11:07:35 -0800 (PST) Received: from localhost.localdomain (D32451F2.uspool.samsung.com. [211.36.81.242]) by mx.google.com with ESMTPS id s65sm33052062yhn.19.2012.12.31.11.07.33 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Dec 2012 11:07:34 -0800 (PST) From: Thomas Abraham To: thomas.abraham@linaro.org Cc: patches@linaro.org, Thomas Abraham Subject: [PATCH] ARM: Exynos: Fix early print issue Date: Mon, 31 Dec 2012 11:00:06 -0800 Message-Id: <1356980406-29053-1-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQniYsVBRK7vRV4d510EsM1syOcU76Q9sSIwCdEe9KVVAgu02v17O/Iv2nS642MwkVcKd9s9 Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos/common.c | 1 + arch/arm/mach-exynos/include/mach/debug-macro.S | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index bf59ae1..f0eb225 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -56,6 +56,7 @@ #define L2_AUX_VAL 0x7C470001 #define L2_AUX_MASK 0xC200ffff +volatile u32 exynos_uart_base = 1; static const char name_exynos4210[] = "EXYNOS4210"; static const char name_exynos4212[] = "EXYNOS4212"; static const char name_exynos4412[] = "EXYNOS4412"; diff --git a/arch/arm/mach-exynos/include/mach/debug-macro.S b/arch/arm/mach-exynos/include/mach/debug-macro.S index 69e3e52..4da270e 100644 --- a/arch/arm/mach-exynos/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos/include/mach/debug-macro.S @@ -21,6 +21,16 @@ */ .macro addruart, rp, rv, tmp + adr \rp, 100f + ldr \rv, [\rp] + sub \rv, \rv, \rp + ldr \rp, [\rp, #4] + sub \tmp, \rp, \rv + ldr \rp, [\tmp] + + teq \rp, #1 + bne 101f + mov \rp, #0x10000000 ldr \rp, [\rp, #0] and \rp, \rp, #0x0ff00000 @@ -38,7 +48,14 @@ b 99f 54: mov \rp, #EXYNOS5440_PA_UART b 99f -99: ldr \rv, =S3C_VA_UART + + .align +100: .word . + .word exynos_uart_base + .ltorg + +99: str \rp, [\tmp] +101: ldr \rv, =S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0 add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART)