From patchwork Thu Feb 6 19:12:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3598001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73DAFBF418 for ; Thu, 6 Feb 2014 19:16:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC9B02011E for ; Thu, 6 Feb 2014 19:16:29 +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 AD041200FF for ; Thu, 6 Feb 2014 19:16:28 +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 1WBUPM-0006SW-0o; Thu, 06 Feb 2014 19:14:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBUOx-0000kU-F6; Thu, 06 Feb 2014 19:14:19 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBUOA-0000cH-K8 for linux-arm-kernel@lists.infradead.org; Thu, 06 Feb 2014 19:13:32 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0L009Z69DVSJA0@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 06 Feb 2014 19:13:07 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-34-52f3dec2d3aa Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id AC.74.18565.2CED3F25; Thu, 06 Feb 2014 19:13:06 +0000 (GMT) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N0L002UD9DPUJ50@eusync4.samsung.com>; Thu, 06 Feb 2014 19:13:06 +0000 (GMT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 04/12] ARM: SAMSUNG: pm: Use debug_ll_addr() to get UART base address Date: Thu, 06 Feb 2014 20:12:49 +0100 Message-id: <1391713977-22300-5-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.5.2 In-reply-to: <1391713977-22300-1-git-send-email-t.figa@samsung.com> References: <1391713977-22300-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4Nd1D9z4HGUz5J23xd9Ixdouzyw6y WfQuuMpmcbbpDbvFpsfXWC1mnN/HZLH2yF12i1PXP7NZrJ/xmsWB0+P3r0mMHrMbLrJ4bF5S 73HlRBOrR9+WVYwenzfJBbBFcdmkpOZklqUW6dslcGXc6l/LXHCBp+Lk1ctsDYz7uLoYOTkk BEwkDs/uZISwxSQu3FvP1sXIxSEksJRR4tWRP0wQTh+TRN/xH2wgVWwCahKfGx6B2SICqhKf 2xawg9jMApuZJNYccQKxhQWiJPrP/QOq4eBgAar5f1YeJMwr4CQxdfcpRpCwhICCxOrrQiBh TgFnifYJO5hAbCGgkruX77FPYORdwMiwilE0tTS5oDgpPddIrzgxt7g0L10vOT93EyMk3L7u YFx6zOoQowAHoxIPr+KKz0FCrIllxZW5hxglOJiVRHht7wCFeFMSK6tSi/Lji0pzUosPMTJx cEo1MLJEv8oo2P4+9LzTBd8rhzKTjp96KHeYhWW36hKfSKeApEO2BdbPUgMmvp6XvCv02t1n 6ws+KHeHtSd7fk6vX9HmcT5v35Zitb82x1xkfVc/dVA9O//tu8mHOzP27750j19z1eYPLrYr TY5Ml8/6H8ow0+Xr7rbkptWiioImHqrB5x2bYzg3blBiKc5INNRiLipOBACRG78bFQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140206_141330_777400_472BE146 X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.4 (-------) Cc: Kukjin Kim , Arnd Bergmann , Tomasz Figa , Doug Anderson , Kyungmin Park , Olof Johansson , linux-arm-kernel@lists.infradead.org, Marek Szyprowski 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 This patch modifies Samsung PM debug helpers to use a multiplatform friendly way of getting base address of debug UART port, so instead of using a per-mach static macro, a generic debug_ll_addr() helper is used. Signed-off-by: Tomasz Figa Acked-by: Kyungmin Park --- arch/arm/plat-samsung/pm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 5d9daf6..53b3d67 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -74,9 +75,19 @@ static inline void s3c_pm_debug_init(void) static struct pm_uart_save uart_save; +static inline void __iomem *s3c_pm_uart_base(void) +{ + unsigned long paddr; + unsigned long vaddr; + + debug_ll_addr(&paddr, &vaddr); + + return (void __iomem *)vaddr; +} + static void s3c_pm_save_uart(unsigned int uart, struct pm_uart_save *save) { - void __iomem *regs = S3C_VA_UARTx(uart); + void __iomem *regs = s3c_pm_uart_base(); save->ulcon = __raw_readl(regs + S3C2410_ULCON); save->ucon = __raw_readl(regs + S3C2410_UCON); @@ -98,7 +109,7 @@ static void s3c_pm_save_uarts(void) static void s3c_pm_restore_uart(unsigned int uart, struct pm_uart_save *save) { - void __iomem *regs = S3C_VA_UARTx(uart); + void __iomem *regs = s3c_pm_uart_base(); s3c_pm_arch_update_uart(regs, save);