1
0
Fork 0
alistair23-linux/arch/arm/mach-s3c24xx
Heiko Stuebner 5ab9a428cf 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>
2014-04-15 02:11:08 +09:00
..
include/mach ARM: SoC: late cleanups 2014-04-05 15:46:37 -07:00
Kconfig ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs 2014-04-15 02:11:08 +09:00
Makefile Merge branches 'samsung/exynos-dt2' and 'samsung/s3c24xx-dt2' into next/drivers 2013-06-20 22:27:21 +02:00
Makefile.boot
anubis.h ARM: S3C24XX: make anubis-cpld, anubis-irq and anubis-map local 2013-01-10 10:45:34 -08:00
bast-ide.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
bast-irq.c ARM: S3C24XX: remove plat/irq.h in plat-samsung 2013-03-05 10:42:47 +09:00
bast.h ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
clock-dclk.c ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ 2013-02-03 16:17:10 -08:00
clock-s3c244x.c
clock-s3c2410.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
clock-s3c2412.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
clock-s3c2416.c ARM: SAMSUNG: Remove pwm-clock infrastructure 2013-08-12 21:53:24 +02:00
clock-s3c2440.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
clock-s3c2443.c ARM: SAMSUNG: Remove pwm-clock infrastructure 2013-08-12 21:53:24 +02:00
common-s3c2443.c ARM: S3C24XX: number the dma clocks 2013-10-08 06:42:10 +09:00
common-smdk.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
common-smdk.h ARM: S3C24XX: plat/common-smdk.h local 2013-03-05 10:42:47 +09:00
common.c ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs 2014-04-15 02:11:08 +09:00
common.h ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442 2013-10-21 05:32:48 +09:00
cpufreq-utils.c cpufreq: rename index as driver_data in cpufreq_frequency_table 2013-06-04 14:25:59 +02:00
dma-s3c2410.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
dma-s3c2412.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
dma-s3c2440.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
dma-s3c2443.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
dma.c ARM: SAMSUNG: remove IRQF_DISABLED 2013-12-12 07:05:19 +09:00
gta02.h ARM: S3C24XX: make gta02.h local 2013-01-10 10:45:35 -08:00
h1940-bluetooth.c ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h> 2014-01-14 15:24:54 +01:00
h1940.h ARM: S3C24XX: make h1940.h and h1940-latch.h local 2013-01-10 10:45:35 -08:00
iotiming-s3c2410.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
iotiming-s3c2412.c cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq 2013-05-20 23:04:28 +09:00
irq-pm.c ARM: S3C24XX: remove plat/irq.h in plat-samsung 2013-03-05 10:42:47 +09:00
mach-amlm5900.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-anubis.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-at2440evb.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-bast.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-gta02.c ARM: SoC: cleanups for 3.15 2014-04-05 13:51:19 -07:00
mach-h1940.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-jive.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-mini2440.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-n30.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-nexcoder.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-osiris-dvs.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
mach-osiris.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-otom.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-qt2410.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-rx1950.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-rx3715.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-s3c2416-dt.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-smdk2410.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-smdk2413.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-smdk2416.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-smdk2440.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-smdk2443.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-tct_hammer.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-vr1000.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
mach-vstms.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
osiris.h ARM: S3C24XX: make osiris-cpld.h and osiris-map.h local 2013-01-10 10:45:36 -08:00
otom.h ARM: S3C24XX: make otom-map.h local 2013-01-10 10:45:36 -08:00
pll-s3c2410.c cpufreq: rename index as driver_data in cpufreq_frequency_table 2013-06-04 14:25:59 +02:00
pll-s3c2440-12000000.c cpufreq: rename index as driver_data in cpufreq_frequency_table 2013-06-04 14:25:59 +02:00
pll-s3c2440-16934400.c cpufreq: rename index as driver_data in cpufreq_frequency_table 2013-06-04 14:25:59 +02:00
pm-h1940.S ARM: samsung: fix assembly syntax for new gas 2013-02-14 15:04:34 +01:00
pm-s3c2410.c ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h> 2014-01-14 15:24:54 +01:00
pm-s3c2412.c ARM: S3C24XX: use samsung_sync_wakemask in s3c2412 pm 2013-03-05 20:20:59 +09:00
pm-s3c2416.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
pm.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
regs-dsc.h ARM: S3C24XX: Remove unused GPIO drive strength register definitions 2013-04-08 21:37:07 +09:00
regs-mem.h ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
s3c244x.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
s3c2410.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
s3c2412-power.h ARM: S3C24XX: header mach/regs-power.h local 2013-02-04 10:31:39 -08:00
s3c2412.c ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
s3c2416.c ARM: S3C24XX: Move rtc-core.h from plat to mach 2014-02-15 09:24:29 +09:00
s3c2440.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
s3c2442.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
s3c2443.c ARM: S3C24XX: Move rtc-core.h from plat to mach 2014-02-15 09:24:29 +09:00
setup-i2c.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
setup-sdhci-gpio.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-ts.c ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h> 2014-01-14 15:24:54 +01:00
simtec-audio.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
simtec-nor.c ARM: S3C24XX: make bast-cpld.h, bast-irq.h and bast-map.h local 2013-01-10 10:45:35 -08:00
simtec-pm.c ARM: S3C24XX: header mach/regs-mem.h local 2013-02-04 10:31:43 -08:00
simtec-usb.c ARM: SoC cleanups for 3.14 2014-01-23 18:36:55 -08:00
simtec.h
sleep-s3c2410.S ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
sleep-s3c2412.S ARM: samsung: fix assembly syntax for new gas 2013-02-14 15:04:34 +01:00
sleep.S ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file 2014-02-14 10:35:00 +09:00
vr1000.h ARM: S3C24XX: make vr1000-cpld.h, vr1000-irq.h and vr1000-map.h local 2013-01-10 10:45:37 -08:00