1 files changed, 59 insertions, 41 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index fc8bf18e222d..d58995c9a95a 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,97 +7,102 @@
 # Configuration options for the EXYNOS4
+config ARCH_EXYNOS
+        bool "Samsung EXYNOS" if ARCH_MULTI_V7
+        select ARCH_HAS_BANDGAP
+        select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_AMBA
+        select ARM_GIC
+        select COMMON_CLK_SAMSUNG
+        select HAVE_ARM_SCU if SMP
+        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
+        select PINCTRL
+        select PINCTRL_EXYNOS
+        select PM_GENERIC_DOMAINS if PM_RUNTIME
+        select S5P_DEV_MFC
+        select SRAM
+        help
+          Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
 if ARCH_EXYNOS
 menu "SAMSUNG EXYNOS SoCs Support"
+config ARCH_EXYNOS3
+        bool "SAMSUNG EXYNOS3"
+        select ARM_CPU_SUSPEND if PM
+        help
+          Samsung EXYNOS3 (Crotex-A7) SoC based systems
 config ARCH_EXYNOS4
        bool "SAMSUNG EXYNOS4"
        default y
-        select ARM_AMBA
+        select ARM_CPU_SUSPEND if PM_SLEEP
-        select CLKSRC_OF
        select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
        select CPU_EXYNOS4210
        select GIC_NON_BANKED
        select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
-        select HAVE_ARM_SCU if SMP
-        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
-        select PINCTRL
-        select PM_GENERIC_DOMAINS if PM_RUNTIME
-        select S5P_DEV_MFC
        help
-          Samsung EXYNOS4 SoCs based systems
+          Samsung EXYNOS4 (Cortex-A9) SoC based systems
 config ARCH_EXYNOS5
        bool "SAMSUNG EXYNOS5"
-        select ARM_AMBA
+        default y
-        select CLKSRC_OF
-        select HAVE_ARM_SCU if SMP
-        select HAVE_SMP
-        select PINCTRL
        help
-          Samsung EXYNOS5 (Cortex-A15) SoC based systems
+          Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems
 comment "EXYNOS SoCs"
+config SOC_EXYNOS3250
+        bool "SAMSUNG EXYNOS3250"
+        default y
+        depends on ARCH_EXYNOS3
 config CPU_EXYNOS4210
        bool "SAMSUNG EXYNOS4210"
        default y
        depends on ARCH_EXYNOS4
-        select ARCH_HAS_BANDGAP
-        select ARM_CPU_SUSPEND if PM_SLEEP
-        select PINCTRL_EXYNOS
-        select SAMSUNG_DMADEV
-        help
-          Enable EXYNOS4210 CPU support
 config SOC_EXYNOS4212
        bool "SAMSUNG EXYNOS4212"
        default y
        depends on ARCH_EXYNOS4
-        select ARCH_HAS_BANDGAP
-        select PINCTRL_EXYNOS
-        select SAMSUNG_DMADEV
-        help
-          Enable EXYNOS4212 SoC support
 config SOC_EXYNOS4412
        bool "SAMSUNG EXYNOS4412"
        default y
        depends on ARCH_EXYNOS4
-        select ARCH_HAS_BANDGAP
-        select PINCTRL_EXYNOS
-        select SAMSUNG_DMADEV
-        help
-          Enable EXYNOS4412 SoC support
 config SOC_EXYNOS5250
        bool "SAMSUNG EXYNOS5250"
        default y
        depends on ARCH_EXYNOS5
-        select ARCH_HAS_BANDGAP
-        select PINCTRL_EXYNOS
+config SOC_EXYNOS5260
-        select PM_GENERIC_DOMAINS if PM_RUNTIME
+        bool "SAMSUNG EXYNOS5260"
-        select S5P_DEV_MFC
+        default y
-        select SAMSUNG_DMADEV
+        depends on ARCH_EXYNOS5
-        help
-          Enable EXYNOS5250 SoC support
+config SOC_EXYNOS5410
+        bool "SAMSUNG EXYNOS5410"
+        default y
+        depends on ARCH_EXYNOS5
 config SOC_EXYNOS5420
        bool "SAMSUNG EXYNOS5420"
        default y
        depends on ARCH_EXYNOS5
