summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c64xx/Kconfig
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
commit62b8c978ee6b8d135d9e7953221de58000dba986 (patch)
tree683b04b2e627f6710c22c151b23c8cc9a165315e /arch/arm/mach-s3c64xx/Kconfig
parent78fd82238d0e5716578c326404184a27ba67fd6e (diff)
downloadlinux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/arm/mach-s3c64xx/Kconfig')
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig29
1 files changed, 10 insertions, 19 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 2cb8dc5..041da51 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -3,7 +3,16 @@
#
# Licensed under GPLv2
-if ARCH_S3C64XX
+# temporary until we can eliminate all drivers using it.
+config PLAT_S3C64XX
+ bool
+ depends on ARCH_S3C64XX
+ default y
+ select PM_GENERIC_DOMAINS
+ select SAMSUNG_WAKEMASK
+ help
+ Base platform code for any Samsung S3C64XX device
+
# Configuration options for the S3C6410 CPU
@@ -297,21 +306,3 @@ config MACH_WLF_CRAGG_6410
select SAMSUNG_GPIO_EXTRA128
help
Machine support for the Wolfson Cragganmore S3C6410 variant.
-
-config MACH_S3C64XX_DT
- bool "Samsung S3C6400/S3C6410 machine using Device Tree"
- select CLKSRC_OF
- select CPU_S3C6400
- select CPU_S3C6410
- select PINCTRL
- select PINCTRL_S3C64XX
- select USE_OF
- help
- Machine support for Samsung S3C6400/S3C6410 machines with Device Tree
- enabled.
- Select this if a fdt blob is available for your S3C64XX SoC based
- board.
- Note: This is under development and not all peripherals can be
- supported with this machine file.
-
-endif