Commit bef6229f authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 6ff33f39

Documentation/arm/sunxi/README

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ SunXi family 
        + Datasheet

          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

	  http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf

        + User Manual

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ using one of the following compatible strings: 
  allwinner,sun4i-a10

  allwinner,sun5i-a10s

  allwinner,sun5i-a13

  allwinner,sun5i-r8

  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

arch/arm/mach-sunxi/sunxi.c

+2 −1
Original line number Diff line number Diff line
@@ -26,10 +26,11 @@ static const char * const sunxi_board_dt_compat[] = { 
	"allwinner,sun4i-a10",

	"allwinner,sun5i-a10s",

	"allwinner,sun5i-a13",

	"allwinner,sun5i-r8",

	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,

	.init_late	= sunxi_dt_cpufreq_init,

MACHINE_END

drivers/clk/sunxi/clk-sunxi.c

+1 −0
Original line number Diff line number Diff line
@@ -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_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);



static const char *sun6i_critical_clocks[] __initdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE