From a1342f6a9ff88ad88ff7a981c53ae0869c94d243 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 20 Aug 2020 22:42:03 +0200 Subject: ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup PWM timer initialization has two independent implementations - one for S3C24xx and one for S3C64xx. The naming however was always the same and before also the declaration was shared. This is confusing, error prone and might cause issues when trying to build multiplatform kernel. Suggested-by: Tomasz Figa Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20200820204203.22328-1-krzk@kernel.org --- arch/arm/mach-s3c/mach-jive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-s3c/mach-jive.c') diff --git a/arch/arm/mach-s3c/mach-jive.c b/arch/arm/mach-s3c/mach-jive.c index 5c3037bf647d..94b16b2cb1da 100644 --- a/arch/arm/mach-s3c/mach-jive.c +++ b/arch/arm/mach-s3c/mach-jive.c @@ -529,13 +529,13 @@ static void __init jive_map_io(void) { s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc)); s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs)); - samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); + s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4); } static void __init jive_init_time(void) { s3c2412_init_clocks(12000000); - samsung_timer_init(); + s3c24xx_timer_init(); } static void jive_power_off(void) -- cgit v1.2.3