public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-16 03:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: sunxi: Add R8 support

Browse source 
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>
This commit is contained in:
Maxime Ripard 2015-06-09 19:38:04 +02:00
parent 6ff33f3902
commit bef6229f36
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/arm/sunxi/README
View file

@ -25,7 +25,7 @@ SunXi family
+ Datasheet + Datasheet
http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf
- Allwinner A13 (sun5i) - Allwinner A13 / R8 (sun5i)
+ Datasheet + Datasheet
http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+ User Manual + User Manual

1
Documentation/devicetree/bindings/arm/sunxi.txt
View file

@ -6,6 +6,7 @@ using one of the following compatible strings:
allwinner,sun4i-a10 allwinner,sun4i-a10
allwinner,sun5i-a10s allwinner,sun5i-a10s
allwinner,sun5i-a13 allwinner,sun5i-a13
allwinner,sun5i-r8
allwinner,sun6i-a31 allwinner,sun6i-a31
allwinner,sun7i-a20 allwinner,sun7i-a20
allwinner,sun8i-a23 allwinner,sun8i-a23

3
arch/arm/mach-sunxi/sunxi.c
View file

@ -26,10 +26,11 @@ static const char * const sunxi_board_dt_compat[] = {
"allwinner,sun4i-a10", "allwinner,sun4i-a10",
"allwinner,sun5i-a10s", "allwinner,sun5i-a10s",
"allwinner,sun5i-a13", "allwinner,sun5i-a13",
"allwinner,sun5i-r8",
NULL, NULL,
}; };
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") DT_MACHINE_START(SUNXI_DT, "Allwinner sun4i/sun5i Families")
.dt_compat = sunxi_board_dt_compat, .dt_compat = sunxi_board_dt_compat,
.init_late = sunxi_dt_cpufreq_init, .init_late = sunxi_dt_cpufreq_init,
MACHINE_END MACHINE_END

1
drivers/clk/sunxi/clk-sunxi.c
View file

@ -1196,6 +1196,7 @@ static void __init sun5i_init_clocks(struct device_node *node)
} }
CLK_OF_DECLARE(sun5i_a10s_clk_init, "allwinner,sun5i-a10s", sun5i_init_clocks); CLK_OF_DECLARE(sun5i_a10s_clk_init, "allwinner,sun5i-a10s", sun5i_init_clocks);
CLK_OF_DECLARE(sun5i_a13_clk_init, "allwinner,sun5i-a13", sun5i_init_clocks); CLK_OF_DECLARE(sun5i_a13_clk_init, "allwinner,sun5i-a13", sun5i_init_clocks);
CLK_OF_DECLARE(sun5i_r8_clk_init, "allwinner,sun5i-r8", sun5i_init_clocks);
CLK_OF_DECLARE(sun7i_a20_clk_init, "allwinner,sun7i-a20", sun5i_init_clocks); CLK_OF_DECLARE(sun7i_a20_clk_init, "allwinner,sun7i-a20", sun5i_init_clocks);
static const char *sun6i_critical_clocks[] __initdata = { static const char *sun6i_critical_clocks[] __initdata = {