diff options
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index dbea6f4efe9f..2eeff1e64b6e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y | |||
| 6 | CONFIG_MACH_ARMADA_XP=y | 6 | CONFIG_MACH_ARMADA_XP=y |
| 7 | CONFIG_ARCH_HIGHBANK=y | 7 | CONFIG_ARCH_HIGHBANK=y |
| 8 | CONFIG_ARCH_SOCFPGA=y | 8 | CONFIG_ARCH_SOCFPGA=y |
| 9 | CONFIG_ARCH_SUNXI=y | ||
| 9 | # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set | 10 | # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set |
| 10 | CONFIG_ARM_ERRATA_754322=y | 11 | CONFIG_ARM_ERRATA_754322=y |
| 11 | CONFIG_SMP=y | 12 | CONFIG_SMP=y |
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) | |||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static const char * const sunxi_board_dt_compat[] = { | 82 | static const char * const sunxi_board_dt_compat[] = { |
| 83 | "allwinner,sun4i", | 83 | "allwinner,sun4i-a10", |
| 84 | "allwinner,sun5i", | 84 | "allwinner,sun5i-a13", |
| 85 | NULL, | 85 | NULL, |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
