summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishnu Patekar <vishnupatekar0510@gmail.com>2015-05-30 10:55:01 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-07-05 10:33:55 -0400
commit159870d2413c92622790e9cecbce95099bed539a (patch)
treea55292222424e15b5fc1e909e56f32b428b8a69d
parent14a882df14a5ae859b245bc708ce3fce47a91594 (diff)
ARM: sunxi: Add Machine support for A33
Add machine support for the Allwinner A33 quad core cortex-a7 based SoC, which is similar to the A23 SoC. Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Chen-Yu Tsai <wens@csie.org>
-rw-r--r--Documentation/devicetree/bindings/arm/sunxi.txt1
-rw-r--r--arch/arm/mach-sunxi/sunxi.c1
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 3cb4b946ff2b..67da20539540 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -9,5 +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
12 allwinner,sun8i-h3 13 allwinner,sun8i-h3
13 allwinner,sun9i-a80 14 allwinner,sun9i-a80
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 82709020c57c..65bab2876343 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -67,6 +67,7 @@ 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",
70 "allwinner,sun8i-h3", 71 "allwinner,sun8i-h3",
71 NULL, 72 NULL,
72}; 73};
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 7e1e2bd189b6..6d25e4e9dfec 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1389,6 +1389,7 @@ static void __init sun6i_init_clocks(struct device_node *node)
1389CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks); 1389CLK_OF_DECLARE(sun6i_a31_clk_init, "allwinner,sun6i-a31", sun6i_init_clocks);
1390CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks); 1390CLK_OF_DECLARE(sun6i_a31s_clk_init, "allwinner,sun6i-a31s", sun6i_init_clocks);
1391CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks); 1391CLK_OF_DECLARE(sun8i_a23_clk_init, "allwinner,sun8i-a23", sun6i_init_clocks);
1392CLK_OF_DECLARE(sun8i_a33_clk_init, "allwinner,sun8i-a33", sun6i_init_clocks);
1392 1393
1393static void __init sun9i_init_clocks(struct device_node *node) 1394static void __init sun9i_init_clocks(struct device_node *node)
1394{ 1395{