aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/arm/sunxi.txt1
-rw-r--r--arch/arm/mach-sunxi/Kconfig2
-rw-r--r--arch/arm/mach-sunxi/sunxi.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 42941fdefb11..3cb4b946ff2b 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -9,4 +9,5 @@ using one of the following compatible strings:
9 allwinner,sun6i-a31 9 allwinner,sun6i-a31
10 allwinner,sun7i-a20 10 allwinner,sun7i-a20
11 allwinner,sun8i-a23 11 allwinner,sun8i-a23
12 allwinner,sun8i-h3
12 allwinner,sun9i-a80 13 allwinner,sun9i-a80
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 81502b90dd91..4efe2d43a126 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -35,7 +35,7 @@ config MACH_SUN7I
35 select SUN5I_HSTIMER 35 select SUN5I_HSTIMER
36 36
37config MACH_SUN8I 37config MACH_SUN8I
38 bool "Allwinner A23 (sun8i) SoCs support" 38 bool "Allwinner sun8i Family SoCs support"
39 default ARCH_SUNXI 39 default ARCH_SUNXI
40 select ARM_GIC 40 select ARM_GIC
41 select MFD_SUN6I_PRCM 41 select MFD_SUN6I_PRCM
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 1bc811a74a9f..82709020c57c 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -67,10 +67,12 @@ MACHINE_END
67 67
68static const char * const sun8i_board_dt_compat[] = { 68static const char * const sun8i_board_dt_compat[] = {
69 "allwinner,sun8i-a23", 69 "allwinner,sun8i-a23",
70 "allwinner,sun8i-h3",
70 NULL, 71 NULL,
71}; 72};
72 73
73DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family") 74DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
75 .init_time = sun6i_timer_init,
74 .dt_compat = sun8i_board_dt_compat, 76 .dt_compat = sun8i_board_dt_compat,
75 .init_late = sunxi_dt_cpufreq_init, 77 .init_late = sunxi_dt_cpufreq_init,
76MACHINE_END 78MACHINE_END