Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e17fd8e5 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

arch/arm/boot/dts/exynos4x12-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ 
		sd4_bus8: sd4-bus-width8 {

			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";

			samsung,pin-function = <4>;

			samsung,pin-pud = <4>;

			samsung,pin-pud = <3>;

			samsung,pin-drv = <3>;

		};

arch/arm/mach-exynos/exynos.c

+2 −0
Original line number Diff line number Diff line
@@ -161,7 +161,9 @@ static void exynos_restart(enum reboot_mode mode, const char *cmd) 


static struct platform_device exynos_cpuidle = {

	.name              = "exynos_cpuidle",

#ifdef CONFIG_ARM_EXYNOS_CPUIDLE

	.dev.platform_data = exynos_enter_aftr,

#endif

	.id                = -1,

};

arch/arm/mm/proc-macros.S

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ ENTRY(\name\()_processor_functions) 


	.if \suspend

	.word	cpu_\name\()_suspend_size

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

	.word	cpu_\name\()_do_suspend

	.word	cpu_\name\()_do_resume

#else

arch/arm/plat-samsung/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -268,8 +268,9 @@ config S5P_DEV_MFC 
comment "Power management"



config SAMSUNG_PM_DEBUG

	bool "S3C2410 PM Suspend debug"

	depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART

	bool "Samsung PM Suspend debug"

	depends on PM && DEBUG_KERNEL

	depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART

	help

	  Say Y here if you want verbose debugging from the PM Suspend and

	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

arch/arm/plat-samsung/pm-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <linux/serial_core.h>

#include <linux/serial_s3c.h>

#include <linux/io.h>



#include <asm/mach/map.h>