Pull ARM SoC fixes from Olof Johansson: "It's been quiet over the holidays, but we have had a couple of trivial fixes coming in for the newly introduced sunxi platform; one to add it to the multiplatform defconfig for build coverage, and one fixup for device tree strings." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: sunxi: Change the machine compatible string. ARM: multi_v7_defconfig: Add ARCH_SUNXI
Unified · Split
| @@ -6,6 +6,7 @@ CONFIG_MACH_ARMADA_370=y · 5 unmodified lines | |||
| 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 |
| @@ -80,8 +80,8 @@ static void __init sunxi_dt_init(void) · 79 unmodified lines | |||
| 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 | ||