diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:36:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 23:36:17 +0100 |
| commit | 0d8ec17ca34ba9dad6932c32ee2d114b37744c23 (patch) | |
| tree | c4589b3d91cec2917417d105931d2c96e7249141 | |
| parent | Merge tag 'omap-for-v4.6/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
| parent | ARM: stm32: Identify a new SoC - STM32F469 (diff) | |
| download | wireguard-linux-0d8ec17ca34ba9dad6932c32ee2d114b37744c23.tar.xz wireguard-linux-0d8ec17ca34ba9dad6932c32ee2d114b37744c23.zip | |
Merge tag 'stm32-soc-for-v4.6-2' of git://git.kernel.org/pub/scm/linux/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
| -rw-r--r-- | arch/arm/mach-stm32/board-dt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-dt.c index f2ad7723d034..ceee47735eec 100644 --- a/arch/arm/mach-stm32/board-dt.c +++ b/arch/arm/mach-stm32/board-dt.c @@ -10,6 +10,7 @@ static const char *const stm32_compat[] __initconst = { "st,stm32f429", + "st,stm32f469", NULL }; |