Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fcd403 authored by Romain Naour's avatar Romain Naour Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Rename s5p-time to samsung-time 



Signed-off-by: default avatarNaour Romain <romain.naour@openwide.fr>
Reviewed-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 7488335d

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select S5P_GPIO_INT

	select S5P_HRT

	select S5P_SETUP_MIPIPHY

	select SAMSUNG_HRT

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

	  Board.

arch/arm/mach-exynos/mach-universal_c210.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <plat/mfc.h>

#include <plat/sdhci.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/samsung-time.h>

#include <plat/camport.h>



#include <mach/map.h>
@@ -1094,7 +1094,7 @@ static void __init universal_map_io(void) 
	exynos_init_io(NULL, 0);

	s3c24xx_init_clocks(clk_xusbxti.rate);

	s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));

	s5p_set_timer_source(S5P_PWM2, S5P_PWM4);

	samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4);

}



static void s5p_tv_setup(void)
@@ -1152,7 +1152,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") 
	.map_io		= universal_map_io,

	.init_machine	= universal_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= s5p_timer_init,

	.init_time	= samsung_timer_init,

	.reserve        = &universal_reserve,

	.restart	= exynos4_restart,

MACHINE_END

arch/arm/mach-s5p64x0/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ if ARCH_S5P64X0 


config CPU_S5P6440

	bool

	select S5P_HRT

	select S5P_SLEEP if PM

	select SAMSUNG_DMADEV

	select SAMSUNG_HRT

	select SAMSUNG_WAKEMASK if PM

	help

	  Enable S5P6440 CPU support



config CPU_S5P6450

	bool

	select S5P_HRT

	select SAMSUNG_HRT

	select S5P_SLEEP if PM

	select SAMSUNG_DMADEV

	select SAMSUNG_WAKEMASK if PM

arch/arm/mach-s5p64x0/mach-smdk6440.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include <plat/pll.h>

#include <plat/adc.h>

#include <linux/platform_data/touchscreen-s3c2410.h>

#include <plat/s5p-time.h>

#include <plat/samsung-time.h>

#include <plat/backlight.h>

#include <plat/fb.h>

#include <plat/sdhci.h>
@@ -229,7 +229,7 @@ static void __init smdk6440_map_io(void) 
	s5p64x0_init_io(NULL, 0);

	s3c24xx_init_clocks(12000000);

	s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs));

	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

}



static void s5p6440_set_lcd_interface(void)
@@ -273,6 +273,6 @@ MACHINE_START(SMDK6440, "SMDK6440") 
	.init_irq	= s5p6440_init_irq,

	.map_io		= smdk6440_map_io,

	.init_machine	= smdk6440_machine_init,

	.init_time	= s5p_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s5p64x0_restart,

MACHINE_END

arch/arm/mach-s5p64x0/mach-smdk6450.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include <plat/pll.h>

#include <plat/adc.h>

#include <linux/platform_data/touchscreen-s3c2410.h>

#include <plat/s5p-time.h>

#include <plat/samsung-time.h>

#include <plat/backlight.h>

#include <plat/fb.h>

#include <plat/sdhci.h>
@@ -248,7 +248,7 @@ static void __init smdk6450_map_io(void) 
	s5p64x0_init_io(NULL, 0);

	s3c24xx_init_clocks(19200000);

	s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs));

	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

}



static void s5p6450_set_lcd_interface(void)
@@ -292,6 +292,6 @@ MACHINE_START(SMDK6450, "SMDK6450") 
	.init_irq	= s5p6450_init_irq,

	.map_io		= smdk6450_map_io,

	.init_machine	= smdk6450_machine_init,

	.init_time	= s5p_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s5p64x0_restart,

MACHINE_END