Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4fe2dfabe48edb799065d05fe96bfb7745cd5688

Authored by Linus Torvalds
2 parents ecccd1248d 2e376799b2
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

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

Showing 2 changed files Side-by-side Diff

arch/arm/configs/multi_v7_defconfig
Diff comments   View file @ 4fe2dfa
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_MACH_ARMADA_XP=y
7 7 CONFIG_ARCH_HIGHBANK=y
8 8 CONFIG_ARCH_SOCFPGA=y
  9 +CONFIG_ARCH_SUNXI=y
9 10 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
10 11 CONFIG_ARM_ERRATA_754322=y
11 12 CONFIG_SMP=y
arch/arm/mach-sunxi/sunxi.c
Diff comments   View file @ 4fe2dfa
... ... @@ -80,8 +80,8 @@
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