summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c/s3c64xx.h
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-08-20 23:42:03 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2020-08-28 17:38:55 +0300
commita1342f6a9ff88ad88ff7a981c53ae0869c94d243 (patch)
tree0cbc098a8dc96bacbbc215d3e97d0f1602be7b87 /arch/arm/mach-s3c/s3c64xx.h
parent21cfa049290b281530f237bf03e9f4c1038e0f72 (diff)
downloadlinux-a1342f6a9ff88ad88ff7a981c53ae0869c94d243.tar.xz
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/s3c64xx.h')
-rw-r--r--arch/arm/mach-s3c/s3c64xx.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c/s3c64xx.h b/arch/arm/mach-s3c/s3c64xx.h
index 567bf3017171..92258e4f60f6 100644
--- a/arch/arm/mach-s3c/s3c64xx.h
+++ b/arch/arm/mach-s3c/s3c64xx.h
@@ -51,16 +51,16 @@ extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
#endif
/* Samsung HR-Timer Clock mode */
-enum samsung_timer_mode {
- SAMSUNG_PWM0,
- SAMSUNG_PWM1,
- SAMSUNG_PWM2,
- SAMSUNG_PWM3,
- SAMSUNG_PWM4,
+enum s3c64xx_timer_mode {
+ S3C64XX_PWM0,
+ S3C64XX_PWM1,
+ S3C64XX_PWM2,
+ S3C64XX_PWM3,
+ S3C64XX_PWM4,
};
-extern void __init samsung_set_timer_source(enum samsung_timer_mode event,
- enum samsung_timer_mode source);
-extern void __init samsung_timer_init(void);
+extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
+ enum s3c64xx_timer_mode source);
+extern void __init s3c64xx_timer_init(void);
#endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */