Merge branch 'next/soc' into for-next

* next/soc: (41 commits)
  clk: exynos5420: Add 5800 specific clocks
  dt-bindings: add documentation for Exynos3250 clock controller
  ARM: EXYNOS: Add MCPM call-back functions
  ARM: dts: add CCI node for exynos5420
  ARM: EXYNOS: Add generic cluster power control functions
  ARM: EXYNOS: use generic exynos cpu power control functions
  ARM: EXYNOS: Add generic cpu power control functions for exynos SoCs
  clk: samsung: exynos3250: Add clocks using common clock framework
  drivers: clk: use COMMON_CLK_SAMSUNG for Samsung clock support
  ARM: S3C24XX: move S3C24XX clock Kconfig options to Samsung clock Kconfig file
  ARM: select COMMON_CLK_SAMSUNG for ARCH_EXYNOS and ARCH_S3C64XX
  clk: samsung: add new Kconfig for Samsung common clock option
  ARM: S3C24XX: Remove omitted Kconfig selects and conditionals
  clk: samsung: exynos5420: add more registers to restore list
  clk: samsung: exynos5420: add misc clocks
  clk: samsung: exynos5420: update clocks for MAU Block
  clk: samsung: exynos5420: fix register offset for sclk_bpll
  clk: samsung: exynos5420: correct sysmmu-mfc parent clocks
  clk: samsung: exynos5420: update clocks for FSYS and FSYS2 blocks
  clk: samsung: exynos5420: update clocks for WCORE block
  ...

diff --cc arch/arm/boot/dts/exynos5420.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/Makefile
index f6dcc256db56f1772dc762958b11a3c504435054,01bc9b94a032de5a62e572f7b4848dbeb6a9149b..2e0666d31e754ef7857a575d10091d5b00981795
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -22,5 -24,10 +22,7 @@@ obj-$(CONFIG_SMP)            += platsmp.o headsmp
  
  obj-$(CONFIG_HOTPLUG_CPU)     += hotplug.o
  
 -obj-$(CONFIG_ARCH_EXYNOS)     += exynos-smc.o
 -obj-$(CONFIG_ARCH_EXYNOS)     += firmware.o
 -
  plus_sec := $(call as-instr,.arch_extension sec,+sec)
  AFLAGS_exynos-smc.o           :=-Wa,-march=armv7-a$(plus_sec)
+ 
+ obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o

diff --cc arch/arm/mach-exynos/common.h
index 278b5734511e4188ade2f2ed41bfea56030565fe,7876ed04b7a5e35e323deca22f478d9701f6aae9..ae5f64808b16ea79290f61ef30087e6a2ffde525
--- 1/arch/arm/mach-exynos/common.h
--- 2/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@@ -132,8 -63,11 +132,14 @@@ struct exynos_pmu_conf 
  };
  
  extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);
+ extern void exynos_cpu_power_down(int cpu);
+ extern void exynos_cpu_power_up(int cpu);
+ extern int  exynos_cpu_power_state(int cpu);
+ extern void exynos_cluster_power_down(int cluster);
+ extern void exynos_cluster_power_up(int cluster);
+ extern int  exynos_cluster_power_state(int cluster);
  
 +extern void s5p_init_cpu(void __iomem *cpuid_addr);
 +extern unsigned int samsung_rev(void);
 +
  #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */

diff --cc arch/arm/mach-exynos/hotplug.c
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-exynos/pm.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/Kconfig
index 45a7026e9419673994ad38bfb9d4c7838b7070bf,1e52b6926374761f63e19488756e54e25b9cff17..04284de7aca516e6eb62e5f1037e816140c691b2
--- 1/arch/arm/mach-s3c24xx/Kconfig
--- 2/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@@ -37,8 -27,8 +27,7 @@@ comment "S3C24XX SoCs
  config CPU_S3C2410
        bool "SAMSUNG S3C2410"
        default y
-       select COMMON_CLK
        select CPU_ARM920T
 -      select CPU_LLSERIAL_S3C2410
        select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
        select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
@@@ -50,8 -40,8 +39,7 @@@
  
  config CPU_S3C2412
        bool "SAMSUNG S3C2412"
-       select COMMON_CLK
        select CPU_ARM926T
 -      select CPU_LLSERIAL_S3C2440
        select S3C2412_COMMON_CLK
        select S3C2412_DMA if S3C24XX_DMA
        select S3C2412_PM if PM
@@@ -60,8 -50,8 +48,7 @@@
  
  config CPU_S3C2416
        bool "SAMSUNG S3C2416/S3C2450"
-       select COMMON_CLK
        select CPU_ARM926T
 -      select CPU_LLSERIAL_S3C2440
        select S3C2416_PM if PM
        select S3C2443_COMMON_CLK
        select S3C2443_DMA if S3C24XX_DMA
@@@ -70,8 -60,8 +57,7 @@@
  
  config CPU_S3C2440
        bool "SAMSUNG S3C2440"
-       select COMMON_CLK
        select CPU_ARM920T
 -      select CPU_LLSERIAL_S3C2440
        select S3C2410_COMMON_CLK
        select S3C2410_PM if PM
        select S3C2440_DMA if S3C24XX_DMA
@@@ -80,8 -70,8 +66,7 @@@
  
  config CPU_S3C2442
        bool "SAMSUNG S3C2442"
-       select COMMON_CLK
        select CPU_ARM920T
 -      select CPU_LLSERIAL_S3C2440
        select S3C2410_COMMON_CLK
        select S3C2410_DMA if S3C24XX_DMA
        select S3C2410_PM if PM
@@@ -95,8 -85,8 +80,7 @@@ config CPU_S3C244
  
  config CPU_S3C2443
        bool "SAMSUNG S3C2443"
-       select COMMON_CLK
        select CPU_ARM920T
 -      select CPU_LLSERIAL_S3C2440
        select S3C2443_COMMON_CLK
        select S3C2443_DMA if S3C24XX_DMA
        help

diff --cc drivers/clk/Kconfig
Simple merge