]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs
authorHeiko Stuebner <heiko@sntech.de>
Wed, 19 Feb 2014 00:25:54 +0000 (09:25 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 14 Apr 2014 17:11:08 +0000 (02:11 +0900)
commit1c5fc74e29c9619c56b0ff2983f45082df684c12
tree72c46ee48d15f9b42b3aa9196b56f4d2d9cb448c
parent2202e80395ac135ca2d8da5067d7f4563d87203d
ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs

As the conversion to the common-clock-framework is done in multiple
steps, it is necessary to prevent conflicts between the different
struct clk implementations.

For this include the s3c24xx_setup_clocks function only when
SAMSUNG_CLOCK is selected and make the socs we don't convert this
time explicitly depend on SAMSUNG_CLOCK, which gets only selected
automatically if COMMON_CLK is not enabled.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-s3c24xx/Kconfig
arch/arm/mach-s3c24xx/common.c