Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
mach-sunxi
/
sunxi.c
diff --git
a/kernel/arch/arm/mach-sunxi/sunxi.c
b/kernel/arch/arm/mach-sunxi/sunxi.c
index
1bc811a
..
c2be98f
100644
(file)
--- a/
kernel/arch/arm/mach-sunxi/sunxi.c
+++ b/
kernel/arch/arm/mach-sunxi/sunxi.c
@@
-26,10
+26,11
@@
static const char * const sunxi_board_dt_compat[] = {
"allwinner,sun4i-a10",
"allwinner,sun5i-a10s",
"allwinner,sun5i-a13",
"allwinner,sun4i-a10",
"allwinner,sun5i-a10s",
"allwinner,sun5i-a13",
+ "allwinner,sun5i-r8",
NULL,
};
NULL,
};
-DT_MACHINE_START(SUNXI_DT, "Allwinner
A1X (Device Tree)
")
+DT_MACHINE_START(SUNXI_DT, "Allwinner
sun4i/sun5i Families
")
.dt_compat = sunxi_board_dt_compat,
.init_late = sunxi_dt_cpufreq_init,
MACHINE_END
.dt_compat = sunxi_board_dt_compat,
.init_late = sunxi_dt_cpufreq_init,
MACHINE_END
@@
-46,7
+47,7
@@
static void __init sun6i_timer_init(void)
of_clk_init(NULL);
if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
sun6i_reset_init();
of_clk_init(NULL);
if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
sun6i_reset_init();
- clocksource_
of_init
();
+ clocksource_
probe
();
}
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
}
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
@@
-67,10
+68,13
@@
MACHINE_END
static const char * const sun8i_board_dt_compat[] = {
"allwinner,sun8i-a23",
static const char * const sun8i_board_dt_compat[] = {
"allwinner,sun8i-a23",
+ "allwinner,sun8i-a33",
+ "allwinner,sun8i-h3",
NULL,
};
NULL,
};
-DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
+DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
+ .init_time = sun6i_timer_init,
.dt_compat = sun8i_board_dt_compat,
.init_late = sunxi_dt_cpufreq_init,
MACHINE_END
.dt_compat = sun8i_board_dt_compat,
.init_late = sunxi_dt_cpufreq_init,
MACHINE_END