From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 4 Oct 2011 11:20:08 +0000 (+0900)
Subject: Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
X-Git-Tag: firefly_0821_release~3680^2~4184^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86f82da586098f16d92b5637808c323f5455e935;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2

Conflicts:
	arch/arm/plat-s5p/include/plat/pll.h
---

86f82da586098f16d92b5637808c323f5455e935
diff --cc arch/arm/plat-samsung/include/plat/exynos4.h
index 000000000000,691a7113fff2..20d73bf77537
mode 000000,100644..100644
--- a/arch/arm/plat-samsung/include/plat/exynos4.h
+++ b/arch/arm/plat-samsung/include/plat/exynos4.h
@@@ -1,0 -1,34 +1,35 @@@
+ /* linux/arch/arm/plat-samsung/include/plat/exynos4.h
+  *
+  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+  *		http://www.samsung.com
+  *
+  * Header file for exynos4 cpu support
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+ */
+ 
+ /* Common init code for EXYNOS4 related SoCs */
+ 
+ extern void exynos4_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+ extern void exynos4_register_clocks(void);
++extern void exynos4210_register_clocks(void);
++extern void exynos4212_register_clocks(void);
+ extern void exynos4_setup_clocks(void);
+ 
 -#ifdef CONFIG_CPU_EXYNOS4210
 -
++#ifdef CONFIG_ARCH_EXYNOS4
+ extern  int exynos4_init(void);
+ extern void exynos4_init_irq(void);
+ extern void exynos4_map_io(void);
+ extern void exynos4_init_clocks(int xtal);
+ extern struct sys_timer exynos4_timer;
+ 
+ #define exynos4_init_uarts exynos4_common_init_uarts
+ 
+ #else
+ #define exynos4_init_clocks NULL
+ #define exynos4_init_uarts NULL
+ #define exynos4_map_io NULL
+ #define exynos4_init NULL
+ #endif