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: 3597881 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 6927DBF418 for ; Thu, 6 Feb 2014 19:13:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A934E2011E for ; Thu, 6 Feb 2014 19:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B94B62012B for ; Thu, 6 Feb 2014 19:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756852AbaBFTNP (ORCPT ); Thu, 6 Feb 2014 14:13:15 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:13291 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756842AbaBFTNI (ORCPT ); Thu, 6 Feb 2014 14:13:08 -0500 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-samsung-soc@vger.kernel.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 Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Doug Anderson , Olof Johansson , Kyungmin Park , Marek Szyprowski , Tomasz Figa 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== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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);