ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs

Browse source

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>

...

This commit is contained in:

Heiko Stuebner 2014-02-19 09:25:54 +09:00 • committed by Kukjin Kim

parent 61fbb1d278

commit 5ab9a428cf

2 changed files with 6 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/mach-s3c24xx/Kconfig

View file

2

arch/arm/mach-s3c24xx/common.c

View file