aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-06-09 03:40:05 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-06-16 14:49:30 -0400
commit81265dfb1ccba0941e54a61c2473befe8c09edc0 (patch)
tree32b4b8d6d6d65adbe02eb77b87bdf6b0d7d7cf62
parentec3805e6199649db2a462045a38eb1050c6151aa (diff)
ARM: sunxi: Add Allwinner A10s machine compatible
The A10s is a SoC member of the Allwinner sun5i family. It is basically an A13 with an EMAC and an HDMI controller. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--Documentation/arm/sunxi/README4
-rw-r--r--arch/arm/mach-sunxi/sunxi.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index d9a372d06e77..e3f93fb9224e 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -17,6 +17,10 @@ SunXi family
17 + User Manual 17 + User Manual
18 http://dl.linux-sunxi.org/A10/A10%20User%20Manual%20-%20v1.20%20%282012-04-09%2c%20DECRYPTED%29.pdf 18 http://dl.linux-sunxi.org/A10/A10%20User%20Manual%20-%20v1.20%20%282012-04-09%2c%20DECRYPTED%29.pdf
19 19
20 - Allwinner A10s (sun5i)
21 + Datasheet
22 http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf
23
20 - Allwinner A13 (sun5i) 24 - Allwinner A13 (sun5i)
21 + Datasheet 25 + Datasheet
22 http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf 26 http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 08937a345ab0..a42d8743ba7f 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -109,6 +109,7 @@ static void __init sunxi_dt_init(void)
109 109
110static const char * const sunxi_board_dt_compat[] = { 110static const char * const sunxi_board_dt_compat[] = {
111 "allwinner,sun4i-a10", 111 "allwinner,sun4i-a10",
112 "allwinner,sun5i-a10s",
112 "allwinner,sun5i-a13", 113 "allwinner,sun5i-a13",
113 NULL, 114 NULL,
114}; 115};