tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: sunxi: Add R8 support

The R8 is a new Allwinner SoC based on the A13. While both are very
similar, there's still a few differences. Introduce a new compatible to
deal with them.

In order to have a consistent naming, instead of mentioning the Allwinner
A series as the machine name, switch to sun4i/sun5i like what is done for
the other families.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>

Maxime Ripard bef6229f 6ff33f39

+5 -2
+1 -1
Documentation/arm/sunxi/README
··· 25 25 + Datasheet 26 26 http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf 27 27 28 - - Allwinner A13 (sun5i) 28 + - Allwinner A13 / R8 (sun5i) 29 29 + Datasheet 30 30 http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf 31 31 + User Manual
+1
Documentation/devicetree/bindings/arm/sunxi.txt
··· 6 6 allwinner,sun4i-a10 7 7 allwinner,sun5i-a10s 8 8 allwinner,sun5i-a13 9 + allwinner,sun5i-r8 9 10 allwinner,sun6i-a31 10 11 allwinner,sun7i-a20 11 12 allwinner,sun8i-a23
+2 -1
arch/arm/mach-sunxi/sunxi.c
··· 26 26 "allwinner,sun4i-a10", 27 27 "allwinner,sun5i-a10s", 28 28 "allwinner,sun5i-a13", 29 + "allwinner,sun5i-r8", 29 30 NULL, 30 31 }; 31 32 32 - DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") 33 + DT_MACHINE_START(SUNXI_DT, "Allwinner sun4i/sun5i Families") 33 34 .dt_compat = sunxi_board_dt_compat, 34 35 .init_late = sunxi_dt_cpufreq_init, 35 36 MACHINE_END
+1
drivers/clk/sunxi/clk-sunxi.c
··· 1196 1196 } 1197 1197 CLK_OF_DECLARE(sun5i_a10s_clk_init, "allwinner,sun5i-a10s", sun5i_init_clocks); 1198 1198 CLK_OF_DECLARE(sun5i_a13_clk_init, "allwinner,sun5i-a13", sun5i_init_clocks); 1199 + CLK_OF_DECLARE(sun5i_r8_clk_init, "allwinner,sun5i-r8", sun5i_init_clocks); 1199 1200 CLK_OF_DECLARE(sun7i_a20_clk_init, "allwinner,sun7i-a20", sun5i_init_clocks); 1200 1201 1201 1202 static const char *sun6i_critical_clocks[] __initdata = {