Merge tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux into fixes

olofj · olofj · commit 2e376799b2f6 · 2012-12-28T08:53:01.000+01:00
From Maxime Ripard:
Fixes for the sunxi core to be merged in 3.8-rc2

* tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux:
  sunxi: Change the machine compatible string.
  ARM: multi_v7_defconfig: Add ARCH_SUNXI
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_SMP=y
diff --git 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,
 };
 

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ static void __init sunxi_dt_init(void)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`static const char * const sunxi_board_dt_compat[] = {`
`83`		`- "allwinner,sun4i",`
`84`		`- "allwinner,sun5i",`
	`83`	`+ "allwinner,sun4i-a10",`
	`84`	`+ "allwinner,sun5i-a13",`
`85`	`85`	`NULL,`
`86`	`86`	`};`
`87`	`87`