projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-exynos
/
mach-universal_c210.c
diff --git
a/arch/arm/mach-exynos/mach-universal_c210.c
b/arch/arm/mach-exynos/mach-universal_c210.c
index d28c7fbaba2d15f8e995efbcaf6f0744a6b6cacb..327d50d4681d7e97dc7efa720ce39bccc11ead7d 100644
(file)
--- a/
arch/arm/mach-exynos/mach-universal_c210.c
+++ b/
arch/arm/mach-exynos/mach-universal_c210.c
@@
-41,7
+41,7
@@
#include <plat/mfc.h>
#include <plat/sdhci.h>
#include <plat/fimc-core.h>
#include <plat/mfc.h>
#include <plat/sdhci.h>
#include <plat/fimc-core.h>
-#include <plat/s
5p
-time.h>
+#include <plat/s
amsung
-time.h>
#include <plat/camport.h>
#include <mach/map.h>
#include <plat/camport.h>
#include <mach/map.h>
@@
-1093,9
+1093,10
@@
static struct platform_device *universal_devices[] __initdata = {
static void __init universal_map_io(void)
{
exynos_init_io(NULL, 0);
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));
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);
+ xxti_f = 0;
+ xusbxti_f = 24000000;
}
static void s5p_tv_setup(void)
}
static void s5p_tv_setup(void)
@@
-1153,7
+1154,7
@@
MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
.map_io = universal_map_io,
.init_machine = universal_machine_init,
.init_late = exynos_init_late,
.map_io = universal_map_io,
.init_machine = universal_machine_init,
.init_late = exynos_init_late,
- .init_time = s
5p
_timer_init,
+ .init_time = s
amsung
_timer_init,
.reserve = &universal_reserve,
.restart = exynos4_restart,
MACHINE_END
.reserve = &universal_reserve,
.restart = exynos4_restart,
MACHINE_END