summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2014-05-14 17:03:20 +0200
committerTomasz Figa <t.figa@samsung.com>2014-05-14 19:41:14 +0200
commitefe32f6ea8123bc6456617b9f8830fa4c566be7a (patch)
tree781e3fd8b2616991c0dab61318d699b4cc3cc5a4
parentclk: samsung: exynos5420: add more registers to restore list (diff)
downloadlinux-efe32f6ea8123bc6456617b9f8830fa4c566be7a.tar.xz
linux-efe32f6ea8123bc6456617b9f8830fa4c566be7a.zip
ARM: S3C24XX: Remove omitted Kconfig selects and conditionals
After full migration of s3c24xx to Common Clock Framework, some unneeded entries in Kconfig still remained. Delete them. Signed-off-by: Tomasz Figa <t.figa@samsung.com>
-rw-r--r--Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt2
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig12
2 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt b/Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt
index 0b64ad8dadf6..822505e715ae 100644
--- a/Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt
+++ b/Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt
@@ -19,7 +19,7 @@ to specify the clock which they consume. Some of the clocks are available only
on a particular SoC.
All available clocks are defined as preprocessor macros in
-dt-bindings/clock/samsung,s3c2410-clock.h header and can be used in device
+dt-bindings/clock/s3c2410.h header and can be used in device
tree sources.
External clocks:
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 1331e784c713..ab2866b4794e 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -264,7 +264,7 @@ config ARCH_BAST
bool "Simtec Electronics BAST (EB2410ITX)"
select ISA
select MACH_BAST_IDE
- select S3C2410_COMMON_DCLK if COMMON_CLK
+ select S3C2410_COMMON_DCLK
select S3C2410_IOTIMING if ARM_S3C2410_CPUFREQ
select S3C24XX_SIMTEC_NOR
select S3C24XX_SIMTEC_PM if PM
@@ -346,8 +346,7 @@ config MACH_TCT_HAMMER
config MACH_VR1000
bool "Thorcom VR1000"
select MACH_BAST_IDE
- select S3C2410_COMMON_DCLK if COMMON_CLK
- select S3C24XX_DCLK if SAMSUNG_CLOCK
+ select S3C2410_COMMON_DCLK
select S3C24XX_SIMTEC_NOR
select S3C24XX_SIMTEC_PM if PM
select S3C24XX_SIMTEC_USB
@@ -531,7 +530,7 @@ comment "S3C2440 Boards"
config MACH_ANUBIS
bool "Simtec Electronics ANUBIS"
select HAVE_PATA_PLATFORM
- select S3C2410_COMMON_DCLK if COMMON_CLK
+ select S3C2410_COMMON_DCLK
select S3C2440_XTAL_12000000
select S3C24XX_SIMTEC_PM if PM
select S3C_DEV_USB_HOST
@@ -570,7 +569,7 @@ config MACH_NEXCODER_2440
config MACH_OSIRIS
bool "Simtec IM2440D20 (OSIRIS) module"
- select S3C2410_COMMON_DCLK if COMMON_CLK
+ select S3C2410_COMMON_DCLK
select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
select S3C2440_XTAL_12000000
select S3C24XX_SIMTEC_PM if PM
@@ -641,10 +640,9 @@ config MACH_RX1950
bool "HP iPAQ rx1950"
select I2C
select PM_H1940 if PM
- select S3C2410_COMMON_DCLK if COMMON_CLK
+ select S3C2410_COMMON_DCLK
select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
select S3C2440_XTAL_16934400
- select S3C24XX_DCLK if SAMSUNG_CLOCK
select S3C24XX_PWM
select S3C_DEV_NAND
help