From: Joel Stanley <joel@jms.id.au>
Date: Fri, 9 Apr 2021 04:45:41 +0000 (+0930)
Subject: Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=61fbc42084f46f82dde66b04f3b14ccfadc7b9c5;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next
---

61fbc42084f46f82dde66b04f3b14ccfadc7b9c5
diff --cc arch/arm/boot/dts/Makefile
index 5a9d99d5443e4,90aed2c2959a8,8e5d4ab4e75e6..f845238051e6f
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@@ -333,10 -333,9 -333,8 +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