2 files changed, 9 insertions, 0 deletions

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 91d5b6f1d5af..e103c290bc9e 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -74,6 +74,8 @@ config SOC_EXYNOS5440
         depends on ARCH_EXYNOS5
         select ARM_ARCH_TIMER
         select AUTO_ZRELADDR
+        select PINCTRL
+        select PINCTRL_EXYNOS5440
         help
           Enable EXYNOS5440 SoC support
 
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index d6d0dc651089..1a89824a5f78 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -424,11 +424,18 @@ static void __init exynos5_init_clocks(int xtal)
 {
         printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
 
+        /* EXYNOS5440 can support only common clock framework */
+
+        if (soc_is_exynos5440())
+                return;
+
+#ifdef CONFIG_SOC_EXYNOS5250
         s3c24xx_register_baseclocks(xtal);
         s5p_register_clocks(xtal);
 
         exynos5_register_clocks();
         exynos5_setup_clocks();
+#endif
 }
 
 #define COMBINER_ENABLE_SET     0x0