Commit a1342f6a authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

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: default avatarTomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200820204203.22328-1-krzk@kernel.org
parent 21cfa049

arch/arm/mach-s3c/mach-amlm5900.c

+2 −2
Original line number Diff line number Diff line
@@ -153,13 +153,13 @@ static void __init amlm5900_map_io(void) 
{

	s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));

	s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

	s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4);

}



static void __init amlm5900_init_time(void)

{

	s3c2410_init_clocks(12000000);

	samsung_timer_init();

	s3c24xx_timer_init();

}



#ifdef CONFIG_FB_S3C2410

arch/arm/mach-s3c/mach-anubis.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static void __init anubis_map_io(void) 
{

	s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));

	s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

	s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4);



	/* check for the newer revision boards with large page nand */
@@ -400,7 +400,7 @@ static void __init anubis_map_io(void) 
static void __init anubis_init_time(void)

{

	s3c2440_init_clocks(12000000);

	samsung_timer_init();

	s3c24xx_timer_init();

}



static void __init anubis_init(void)

arch/arm/mach-s3c/mach-anw6410.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void __init anw6410_map_io(void) 
	s3c64xx_init_io(anw6410_iodesc, ARRAY_SIZE(anw6410_iodesc));

	s3c64xx_set_xtal_freq(12000000);

	s3c24xx_init_uarts(anw6410_uartcfgs, ARRAY_SIZE(anw6410_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

	s3c64xx_set_timer_source(S3C64XX_PWM3, S3C64XX_PWM4);



	anw6410_lcd_mode_set();

}
@@ -226,5 +226,5 @@ MACHINE_START(ANW6410, "A&W6410") 
	.init_irq	= s3c6410_init_irq,

	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.init_time	= samsung_timer_init,

	.init_time	= s3c64xx_timer_init,

MACHINE_END

arch/arm/mach-s3c/mach-at2440evb.c

+2 −2
Original line number Diff line number Diff line
@@ -202,13 +202,13 @@ static void __init at2440evb_map_io(void) 
{

	s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));

	s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

	s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4);

}



static void __init at2440evb_init_time(void)

{

	s3c2440_init_clocks(16934400);

	samsung_timer_init();

	s3c24xx_timer_init();

}



static void __init at2440evb_init(void)

arch/arm/mach-s3c/mach-bast.c

+2 −2
Original line number Diff line number Diff line
@@ -547,13 +547,13 @@ static void __init bast_map_io(void) 


	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

	s3c24xx_set_timer_source(S3C24XX_PWM3, S3C24XX_PWM4);

}



static void __init bast_init_time(void)

{

	s3c2410_init_clocks(12000000);

	samsung_timer_init();

	s3c24xx_timer_init();

}



static void __init bast_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE