diff options
author | Pankaj Dubey <pankaj.dubey@samsung.com> | 2014-05-08 00:07:10 -0400 |
---|---|---|
committer | Tomasz Figa <t.figa@samsung.com> | 2014-05-14 13:41:15 -0400 |
commit | 1f4f2cfdb7145363aedb647a5ab6e7b658b379b9 (patch) | |
tree | c7f813a0497d52ffe439d9e986347426c4fd3ca2 | |
parent | ccecba3ca58bdeb3c32f883df96be85b480264a5 (diff) |
ARM: S3C24XX: move S3C24XX clock Kconfig options to Samsung clock Kconfig file
This patch moves S3C24XX specific clock Kconfig options into
"clk/samsung/Kconfig" and also removes COMMON_CLK selection from
"mach-s3c24xx/Kconfig" as S3C24XX_COMMON_CLK is selecting it's dependency.
CC: Ben Dooks <ben-linux@fluff.org>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
-rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 27 | ||||
-rw-r--r-- | drivers/clk/samsung/Kconfig | 23 |
2 files changed, 23 insertions, 27 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index ab2866b4794e..1e52b6926374 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -18,17 +18,7 @@ config PLAT_S3C24XX | |||
18 | help | 18 | help |
19 | Base platform code for any Samsung S3C24XX device | 19 | Base platform code for any Samsung S3C24XX device |
20 | 20 | ||
21 | config S3C2410_COMMON_CLK | ||
22 | bool | ||
23 | help | ||
24 | Build the s3c2410 clock driver based on the common clock framework. | ||
25 | 21 | ||
26 | config S3C2410_COMMON_DCLK | ||
27 | bool | ||
28 | select REGMAP_MMIO | ||
29 | help | ||
30 | Temporary symbol to build the dclk driver based on the common clock | ||
31 | framework. | ||
32 | 22 | ||
33 | menu "SAMSUNG S3C24XX SoCs Support" | 23 | menu "SAMSUNG S3C24XX SoCs Support" |
34 | 24 | ||
@@ -37,7 +27,6 @@ comment "S3C24XX SoCs" | |||
37 | config CPU_S3C2410 | 27 | config CPU_S3C2410 |
38 | bool "SAMSUNG S3C2410" | 28 | bool "SAMSUNG S3C2410" |
39 | default y | 29 | default y |
40 | select COMMON_CLK | ||
41 | select CPU_ARM920T | 30 | select CPU_ARM920T |
42 | select CPU_LLSERIAL_S3C2410 | 31 | select CPU_LLSERIAL_S3C2410 |
43 | select S3C2410_COMMON_CLK | 32 | select S3C2410_COMMON_CLK |
@@ -51,7 +40,6 @@ config CPU_S3C2410 | |||
51 | 40 | ||
52 | config CPU_S3C2412 | 41 | config CPU_S3C2412 |
53 | bool "SAMSUNG S3C2412" | 42 | bool "SAMSUNG S3C2412" |
54 | select COMMON_CLK | ||
55 | select CPU_ARM926T | 43 | select CPU_ARM926T |
56 | select CPU_LLSERIAL_S3C2440 | 44 | select CPU_LLSERIAL_S3C2440 |
57 | select S3C2412_COMMON_CLK | 45 | select S3C2412_COMMON_CLK |
@@ -62,7 +50,6 @@ config CPU_S3C2412 | |||
62 | 50 | ||
63 | config CPU_S3C2416 | 51 | config CPU_S3C2416 |
64 | bool "SAMSUNG S3C2416/S3C2450" | 52 | bool "SAMSUNG S3C2416/S3C2450" |
65 | select COMMON_CLK | ||
66 | select CPU_ARM926T | 53 | select CPU_ARM926T |
67 | select CPU_LLSERIAL_S3C2440 | 54 | select CPU_LLSERIAL_S3C2440 |
68 | select S3C2416_PM if PM | 55 | select S3C2416_PM if PM |
@@ -73,7 +60,6 @@ config CPU_S3C2416 | |||
73 | 60 | ||
74 | config CPU_S3C2440 | 61 | config CPU_S3C2440 |
75 | bool "SAMSUNG S3C2440" | 62 | bool "SAMSUNG S3C2440" |
76 | select COMMON_CLK | ||
77 | select CPU_ARM920T | 63 | select CPU_ARM920T |
78 | select CPU_LLSERIAL_S3C2440 | 64 | select CPU_LLSERIAL_S3C2440 |
79 | select S3C2410_COMMON_CLK | 65 | select S3C2410_COMMON_CLK |
@@ -84,7 +70,6 @@ config CPU_S3C2440 | |||
84 | 70 | ||
85 | config CPU_S3C2442 | 71 | config CPU_S3C2442 |
86 | bool "SAMSUNG S3C2442" | 72 | bool "SAMSUNG S3C2442" |
87 | select COMMON_CLK | ||
88 | select CPU_ARM920T | 73 | select CPU_ARM920T |
89 | select CPU_LLSERIAL_S3C2440 | 74 | select CPU_LLSERIAL_S3C2440 |
90 | select S3C2410_COMMON_CLK | 75 | select S3C2410_COMMON_CLK |
@@ -100,7 +85,6 @@ config CPU_S3C244X | |||
100 | 85 | ||
101 | config CPU_S3C2443 | 86 | config CPU_S3C2443 |
102 | bool "SAMSUNG S3C2443" | 87 | bool "SAMSUNG S3C2443" |
103 | select COMMON_CLK | ||
104 | select CPU_ARM920T | 88 | select CPU_ARM920T |
105 | select CPU_LLSERIAL_S3C2440 | 89 | select CPU_LLSERIAL_S3C2440 |
106 | select S3C2443_COMMON_CLK | 90 | select S3C2443_COMMON_CLK |
@@ -365,11 +349,6 @@ config S3C2412_PM_SLEEP | |||
365 | 349 | ||
366 | if CPU_S3C2412 | 350 | if CPU_S3C2412 |
367 | 351 | ||
368 | config S3C2412_COMMON_CLK | ||
369 | bool | ||
370 | help | ||
371 | Build the s3c2412 clock driver based on the common clock framework. | ||
372 | |||
373 | config CPU_S3C2412_ONLY | 352 | config CPU_S3C2412_ONLY |
374 | bool | 353 | bool |
375 | depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \ | 354 | depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \ |
@@ -652,12 +631,6 @@ endif # CPU_S3C2442 | |||
652 | 631 | ||
653 | if CPU_S3C2443 || CPU_S3C2416 | 632 | if CPU_S3C2443 || CPU_S3C2416 |
654 | 633 | ||
655 | config S3C2443_COMMON_CLK | ||
656 | bool | ||
657 | help | ||
658 | Temporary symbol to build the clock driver based on the common clock | ||
659 | framework. | ||
660 | |||
661 | config S3C2443_DMA | 634 | config S3C2443_DMA |
662 | bool | 635 | bool |
663 | help | 636 | help |
diff --git a/drivers/clk/samsung/Kconfig b/drivers/clk/samsung/Kconfig index fc8696b0954f..84196ecdaa12 100644 --- a/drivers/clk/samsung/Kconfig +++ b/drivers/clk/samsung/Kconfig | |||
@@ -1,3 +1,26 @@ | |||
1 | config COMMON_CLK_SAMSUNG | 1 | config COMMON_CLK_SAMSUNG |
2 | bool | 2 | bool |
3 | select COMMON_CLK | 3 | select COMMON_CLK |
4 | |||
5 | config S3C2410_COMMON_CLK | ||
6 | bool | ||
7 | select COMMON_CLK_SAMSUNG | ||
8 | help | ||
9 | Build the s3c2410 clock driver based on the common clock framework. | ||
10 | |||
11 | config S3C2410_COMMON_DCLK | ||
12 | bool | ||
13 | select COMMON_CLK_SAMSUNG | ||
14 | select REGMAP_MMIO | ||
15 | help | ||
16 | Temporary symbol to build the dclk driver based on the common clock | ||
17 | framework. | ||
18 | |||
19 | config S3C2412_COMMON_CLK | ||
20 | bool | ||
21 | select COMMON_CLK_SAMSUNG | ||
22 | |||
23 | config S3C2443_COMMON_CLK | ||
24 | bool | ||
25 | select COMMON_CLK_SAMSUNG | ||
26 | |||