Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9a1013285f73692e38bb7267d8bdebe081c71cf7

Authored by Sachin Kamat
Committed by Kukjin Kim
1 parent 723c9c7e16

ARM: EXYNOS: Consolidate Kconfig entries 

Instead of repeating the Kconfig entries for every SoC,
move them under ARCH_EXYNOS3, 4 and 5 and move the entries
common to 3, 4 and 5 under ARCH_EXYNOS.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Showing 2 changed files with 16 additions and 54 deletions Side-by-side Diff

... ... @@ -831,18 +831,28 @@
831 831  
832 832 config ARCH_EXYNOS
833 833 bool "Samsung EXYNOS"
  834 + select ARCH_HAS_BANDGAP
834 835 select ARCH_HAS_CPUFREQ
835 836 select ARCH_HAS_HOLES_MEMORYMODEL
836 837 select ARCH_REQUIRE_GPIOLIB
837 838 select ARCH_SPARSEMEM_ENABLE
  839 + select ARM_AMBA
838 840 select ARM_GIC
  841 + select CLKSRC_OF
839 842 select COMMON_CLK_SAMSUNG
840 843 select CPU_V7
841 844 select GENERIC_CLOCKEVENTS
  845 + select HAVE_ARM_SCU if SMP
842 846 select HAVE_S3C2410_I2C if I2C
843 847 select HAVE_S3C2410_WATCHDOG if WATCHDOG
844 848 select HAVE_S3C_RTC if RTC_CLASS
  849 + select HAVE_SMP
845 850 select NEED_MACH_MEMORY_H
  851 + select PINCTRL
  852 + select PINCTRL_EXYNOS
  853 + select PM_GENERIC_DOMAINS if PM_RUNTIME
  854 + select S5P_DEV_MFC
  855 + select SAMSUNG_DMADEV
846 856 select SPARSE_IRQ
847 857 select USE_OF
848 858 help
arch/arm/mach-exynos/Kconfig
Diff comments   View file @ 9a10132
... ... @@ -13,42 +13,27 @@
13 13  
14 14 config ARCH_EXYNOS3
15 15 bool "SAMSUNG EXYNOS3"
16   - select ARM_AMBA
17   - select CLKSRC_OF
18   - select HAVE_ARM_SCU if SMP
19   - select HAVE_SMP
20   - select PINCTRL
21   - select PM_GENERIC_DOMAINS if PM_RUNTIME
  16 + select ARM_CPU_SUSPEND if PM
22 17 help
23   - Samsung EXYNOS3 SoCs based systems
  18 + Samsung EXYNOS3 (Crotex-A7) SoC based systems
24 19  
25 20 config ARCH_EXYNOS4
26 21 bool "SAMSUNG EXYNOS4"
27 22 default y
28   - select ARM_AMBA
29   - select CLKSRC_OF
  23 + select ARM_CPU_SUSPEND if PM_SLEEP
30 24 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
31 25 select CPU_EXYNOS4210
32 26 select GIC_NON_BANKED
33 27 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
34   - select HAVE_ARM_SCU if SMP
35   - select HAVE_SMP
36 28 select MIGHT_HAVE_CACHE_L2X0
37   - select PINCTRL
38   - select PM_GENERIC_DOMAINS if PM_RUNTIME
39   - select S5P_DEV_MFC
40 29 help
41   - Samsung EXYNOS4 SoCs based systems
  30 + Samsung EXYNOS4 (Cortex-A9) SoC based systems
42 31  
43 32 config ARCH_EXYNOS5
44 33 bool "SAMSUNG EXYNOS5"
45   - select ARM_AMBA
46   - select CLKSRC_OF
47   - select HAVE_ARM_SCU if SMP
48   - select HAVE_SMP
49   - select PINCTRL
  34 + default y
50 35 help
51   - Samsung EXYNOS5 (Cortex-A15) SoC based systems
  36 + Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems
52 37  
53 38 comment "EXYNOS SoCs"
54 39  
55 40  
56 41  
57 42  
58 43  
... ... @@ -56,55 +41,26 @@
56 41 bool "SAMSUNG EXYNOS3250"
57 42 default y
58 43 depends on ARCH_EXYNOS3
59   - select ARCH_HAS_BANDGAP
60   - select ARM_CPU_SUSPEND if PM
61   - select PINCTRL_EXYNOS
62   - select SAMSUNG_DMADEV
63   - help
64   - Enable EXYNOS3250 CPU support
65 44  
66 45 config CPU_EXYNOS4210
67 46 bool "SAMSUNG EXYNOS4210"
68 47 default y
69 48 depends on ARCH_EXYNOS4
70   - select ARCH_HAS_BANDGAP
71   - select ARM_CPU_SUSPEND if PM_SLEEP
72   - select PINCTRL_EXYNOS
73   - select SAMSUNG_DMADEV
74   - help
75   - Enable EXYNOS4210 CPU support
76 49  
77 50 config SOC_EXYNOS4212
78 51 bool "SAMSUNG EXYNOS4212"
79 52 default y
80 53 depends on ARCH_EXYNOS4
81   - select ARCH_HAS_BANDGAP
82   - select PINCTRL_EXYNOS
83   - select SAMSUNG_DMADEV
84   - help
85   - Enable EXYNOS4212 SoC support
86 54  
87 55 config SOC_EXYNOS4412
88 56 bool "SAMSUNG EXYNOS4412"
89 57 default y
90 58 depends on ARCH_EXYNOS4
91   - select ARCH_HAS_BANDGAP
92   - select PINCTRL_EXYNOS
93   - select SAMSUNG_DMADEV
94   - help
95   - Enable EXYNOS4412 SoC support
96 59  
97 60 config SOC_EXYNOS5250
98 61 bool "SAMSUNG EXYNOS5250"
99 62 default y
100 63 depends on ARCH_EXYNOS5
101   - select ARCH_HAS_BANDGAP
102   - select PINCTRL_EXYNOS
103   - select PM_GENERIC_DOMAINS if PM_RUNTIME
104   - select S5P_DEV_MFC
105   - select SAMSUNG_DMADEV
106   - help
107   - Enable EXYNOS5250 SoC support
108 64  
109 65 config SOC_EXYNOS5260
110 66 bool "SAMSUNG EXYNOS5260"
111 67  
... ... @@ -120,16 +76,12 @@
120 76 bool "SAMSUNG EXYNOS5420"
121 77 default y
122 78 depends on ARCH_EXYNOS5
123   - select PM_GENERIC_DOMAINS if PM_RUNTIME
124   - help
125   - Enable EXYNOS5420 SoC support
126 79  
127 80 config SOC_EXYNOS5440
128 81 bool "SAMSUNG EXYNOS5440"
129 82 default y
130 83 depends on ARCH_EXYNOS5
131 84 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
132   - select ARCH_HAS_BANDGAP
133 85 select ARCH_HAS_OPP
134 86 select HAVE_ARM_ARCH_TIMER
135 87 select AUTO_ZRELADDR