sunxi: add support for 4.1
[openwrt/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 diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
13 index 42941fd..3cb4b94 100644
14 --- a/Documentation/devicetree/bindings/arm/sunxi.txt
15 +++ b/Documentation/devicetree/bindings/arm/sunxi.txt
16 @@ -9,4 +9,5 @@ using one of the following compatible strings:
17 allwinner,sun6i-a31
18 allwinner,sun7i-a20
19 allwinner,sun8i-a23
20 + allwinner,sun8i-h3
21 allwinner,sun9i-a80
22 diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
23 index 81502b9..4efe2d4 100644
24 --- a/arch/arm/mach-sunxi/Kconfig
25 +++ b/arch/arm/mach-sunxi/Kconfig
26 @@ -35,7 +35,7 @@ config MACH_SUN7I
27 select SUN5I_HSTIMER
28
29 config MACH_SUN8I
30 - bool "Allwinner A23 (sun8i) SoCs support"
31 + bool "Allwinner sun8i Family SoCs support"
32 default ARCH_SUNXI
33 select ARM_GIC
34 select MFD_SUN6I_PRCM
35 diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
36 index 1bc811a..8270902 100644
37 --- a/arch/arm/mach-sunxi/sunxi.c
38 +++ b/arch/arm/mach-sunxi/sunxi.c
39 @@ -67,10 +67,12 @@ MACHINE_END
40
41 static const char * const sun8i_board_dt_compat[] = {
42 "allwinner,sun8i-a23",
43 + "allwinner,sun8i-h3",
44 NULL,
45 };
46
47 -DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
48 +DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
49 + .init_time = sun6i_timer_init,
50 .dt_compat = sun8i_board_dt_compat,
51 .init_late = sunxi_dt_cpufreq_init,
52 MACHINE_END
53 --
54 cgit v0.10.2
55