lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux

Browse Source 
* 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux:
  ARM: SAMSUNG: Fixup commit 4e6d488af3
  ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>
  ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver
  ARM: S3C2440: Fix s3c2440 cpufreq compilation post move.
This commit is contained in:
Linus Torvalds
2010-03-18 16:58:42 -07:00
parent 722874465e 0e17226f7c
commit a41842f70d
6 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
arch/arm/plat-s3c24xx/s3c2440-cpufreq.c → arch/arm/mach-s3c2440/s3c2440-cpufreq.c
View File

2
arch/arm/mach-s3c64xx/include/mach/debug-macro.S
View File

@@ -21,7 +21,7 @@
* aligned and add in the offset when we load the value here. * aligned and add in the offset when we load the value here.
*/ */
.macro addruart, rx .macro addruart, rx, rtmp
mrc p15, 0, \rx, c1, c0 mrc p15, 0, \rx, c1, c0
tst \rx, #1 tst \rx, #1
ldreq \rx, = S3C_PA_UART ldreq \rx, = S3C_PA_UART

2
arch/arm/mach-s5p6440/include/mach/debug-macro.S
View File

@@ -19,7 +19,7 @@
* aligned and add in the offset when we load the value here. * aligned and add in the offset when we load the value here.
*/ */
.macro addruart, rx .macro addruart, rx, rtmp
mrc p15, 0, \rx, c1, c0 mrc p15, 0, \rx, c1, c0
tst \rx, #1 tst \rx, #1
ldreq \rx, = S3C_PA_UART ldreq \rx, = S3C_PA_UART

2
arch/arm/mach-s5p6442/include/mach/debug-macro.S
View File

@@ -15,7 +15,7 @@
#include <mach/map.h> #include <mach/map.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
.macro addruart, rx .macro addruart, rx, rtmp
mrc p15, 0, \rx, c1, c0 mrc p15, 0, \rx, c1, c0
tst \rx, #1 tst \rx, #1
ldreq \rx, = S3C_PA_UART ldreq \rx, = S3C_PA_UART

2
arch/arm/plat-samsung/include/plat/uncompress.h
View File

@@ -140,8 +140,6 @@ static void arch_decomp_error(const char *x)
#define arch_error arch_decomp_error #define arch_error arch_decomp_error
#endif #endif
static void error(char *err);
#ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO
static inline void arch_enable_uart_fifo(void) static inline void arch_enable_uart_fifo(void)
{ {

35
arch/arm/plat-samsung/pwm.c
View File

@@ -379,6 +379,39 @@ static int __devexit s3c_pwm_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
static int s3c_pwm_suspend(struct platform_device *pdev, pm_message_t state)
{
struct pwm_device *pwm = platform_get_drvdata(pdev);
/* No one preserve these values during suspend so reset them
* Otherwise driver leaves PWM unconfigured if same values
* passed to pwm_config
*/
pwm->period_ns = 0;
pwm->duty_ns = 0;
return 0;
}
static int s3c_pwm_resume(struct platform_device *pdev)
{
struct pwm_device *pwm = platform_get_drvdata(pdev);
unsigned long tcon;
/* Restore invertion */
tcon = __raw_readl(S3C2410_TCON);
tcon |= pwm_tcon_invert(pwm);
__raw_writel(tcon, S3C2410_TCON);
return 0;
}
#else
#define s3c_pwm_suspend NULL
#define s3c_pwm_resume NULL
#endif
static struct platform_driver s3c_pwm_driver = { static struct platform_driver s3c_pwm_driver = {
.driver = { .driver = {
.name = "s3c24xx-pwm", .name = "s3c24xx-pwm",
@@ -386,6 +419,8 @@ static struct platform_driver s3c_pwm_driver = {
}, },
.probe = s3c_pwm_probe, .probe = s3c_pwm_probe,
.remove = __devexit_p(s3c_pwm_remove), .remove = __devexit_p(s3c_pwm_remove),
.suspend = s3c_pwm_suspend,
.resume = s3c_pwm_resume,
}; };
static int __init pwm_init(void) static int __init pwm_init(void)