diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-12-12 00:24:20 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-08 12:37:10 +0000 |
commit | d2b07fe2a3e35d8e58cceb63ab58831d706da939 (patch) | |
tree | fec7bcae153eb12d482a809967ac4809809337fe /arch/arm/plat-s3c/pm.c | |
parent | ef30e14420df546bc6576b00f9caf3379b6699d1 (diff) | |
download | kernel_samsung_tuna-d2b07fe2a3e35d8e58cceb63ab58831d706da939.zip kernel_samsung_tuna-d2b07fe2a3e35d8e58cceb63ab58831d706da939.tar.gz kernel_samsung_tuna-d2b07fe2a3e35d8e58cceb63ab58831d706da939.tar.bz2 |
[ARM] S3C: Update UART save over PM suspend/resume
Change the way the UART state is saved over suspend to allow the s3c64xx
code to modify the settings on resume to avoid any illegal state changes
to the UART clocks. This will also allow us to save the UDIVSLOT register
on newer SoCs.
Move to using a structure for the UART use the extant Kconfig configuration
specifying the number of UARTs.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c/pm.c')
-rw-r--r-- | arch/arm/plat-s3c/pm.c | 61 |
1 files changed, 39 insertions, 22 deletions
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index e320b0f..78bf50a 100644 --- a/arch/arm/plat-s3c/pm.c +++ b/arch/arm/plat-s3c/pm.c @@ -72,33 +72,50 @@ static inline void s3c_pm_debug_init(void) #ifdef CONFIG_S3C2410_PM_DEBUG -#define SAVE_UART(va) \ - SAVE_ITEM((va) + S3C2410_ULCON), \ - SAVE_ITEM((va) + S3C2410_UCON), \ - SAVE_ITEM((va) + S3C2410_UFCON), \ - SAVE_ITEM((va) + S3C2410_UMCON), \ - SAVE_ITEM((va) + S3C2410_UBRDIV) - -static struct sleep_save uart_save[] = { - SAVE_UART(S3C_VA_UART0), - SAVE_UART(S3C_VA_UART1), -#ifndef CONFIG_CPU_S3C2400 - SAVE_UART(S3C_VA_UART2), -#endif -}; +struct pm_uart_save uart_save[CONFIG_SERIAL_SAMSUNG_UARTS]; + +static void s3c_pm_save_uart(unsigned int uart, struct pm_uart_save *save) +{ + void __iomem *regs = S3C_VA_UARTx(uart); + + save->ulcon = __raw_readl(regs + S3C2410_ULCON); + save->ucon = __raw_readl(regs + S3C2410_UCON); + save->ufcon = __raw_readl(regs + S3C2410_UFCON); + save->umcon = __raw_readl(regs + S3C2410_UMCON); + save->ubrdiv = __raw_readl(regs + S3C2410_UBRDIV); +} -static void s3c_pm_save_uart(void) +static void s3c_pm_save_uarts(void) { - s3c_pm_do_save(uart_save, ARRAY_SIZE(uart_save)); + struct pm_uart_save *save = uart_save; + unsigned int uart; + + for (uart = 0; uart < CONFIG_SERIAL_SAMSUNG_UARTS; uart++, save++) + s3c_pm_save_uart(uart, save); +} + +static void s3c_pm_restore_uart(unsigned int uart, struct pm_uart_save *save) +{ + void __iomem *regs = S3C_VA_UARTx(uart); + + __raw_writel(save->ulcon, regs + S3C2410_ULCON); + __raw_writel(save->ucon, regs + S3C2410_UCON); + __raw_writel(save->ufcon, regs + S3C2410_UFCON); + __raw_writel(save->umcon, regs + S3C2410_UMCON); + __raw_writel(save->ubrdiv, regs + S3C2410_UBRDIV); } -static void s3c_pm_restore_uart(void) +static void s3c_pm_restore_uarts(void) { - s3c_pm_do_restore(uart_save, ARRAY_SIZE(uart_save)); + struct pm_uart_save *save = uart_save; + unsigned int uart; + + for (uart = 0; uart < CONFIG_SERIAL_SAMSUNG_UARTS; uart++, save++) + s3c_pm_restore_uart(uart, save); } #else -static void s3c_pm_save_uart(void) { } -static void s3c_pm_restore_uart(void) { } +static void s3c_pm_save_uarts(void) { } +static void s3c_pm_restore_uarts(void) { } #endif /* The IRQ ext-int code goes here, it is too small to currently bother @@ -250,7 +267,7 @@ static int s3c_pm_enter(suspend_state_t state) /* save all necessary core registers not covered by the drivers */ s3c_pm_save_gpios(); - s3c_pm_save_uart(); + s3c_pm_save_uarts(); s3c_pm_save_core(); /* set the irq configuration for wake */ @@ -293,7 +310,7 @@ static int s3c_pm_enter(suspend_state_t state) /* restore the system state */ s3c_pm_restore_core(); - s3c_pm_restore_uart(); + s3c_pm_restore_uarts(); s3c_pm_restore_gpios(); s3c_pm_debug_init(); |