diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 01:43:33 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 01:43:33 +0300 |
| commit | f458d69bf7cac5da16a9133d226a71e88b33042d (patch) | |
| tree | dc6d6ca792bbf125872056e1d0c450527ef9403c /arch/arm/boot/dts/Makefile | |
| parent | 5161540797589eacad9b309416b1d15729306c00 (diff) | |
| parent | 879e5b3f98bae035cf8e2f777cc3c64bde8d6d9b (diff) | |
| download | linux-f458d69bf7cac5da16a9133d226a71e88b33042d.tar.xz | |
Merge tag 'nuvoton-5.11-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt
Nuvoton device tree updates for 5.11
- New machines
* Fii Kudo, a NPCM730 BMC
* Quanta GSJ, a NPCM750 BMC
* Qanta Olympus RunBMC, a NPCM750 BMC
- Updates to the common device trees and NCPM750 EVB
* tag 'nuvoton-5.11-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
dt-bindings: vendor-prefixes: Add FII
ARM: dts: nuvoton: Add Fii Kudo system
ARM: dts: nuvoton: Add NPCM7xx RunBMC Olympus Quanta machine
ARM: dts: nuvoton: Add Quanta GSJ BMC
ARM: dts: nuvoton: Add Quanta GSJ BMC pinctrl
ARM: dts: nuvoton: Add Nuvoton NPCM730 device tree
ARM: dts: nuvoton: Add new device nodes to NPCM750 EVB
ARM: dts: nuvoton: Add new device nodes
ARM: dts: nuvoton: Add pinctrl and GPIO node
ARM: dts: nuvoton: Modify timer register size
ARM: dts: nuvoton: Modify clock parameters
Link: https://lore.kernel.org/r/CACPK8Xd8RaLv_p6t9ckBwCwtZww+2YYOAoAYQdvni0dxc2mS7A@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d229d94e77d1..82368f3b5c6a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -339,7 +339,10 @@ dtb-$(CONFIG_ARCH_LPC32XX) += \ lpc3250-ea3250.dtb \ lpc3250-phy3250.dtb dtb-$(CONFIG_ARCH_NPCM7XX) += \ - nuvoton-npcm750-evb.dtb + nuvoton-npcm730-gsj.dtb \ + nuvoton-npcm730-kudo.dtb \ + nuvoton-npcm750-evb.dtb \ + nuvoton-npcm750-runbmc-olympus.dtb dtb-$(CONFIG_MACH_MESON6) += \ meson6-atv1200.dtb dtb-$(CONFIG_MACH_MESON8) += \ |