diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-30 15:06:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-30 16:41:49 +0100 |
| commit | c93a25d77592fa191a14a3fe937f0b18047cafde (patch) | |
| tree | 994d231b1772ff76b322ab6af3983865dce3064a /arch/arm/boot/dts/Makefile | |
| parent | 3deeb5b079f7142608186d1cb8d8d5ed56693f3c (diff) | |
| parent | 11f24029403e6e24b6136c852511b7cfb7b39f5e (diff) | |
| download | lwn-c93a25d77592fa191a14a3fe937f0b18047cafde.tar.gz lwn-c93a25d77592fa191a14a3fe937f0b18047cafde.zip | |
Merge tag 'mvebu-dt-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt for 6.2 (part 1)
Fix assigned-addresses for every PCIe Root Port
Align LED node names with dtschema
Add a new kirkwood based board: Zyxel NSA310S
Fix compatible string for gpios for Armada 38x and 39x
Add interrupts for watchdog on Armada XP
Turris Omnia (Armada 385 based):
- Add switch port 6 node
- Add ethernet aliases
Switch to using gpiod API in pm-board code
* tag 'mvebu-dt-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
ARM: dts: armada-xp: add interrupts for watchdog
ARM: dts: armada: align LED node names with dtschema
ARM: mvebu: switch to using gpiod API in pm-board code
ARM: dts: armada-39x: Fix compatible string for gpios
ARM: dts: armada-38x: Fix compatible string for gpios
ARM: dts: turris-omnia: Add switch port 6 node
ARM: dts: turris-omnia: Add ethernet aliases
ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port
ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port
ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port
ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port
ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port
ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port
ARM: dts: kirkwood: Add Zyxel NSA310S board
Link: https://lore.kernel.org/r/87cz979adf.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b3ab92a66a82..4be7991fec81 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -355,6 +355,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ kirkwood-ns2mini.dtb \ kirkwood-nsa310.dtb \ kirkwood-nsa310a.dtb \ + kirkwood-nsa310s.dtb \ kirkwood-nsa320.dtb \ kirkwood-nsa325.dtb \ kirkwood-openblocks_a6.dtb \ |