aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-07-09 18:08:44 -0400
committerKevin Hilman <khilman@linaro.org>2015-07-09 18:08:44 -0400
commitd024bae2c45956bf76f375ee532305dbfb3a6ba4 (patch)
tree6562dce9de75bab0d0c63271aa39cd95cb909712
parent9ccd608070b6d4fd1a89fd76a84184fe401fb6a8 (diff)
parent5738563bf6f2f1631dc71a35293b135f90969a35 (diff)
Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner late changes for 4.2" from Maxime Ripard: Allwinner late changes for 4.2 A bunch of defconfig changes, and some patches to make the Allwinner H3 and A33 boot properly. * tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: Enable simplefb in the defconfig ARM: Remove deprecated symbol from defconfig files ARM: sunxi: Add Machine support for A33 ARM: sunxi: Introduce Allwinner H3 support Documentation: sunxi: Update Allwinner SoC documentation
-rw-r--r--Documentation/arm/sunxi/README18
-rw-r--r--Documentation/devicetree/bindings/arm/sunxi.txt2
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
-rw-r--r--arch/arm/configs/sunxi_defconfig6
-rw-r--r--arch/arm/mach-sunxi/Kconfig2
-rw-r--r--arch/arm/mach-sunxi/sunxi.c5
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c1
7 files changed, 30 insertions, 5 deletions
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index 1fe2d7fd4108..5e38e1582f95 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -36,7 +36,7 @@ SunXi family
36 + User Manual 36 + User Manual
37 http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf 37 http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
38 38
39 - Allwinner A23 39 - Allwinner A23 (sun8i)
40 + Datasheet 40 + Datasheet
41 http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf 41 http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
42 + User Manual 42 + User Manual
@@ -55,7 +55,23 @@ SunXi family
55 + User Manual 55 + User Manual
56 http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf 56 http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf
57 57
58 - Allwinner A33 (sun8i)
59 + Datasheet
60 http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf
61 + User Manual
62 http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf
63
64 - Allwinner H3 (sun8i)
65 + Datasheet
66 http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf
67
58 * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs 68 * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
59 - Allwinner A80 69 - Allwinner A80
60 + Datasheet 70 + Datasheet
61 http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf 71 http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf
72
73 * Octa ARM Cortex-A7 based SoCs
74 - Allwinner A83T
75 + Not Supported
76 + Datasheet
77 http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 42941fdefb11..67da20539540 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -9,4 +9,6 @@ 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-a33
13 allwinner,sun8i-h3
12 allwinner,sun9i-a80 14 allwinner,sun9i-a80
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6d83a1bf0c74..5fd8df6f50ea 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -353,7 +353,6 @@ CONFIG_POWER_RESET_AS3722=y
353CONFIG_POWER_RESET_GPIO=y 353CONFIG_POWER_RESET_GPIO=y
354CONFIG_POWER_RESET_GPIO_RESTART=y 354CONFIG_POWER_RESET_GPIO_RESTART=y
355CONFIG_POWER_RESET_KEYSTONE=y 355CONFIG_POWER_RESET_KEYSTONE=y
356CONFIG_POWER_RESET_SUN6I=y
357CONFIG_POWER_RESET_RMOBILE=y 356CONFIG_POWER_RESET_RMOBILE=y
358CONFIG_SENSORS_LM90=y 357CONFIG_SENSORS_LM90=y
359CONFIG_SENSORS_LM95245=y 358CONFIG_SENSORS_LM95245=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 8ecba00dcd83..7ebc346bf9fa 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -2,6 +2,7 @@ CONFIG_NO_HZ=y
2CONFIG_HIGH_RES_TIMERS=y 2CONFIG_HIGH_RES_TIMERS=y
3CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
4CONFIG_PERF_EVENTS=y 4CONFIG_PERF_EVENTS=y
5CONFIG_MODULES=y
5CONFIG_ARCH_SUNXI=y 6CONFIG_ARCH_SUNXI=y
6CONFIG_SMP=y 7CONFIG_SMP=y
7CONFIG_NR_CPUS=8 8CONFIG_NR_CPUS=8
@@ -77,7 +78,6 @@ CONFIG_SPI_SUN6I=y
77CONFIG_GPIO_SYSFS=y 78CONFIG_GPIO_SYSFS=y
78CONFIG_POWER_SUPPLY=y 79CONFIG_POWER_SUPPLY=y
79CONFIG_POWER_RESET=y 80CONFIG_POWER_RESET=y
80CONFIG_POWER_RESET_SUN6I=y
81CONFIG_THERMAL=y 81CONFIG_THERMAL=y
82CONFIG_CPU_THERMAL=y 82CONFIG_CPU_THERMAL=y
83CONFIG_WATCHDOG=y 83CONFIG_WATCHDOG=y
@@ -87,6 +87,10 @@ CONFIG_REGULATOR=y
87CONFIG_REGULATOR_FIXED_VOLTAGE=y 87CONFIG_REGULATOR_FIXED_VOLTAGE=y
88CONFIG_REGULATOR_AXP20X=y 88CONFIG_REGULATOR_AXP20X=y
89CONFIG_REGULATOR_GPIO=y 89CONFIG_REGULATOR_GPIO=y
90CONFIG_FB=y
91CONFIG_FB_SIMPLE=y
92CONFIG_FRAMEBUFFER_CONSOLE=y
93CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
90CONFIG_USB=y 94CONFIG_USB=y
91CONFIG_USB_EHCI_HCD=y 95CONFIG_USB_EHCI_HCD=y
92CONFIG_USB_EHCI_HCD_PLATFORM=y 96CONFIG_USB_EHCI_HCD_PLATFORM=y
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..65bab2876343 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -67,10 +67,13 @@ 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-a33",
71 "allwinner,sun8i-h3",
70 NULL, 72 NULL,
71}; 73};
72 74
73DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family") 75DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
76 .init_time = sun6i_timer_init,
74 .dt_compat = sun8i_board_dt_compat, 77 .dt_compat = sun8i_board_dt_compat,
75 .init_late = sunxi_dt_cpufreq_init, 78 .init_late = sunxi_dt_cpufreq_init,
76MACHINE_END 79MACHINE_END
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 9a82f17d2d73..abf7b37faf73 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1391,6 +1391,7 @@ static void __init sun6i_init_clocks(struct device_node *node)
1391CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks); 1391CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks);
1392CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks); 1392CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks);
1393CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks); 1393CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks);
1394CLK_OF_DECLARE(sun8i_a33_clk_init, "allwinner,sun8i-a33", sun6i_init_clocks);
1394 1395
1395static void __init sun9i_init_clocks(struct device_node *node) 1396static void __init sun9i_init_clocks(struct device_node *node)
1396{ 1397{