diff options
| author | Krzysztof Kozlowski | 2020-08-20 22:42:03 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski | 2020-08-28 16:38:55 +0200 |
| commit | a1342f6a9ff88ad88ff7a981c53ae0869c94d243 (patch) | |
| tree | 0cbc098a8dc96bacbbc215d3e97d0f1602be7b87 /arch/arm/mach-s3c/mach-n30.c | |
| parent | 21cfa049290b281530f237bf03e9f4c1038e0f72 (diff) | |
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-n30.c')
| -rw-r--r-- | arch/arm/mach-s3c/mach-n30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c/mach-n30.c b/arch/arm/mach-s3c/mach-n30.c index 8a9382326d29..e40c1fcf418c 100644 --- a/arch/arm/mach-s3c/mach-n30.c +++ b/arch/arm/mach-s3c/mach-n30.c @@ -579,13 +579,13 @@ static void __init n30_map_io(void) s3c24xx_init_io(n30_iodesc, ARRAY_SIZE(n30_iodesc)); n30_hwinit(); s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); - samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); + s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4); } static void __init n30_init_time(void) { s3c2410_init_clocks(12000000); - samsung_timer_init(); + s3c24xx_timer_init(); } /* GPB3 is the line that controls the pull-up for the USB D+ line */ |