Skip to content

Commit

Permalink
Merge tag 'stm32-soc-for-v4.6-2' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/kernel/git/mcoquelin/stm32 into next/soc

Merge "STM32 SoC updates for v4.6 #2" from Maxime Coquelin:

Highlights:
-----------
 - Add a new stm32f469 SoC

* tag 'stm32-soc-for-v4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32:
  ARM: stm32: Identify a new SoC - STM32F469
  • Loading branch information
Arnd Bergmann committed Mar 2, 2016
2 parents 3fcb230 + 6391503 commit 0d8ec17
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-stm32/board-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

static const char *const stm32_compat[] __initconst = {
"st,stm32f429",
"st,stm32f469",
NULL
};

Expand Down

0 comments on commit 0d8ec17

Please sign in to comment.