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

Merge "Samsung 2nd fixes for v4.0" from Kukjin Kim:

- Fix build breakage exynos cpuidle driver on !SMP
  because it is coupled built-in so added check for SMP.

- Fix lid, power pin-functions and mmc node updates
  for exynos5250-spring: Fixes commit ID 53dd4138bb0a
  ("ARM: dts: Add exynos5250-spring device tree")

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Fix build breakage cpuidle on !SMP
  ARM: dts: fix lid and power pin-functions for exynos5250-spring
  ARM: dts: fix mmc node updates for exynos5250-spring

Signed-off-by: Olof Johansson <olof@lixom.net>

4 files changed, 11 insertions, 16 deletions

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index f02775487cd4..d075a68ac078 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -429,7 +429,6 @@
 &mmc_0 {
         status = "okay";
         num-slots = <1>;
-        supports-highspeed;
         broken-cd;
         card-detect-delay = <200>;
         samsung,dw-mshc-ciu-div = <3>;
@@ -437,11 +436,8 @@
         samsung,dw-mshc-ddr-timing = <1 2>;
         pinctrl-names = "default";
         pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
-
-        slot@0 {
-                reg = <0>;
-                bus-width = <8>;
-        };
+        bus-width = <8>;
+        cap-mmc-highspeed;
 };
 
 /*
@@ -451,7 +447,6 @@
 &mmc_1 {
         status = "okay";
         num-slots = <1>;
-        supports-highspeed;
         broken-cd;
         card-detect-delay = <200>;
         samsung,dw-mshc-ciu-div = <3>;
@@ -459,11 +454,8 @@
         samsung,dw-mshc-ddr-timing = <1 2>;
         pinctrl-names = "default";
         pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
-
-        slot@0 {
-                reg = <0>;
-                bus-width = <4>;
-        };
+        bus-width = <4>;
+        cap-sd-highspeed;
 };
 
 &pinctrl_0 {
@@ -490,7 +482,7 @@
 
         power_key_irq: power-key-irq {
                 samsung,pins = "gpx1-3";
-                samsung,pin-function = <0>;
+                samsung,pin-function = <0xf>;
                 samsung,pin-pud = <0>;
                 samsung,pin-drv = <0>;
         };
@@ -518,7 +510,7 @@
 
         lid_irq: lid-irq {
                 samsung,pins = "gpx3-5";
-                samsung,pin-function = <0>;
+                samsung,pin-function = <0xf>;
                 samsung,pin-pud = <0>;
                 samsung,pin-drv = <0>;
         };
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 9e9dfdfad9d7..4031a96c904b 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -211,7 +211,7 @@ static void __init exynos_dt_machine_init(void)
         if (!IS_ENABLED(CONFIG_SMP))
                 exynos_sysram_init();
 
-#ifdef CONFIG_ARM_EXYNOS_CPUIDLE
+#if defined(CONFIG_SMP) && defined(CONFIG_ARM_EXYNOS_CPUIDLE)
         if (of_machine_is_compatible("samsung,exynos4210"))
                 exynos_cpuidle.dev.platform_data = &cpuidle_coupled_exynos_data;
 #endif
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index e6209dadc00d..5685250693fd 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -181,6 +181,7 @@ void exynos_enter_aftr(void)
         cpu_pm_exit();
 }
 
+#if defined(CONFIG_SMP) && defined(CONFIG_ARM_EXYNOS_CPUIDLE)
 static atomic_t cpu1_wakeup = ATOMIC_INIT(0);
 
 static int exynos_cpu0_enter_aftr(void)
@@ -302,3 +303,4 @@ struct cpuidle_exynos_data cpuidle_coupled_exynos_data = {
         .pre_enter_aftr         = exynos_pre_enter_aftr,
         .post_enter_aftr                = exynos_post_enter_aftr,
 };
+#endif /* CONFIG_SMP && CONFIG_ARM_EXYNOS_CPUIDLE */
diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c
index 26f5f29fdb03..9bb5348995a9 100644
--- a/drivers/cpuidle/cpuidle-exynos.c
+++ b/drivers/cpuidle/cpuidle-exynos.c
@@ -117,7 +117,8 @@ static int exynos_cpuidle_probe(struct platform_device *pdev)
 {
         int ret;
 
-        if (of_machine_is_compatible("samsung,exynos4210")) {
+        if (IS_ENABLED(CONFIG_SMP) &&
+            of_machine_is_compatible("samsung,exynos4210")) {
                 exynos_cpuidle_pdata = pdev->dev.platform_data;
 
                 ret = cpuidle_register(&exynos_coupled_idle_driver,