]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: s3c24xx: allow selecting S3C2440_XTAL_16934400 for s3c2442
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 Jan 2016 14:50:34 +0000 (15:50 +0100)
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>
Mon, 1 Feb 2016 00:46:20 +0000 (09:46 +0900)
The S3C2440_XTAL_16934400 and S3C2440_XTAL_12000000 symbols are used
for both s3c2442 and s3c2440, but Kconfig only allows it to be selected
if CPU_S3C2440 is enabled, which can lead to a warning otherwise:

warning: (MACH_RX1950) selects S3C2440_XTAL_16934400 which has unmet direct dependencies (ARCH_S3C24XX && CPU_S3C2440)

This changes the dependencies to make it possible also for CPU_S3C2442-only
configurations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
arch/arm/mach-s3c24xx/Kconfig

index c94ef77405ed2ffb09561e376736780c8265542e..5884bbb7952e561ebdf7621dd1a5f67ecceeb2b6 100644 (file)
@@ -405,7 +405,7 @@ config MACH_S3C2416_DT
 
 endif  # CPU_S3C2416
 
-if CPU_S3C2440
+if CPU_S3C2440 || CPU_S3C2442
 
 config S3C2440_XTAL_12000000
        bool
@@ -432,6 +432,9 @@ config S3C2440_PLL_16934400
        default y if S3C24XX_PLL
        help
          PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.
+endif
+
+if CPU_S3C2440
 
 comment "S3C2440 Boards"