From: Olof Johansson <olof@lixom.net>
Date: Sat, 10 Mar 2012 17:51:26 +0000 (-0800)
Subject: Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.4-rc1~89^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7c8faedf98aa5ec372e0191078ac7fe1e7fb067;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'next/devel-samsung' of git://git./linux/kernel/git/kgene/linux-samsung into next/soc

* 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
  ARM: EXYNOS: add support JPEG
  ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
  ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
  ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
  ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
  ARM: S5PV210: Add usb otg phy control
  ARM: S3C64XX: Add usb otg phy control
  ARM: EXYNOS: Enable l2 configuration through device tree
  ARM: EXYNOS: remove useless code to save/restore L2
  ARM: EXYNOS: save L2 settings during bootup
  ARM: S5P: add L2 early resume code
  ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
  ARM: S3C64XX: Define some additional always off clocks
  ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
  ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
  ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
  ARM: S3C64XX: Gate some more clocks by default
  ARM: S3C64XX: Add basic cpuidle driver
---

f7c8faedf98aa5ec372e0191078ac7fe1e7fb067
diff --cc arch/arm/mach-exynos/pm.c
index e190130,2dd55a1..4816827
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@@ -384,17 -376,8 +376,10 @@@ static void exynos4_pm_resume(void
  
  	exynos4_restore_pll();
  
 +#ifdef CONFIG_SMP
  	scu_enable(S5P_VA_SCU);
 +#endif
  
- #ifdef CONFIG_CACHE_L2X0
- 	s3c_pm_do_restore_core(exynos4_l2cc_save, ARRAY_SIZE(exynos4_l2cc_save));
- 	outer_inv_all();
- 	/* enable L2X0*/
- 	writel_relaxed(1, S5P_VA_L2CC + L2X0_CTRL);
- #endif
- 
  early_wakeup:
  	return;
  }