aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c/mach-hmt.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-08-20 22:42:03 +0200
committerKrzysztof Kozlowski <krzk@kernel.org>2020-08-28 16:38:55 +0200
commita1342f6a9ff88ad88ff7a981c53ae0869c94d243 (patch)
tree0cbc098a8dc96bacbbc215d3e97d0f1602be7b87 /arch/arm/mach-s3c/mach-hmt.c
parentARM: s3c: Cleanup from old plat-samsung include (diff)
downloadlinux-dev-a1342f6a9ff88ad88ff7a981c53ae0869c94d243.tar.xz
linux-dev-a1342f6a9ff88ad88ff7a981c53ae0869c94d243.zip
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 <tomasz.figa@gmail.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20200820204203.22328-1-krzk@kernel.org
Diffstat (limited to 'arch/arm/mach-s3c/mach-hmt.c')
-rw-r--r--arch/arm/mach-s3c/mach-hmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c/mach-hmt.c b/arch/arm/mach-s3c/mach-hmt.c
index 29510e27f90f..c58cd1fa6981 100644
--- a/arch/arm/mach-s3c/mach-hmt.c
+++ b/arch/arm/mach-s3c/mach-hmt.c
@@ -249,7 +249,7 @@ static void __init hmt_map_io(void)
s3c64xx_init_io(hmt_iodesc, ARRAY_SIZE(hmt_iodesc));
s3c64xx_set_xtal_freq(12000000);
s3c24xx_init_uarts(hmt_uartcfgs, ARRAY_SIZE(hmt_uartcfgs));
- samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
+ s3c64xx_set_timer_source(S3C64XX_PWM3, S3C64XX_PWM4);
}
static void __init hmt_machine_init(void)
@@ -278,5 +278,5 @@ MACHINE_START(HMT, "Airgoo-HMT")
.init_irq = s3c6410_init_irq,
.map_io = hmt_map_io,
.init_machine = hmt_machine_init,
- .init_time = samsung_timer_init,
+ .init_time = s3c64xx_timer_init,
MACHINE_END