summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2012-12-18 15:17:12 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2012-12-23 18:20:15 +0100
commit43880f709dc59840849e31b01735ac587195ef8a (patch)
tree414e4b844580de1d6489cb6e5d308be65cc1b22b /arch/arm
parent7712866ff69e9de287cd4fbb3f06c3202020e143 (diff)
downloadlinux-43880f709dc59840849e31b01735ac587195ef8a.tar.bz2
sunxi: Change the machine compatible string.
Commit 68136b10 ("ARM: sunxi: Change device tree naming scheme for sunxi") changed the naming scheme and the compatible strings used in the device trees related to the sunXi platform, but forgot to change the compatible string in the DT machine definition. This prevents the kernel from booting on these boards. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-sunxi/sunxi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 9be910f7920b..1dc8a92e5a5f 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -80,8 +80,8 @@ static void __init sunxi_dt_init(void)
}
static const char * const sunxi_board_dt_compat[] = {
- "allwinner,sun4i",
- "allwinner,sun5i",
+ "allwinner,sun4i-a10",
+ "allwinner,sun5i-a13",
NULL,
};