redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: SAMSUNG: Use debug_ll_addr() to get UART base address 

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 <t.figa@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
hifive-unleashed-5.1
Tomasz Figa 2014-03-18 07:28:09 +09:00 committed by Kukjin Kim
parent de7fe0807c
commit 99b2fc2b8b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/plat-samsung/pm.c
View File

@ -22,6 +22,7 @@
#include <linux/io.h>
#include <asm/cacheflush.h>
#include <asm/mach/map.h>
#include <asm/suspend.h>
#include <plat/cpu.h>
@ -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);