Skip to content
Browse files

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

… into fixes

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
  • Loading branch information...
2 parents a49f0d1 + 43880f7 commit 2e376799b2f6af2e8baeb407b6437a4d7b650ac0 @olofj olofj committed
Showing with 3 additions and 2 deletions.
  1. +1 −0 arch/arm/configs/multi_v7_defconfig
  2. +2 −2 arch/arm/mach-sunxi/sunxi.c
View
1 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
View
4 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,
};

0 comments on commit 2e37679

Please sign in to comment.
Something went wrong with that request. Please try again.