Commit e17fd8e5 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-fixes' of...

Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Merge "Samsung fixes for v3.18" from Kukjin Kim:

- fix ifdef around cpu_*_do_[suspend, resume] ops to check
  CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP
- fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
- fix enabling Samsung PM debug functionality due to recently merged
  patches and previous merge conflicts
- fix pull-up setting in sd4_width8 pin group for exynos4x12

* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
  ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
  ARM: SAMSUNG: Restore Samsung PM Debug functionality
  ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6d81dc87 f6f1ae82
...@@ -675,7 +675,7 @@ sd4_bus4: sd4-bus-width4 { ...@@ -675,7 +675,7 @@ sd4_bus4: sd4-bus-width4 {
sd4_bus8: sd4-bus-width8 { sd4_bus8: sd4-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
samsung,pin-function = <4>; samsung,pin-function = <4>;
samsung,pin-pud = <4>; samsung,pin-pud = <3>;
samsung,pin-drv = <3>; samsung,pin-drv = <3>;
}; };
......
...@@ -161,7 +161,9 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd) ...@@ -161,7 +161,9 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd)
static struct platform_device exynos_cpuidle = { static struct platform_device exynos_cpuidle = {
.name = "exynos_cpuidle", .name = "exynos_cpuidle",
#ifdef CONFIG_ARM_EXYNOS_CPUIDLE
.dev.platform_data = exynos_enter_aftr, .dev.platform_data = exynos_enter_aftr,
#endif
.id = -1, .id = -1,
}; };
......
...@@ -279,7 +279,7 @@ ENTRY(\name\()_processor_functions) ...@@ -279,7 +279,7 @@ ENTRY(\name\()_processor_functions)
.if \suspend .if \suspend
.word cpu_\name\()_suspend_size .word cpu_\name\()_suspend_size
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
.word cpu_\name\()_do_suspend .word cpu_\name\()_do_suspend
.word cpu_\name\()_do_resume .word cpu_\name\()_do_resume
#else #else
......
...@@ -268,8 +268,9 @@ config S5P_DEV_MFC ...@@ -268,8 +268,9 @@ config S5P_DEV_MFC
comment "Power management" comment "Power management"
config SAMSUNG_PM_DEBUG config SAMSUNG_PM_DEBUG
bool "S3C2410 PM Suspend debug" bool "Samsung PM Suspend debug"
depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART depends on PM && DEBUG_KERNEL
depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART
help help
Say Y here if you want verbose debugging from the PM Suspend and Say Y here if you want verbose debugging from the PM Suspend and
Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
*/ */
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/serial_s3c.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment