From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Apr 2021 19:25:29 +0000 (-0700)
Subject: Merge tag 'arm-newsoc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b0fbc540c2fc34e55828ef9918cc61528071a01;p=linux.git

Merge tag 'arm-newsoc-5.13' of git://git./linux/kernel/git/soc/soc

Pull ARM Nuvoton WPCM450 platform support from Arnd Bergmann:
 "The Nuvoton WPCM450 BMC is an older chip based on the ARM926 CPU core
  that remains in use on Supermicro X9 server boards among others.

  Support gets added for a particular server board using this SoC along
  with the basic platform bringup.

  As the platform is a predecessor to the npcm7xx platform we already
  support, it is added to the same directory, despite using a different
  name. It also seems to be related to the older w90x900/nuc9xx platform
  that was removed last year"

* tag 'arm-newsoc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: config: Add WPCM to multi v5
  MAINTAINERS: Add entry for Nuvoton WPCM450
  ARM: dts: Add devicetree for Supermicro X9SCi-LN4F based on WPCM450
  ARM: dts: Add devicetree for Nuvoton WPCM450 BMC chip
  watchdog: npcm: Add support for WPCM450
  ARM: npcm: Introduce Nuvoton WPCM450 SoC
  dt-bindings: watchdog: npcm: Add nuvoton,wpcm450-wdt
  dt-bindings: arm: npcm: Add nuvoton,wpcm450 compatible string
  dt-bindings: vendor-prefixes: Add Supermicro
  ARM: dts: Add board-specific compatible string to npcm750-evb devicetree
  dt-bindings: arm: Convert nuvoton,npcm750 binding to YAML
---

6b0fbc540c2fc34e55828ef9918cc61528071a01
diff --cc arch/arm/boot/dts/Makefile
index b945d6f14aa7a,5a9d99d5443e4..f8f09c5066e75
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -333,9 -333,10 +333,11 @@@ dtb-$(CONFIG_ARCH_LPC18XX) += 
  dtb-$(CONFIG_ARCH_LPC32XX) += \
  	lpc3250-ea3250.dtb \
  	lpc3250-phy3250.dtb
+ dtb-$(CONFIG_ARCH_WPCM450) += \
+ 	nuvoton-wpcm450-supermicro-x9sci-ln4f.dtb
  dtb-$(CONFIG_ARCH_NPCM7XX) += \
  	nuvoton-npcm730-gsj.dtb \
 +	nuvoton-npcm730-gbs.dtb \
  	nuvoton-npcm730-kudo.dtb \
  	nuvoton-npcm750-evb.dtb \
  	nuvoton-npcm750-runbmc-olympus.dtb