-        select PM_GENERIC_DOMAINS if PM_RUNTIME
-        help
-          Enable EXYNOS5420 SoC support
 config SOC_EXYNOS5440
        bool "SAMSUNG EXYNOS5440"
        default y
        depends on ARCH_EXYNOS5
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-        select ARCH_HAS_BANDGAP
        select ARCH_HAS_OPP
        select HAVE_ARM_ARCH_TIMER
        select AUTO_ZRELADDR
@@ -108,6 +113,19 @@ config SOC_EXYNOS5440
        help
          Enable EXYNOS5440 SoC support
+config SOC_EXYNOS5800
+        bool "SAMSUNG EXYNOS5800"
+        default y
+        depends on SOC_EXYNOS5420
 endmenu
+config EXYNOS5420_MCPM
+        bool "Exynos5420 Multi-Cluster PM support"
+        depends on MCPM && SOC_EXYNOS5420
+        select ARM_CCI
+        help
+          This is needed to provide CPU and cluster power management
+          on Exynos5420 implementing big.LITTLE.
 endif

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index fc8bf18e222d..d58995c9a95a 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig
@@ -7,97 +7,102 @@
7		7
8	# Configuration options for the EXYNOS4	8	# Configuration options for the EXYNOS4
9		9
		10	config ARCH_EXYNOS
		11	bool "Samsung EXYNOS" if ARCH_MULTI_V7
		12	select ARCH_HAS_BANDGAP
		13	select ARCH_HAS_CPUFREQ
		14	select ARCH_HAS_HOLES_MEMORYMODEL
		15	select ARCH_REQUIRE_GPIOLIB
		16	select ARM_AMBA
		17	select ARM_GIC
		18	select COMMON_CLK_SAMSUNG
		19	select HAVE_ARM_SCU if SMP
		20	select HAVE_S3C2410_I2C if I2C
		21	select HAVE_S3C2410_WATCHDOG if WATCHDOG
		22	select HAVE_S3C_RTC if RTC_CLASS
		23	select PINCTRL
		24	select PINCTRL_EXYNOS
		25	select PM_GENERIC_DOMAINS if PM_RUNTIME
		26	select S5P_DEV_MFC
		27	select SRAM
		28	help
		29	Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
		30
10	if ARCH_EXYNOS	31	if ARCH_EXYNOS
11		32
12	menu "SAMSUNG EXYNOS SoCs Support"	33	menu "SAMSUNG EXYNOS SoCs Support"
13		34
		35	config ARCH_EXYNOS3
		36	bool "SAMSUNG EXYNOS3"
		37	select ARM_CPU_SUSPEND if PM
		38	help
		39	Samsung EXYNOS3 (Crotex-A7) SoC based systems
		40
14	config ARCH_EXYNOS4	41	config ARCH_EXYNOS4
15	bool "SAMSUNG EXYNOS4"	42	bool "SAMSUNG EXYNOS4"
16	default y	43	default y
17	select ARM_AMBA	44	select ARM_CPU_SUSPEND if PM_SLEEP
18	select CLKSRC_OF
19	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210	45	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
20	select CPU_EXYNOS4210	46	select CPU_EXYNOS4210
21	select GIC_NON_BANKED	47	select GIC_NON_BANKED
22	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD	48	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
23	select HAVE_ARM_SCU if SMP
24	select HAVE_SMP
25	select MIGHT_HAVE_CACHE_L2X0	49	select MIGHT_HAVE_CACHE_L2X0
26	select PINCTRL
27	select PM_GENERIC_DOMAINS if PM_RUNTIME
28	select S5P_DEV_MFC
29	help	50	help
30	Samsung EXYNOS4 SoCs based systems	51	Samsung EXYNOS4 (Cortex-A9) SoC based systems
31		52
32	config ARCH_EXYNOS5	53	config ARCH_EXYNOS5
33	bool "SAMSUNG EXYNOS5"	54	bool "SAMSUNG EXYNOS5"
34	select ARM_AMBA	55	default y
35	select CLKSRC_OF
36	select HAVE_ARM_SCU if SMP
37	select HAVE_SMP
38	select PINCTRL
39	help	56	help
40	Samsung EXYNOS5 (Cortex-A15) SoC based systems	57	Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems
41		58
42	comment "EXYNOS SoCs"	59	comment "EXYNOS SoCs"
43		60
		61	config SOC_EXYNOS3250
		62	bool "SAMSUNG EXYNOS3250"
		63	default y
		64	depends on ARCH_EXYNOS3
		65
