kernel: update 4.1 to 4.1.5
[openwrt.git] / target / linux / sunxi / patches-4.1 / 142-arm-add-sunxi-h3.patch
1 From 14a882df14a5ae859b245bc708ce3fce47a91594 Mon Sep 17 00:00:00 2001
2 From: Jens Kuske <jenskuske@gmail.com>
3 Date: Fri, 15 May 2015 18:38:55 +0200
4 Subject: ARM: sunxi: Introduce Allwinner H3 support
5
6 The Allwinner H3 is a quad-core Cortex-A7-based SoC. It is very similar
7 to other sun8i family SoCs like the A23.
8
9 Signed-off-by: Jens Kuske <jenskuske@gmail.com>
10 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11
12 --- a/Documentation/devicetree/bindings/arm/sunxi.txt
13 +++ b/Documentation/devicetree/bindings/arm/sunxi.txt
14 @@ -9,4 +9,5 @@ using one of the following compatible st
15    allwinner,sun6i-a31
16    allwinner,sun7i-a20
17    allwinner,sun8i-a23
18 +  allwinner,sun8i-h3
19    allwinner,sun9i-a80
20 --- a/arch/arm/mach-sunxi/Kconfig
21 +++ b/arch/arm/mach-sunxi/Kconfig
22 @@ -35,7 +35,7 @@ config MACH_SUN7I
23         select SUN5I_HSTIMER
24  
25  config MACH_SUN8I
26 -       bool "Allwinner A23 (sun8i) SoCs support"
27 +       bool "Allwinner sun8i Family SoCs support"
28         default ARCH_SUNXI
29         select ARM_GIC
30         select MFD_SUN6I_PRCM
31 --- a/arch/arm/mach-sunxi/sunxi.c
32 +++ b/arch/arm/mach-sunxi/sunxi.c
33 @@ -67,10 +67,12 @@ MACHINE_END
34  
35  static const char * const sun8i_board_dt_compat[] = {
36         "allwinner,sun8i-a23",
37 +       "allwinner,sun8i-h3",
38         NULL,
39  };
40  
41 -DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
42 +DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
43 +       .init_time      = sun6i_timer_init,
44         .dt_compat      = sun8i_board_dt_compat,
45         .init_late      = sunxi_dt_cpufreq_init,
46  MACHINE_END