44	config CPU_EXYNOS4210	66	config CPU_EXYNOS4210
45	bool "SAMSUNG EXYNOS4210"	67	bool "SAMSUNG EXYNOS4210"
46	default y	68	default y
47	depends on ARCH_EXYNOS4	69	depends on ARCH_EXYNOS4
48	select ARCH_HAS_BANDGAP
49	select ARM_CPU_SUSPEND if PM_SLEEP
50	select PINCTRL_EXYNOS
51	select SAMSUNG_DMADEV
52	help
53	Enable EXYNOS4210 CPU support
54		70
55	config SOC_EXYNOS4212	71	config SOC_EXYNOS4212
56	bool "SAMSUNG EXYNOS4212"	72	bool "SAMSUNG EXYNOS4212"
57	default y	73	default y
58	depends on ARCH_EXYNOS4	74	depends on ARCH_EXYNOS4
59	select ARCH_HAS_BANDGAP
60	select PINCTRL_EXYNOS
61	select SAMSUNG_DMADEV
62	help
63	Enable EXYNOS4212 SoC support
64		75
65	config SOC_EXYNOS4412	76	config SOC_EXYNOS4412
66	bool "SAMSUNG EXYNOS4412"	77	bool "SAMSUNG EXYNOS4412"
67	default y	78	default y
68	depends on ARCH_EXYNOS4	79	depends on ARCH_EXYNOS4
69	select ARCH_HAS_BANDGAP
70	select PINCTRL_EXYNOS
71	select SAMSUNG_DMADEV
72	help
73	Enable EXYNOS4412 SoC support
74		80
75	config SOC_EXYNOS5250	81	config SOC_EXYNOS5250
76	bool "SAMSUNG EXYNOS5250"	82	bool "SAMSUNG EXYNOS5250"
77	default y	83	default y
78	depends on ARCH_EXYNOS5	84	depends on ARCH_EXYNOS5
79	select ARCH_HAS_BANDGAP	85
80	select PINCTRL_EXYNOS	86	config SOC_EXYNOS5260
81	select PM_GENERIC_DOMAINS if PM_RUNTIME	87	bool "SAMSUNG EXYNOS5260"
82	select S5P_DEV_MFC	88	default y
83	select SAMSUNG_DMADEV	89	depends on ARCH_EXYNOS5
84	help	90
85	Enable EXYNOS5250 SoC support	91	config SOC_EXYNOS5410
		92	bool "SAMSUNG EXYNOS5410"
		93	default y
		94	depends on ARCH_EXYNOS5
86		95
87	config SOC_EXYNOS5420	96	config SOC_EXYNOS5420
88	bool "SAMSUNG EXYNOS5420"	97	bool "SAMSUNG EXYNOS5420"
89	default y	98	default y
90	depends on ARCH_EXYNOS5	99	depends on ARCH_EXYNOS5
91	select PM_GENERIC_DOMAINS if PM_RUNTIME
92	help
93	Enable EXYNOS5420 SoC support
94		100
95	config SOC_EXYNOS5440	101	config SOC_EXYNOS5440
96	bool "SAMSUNG EXYNOS5440"	102	bool "SAMSUNG EXYNOS5440"
97	default y	103	default y
98	depends on ARCH_EXYNOS5	104	depends on ARCH_EXYNOS5
99	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE	105	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
100	select ARCH_HAS_BANDGAP
101	select ARCH_HAS_OPP	106	select ARCH_HAS_OPP
102	select HAVE_ARM_ARCH_TIMER	107	select HAVE_ARM_ARCH_TIMER
103	select AUTO_ZRELADDR	108	select AUTO_ZRELADDR
@@ -108,6 +113,19 @@ config SOC_EXYNOS5440
108	help	113	help
109	Enable EXYNOS5440 SoC support	114	Enable EXYNOS5440 SoC support
110		115
		116	config SOC_EXYNOS5800
		117	bool "SAMSUNG EXYNOS5800"
		118	default y
		119	depends on SOC_EXYNOS5420
		120
111	endmenu	121	endmenu
112		122
		123	config EXYNOS5420_MCPM
		124	bool "Exynos5420 Multi-Cluster PM support"
		125	depends on MCPM && SOC_EXYNOS5420
		126	select ARM_CCI
		127	help
		128	This is needed to provide CPU and cluster power management
		129	on Exynos5420 implementing big.LITTLE.
		130
113	endif	131	endif