Unverified Commit c93a25d7 authored Nov 30, 2022 by Arnd Bergmann

Merge tag 'mvebu-dt-6.2-1' of...

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>

parents 3deeb5b0 11f24029

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 \

arch/arm/boot/dts/armada-370-dlink-dns327l.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -86,19 +86,19 @@ &sata_l_white_pin

		pinctrl-names = "default";

		sata-r-amber-pin {
		led-sata-r-amber {
		label = "dns327l:amber:sata-r";
		gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
		default-state = "keep";
		};

		sata-l-amber-pin {
		led-sata-l-amber {
		label = "dns327l:amber:sata-l";
		gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
		default-state = "keep";
		};

		backup-led-pin {
		led-backup {
		label = "dns327l:white:usb";
		gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
		default-state = "keep";

arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,11 +72,11 @@ regulator@4 {
		};

		gpio-leds {
		red-sata2 {
		led-red-sata2 {
		label = "dart:red:sata2";
		gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
		};
		red-sata3 {
		led-red-sata3 {
		label = "dart:red:sata3";
		gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
		};

arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -132,21 +132,21 @@ button-reset {
		gpio-leds {
		compatible = "gpio-leds";

		white-power {
		led-white-power {
		label = "dart:white:power";
		gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
		linux,default-trigger = "timer";

		};
		red-power {
		led-red-power {
		label = "dart:red:power";
		gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
		};
		red-sata0 {
		led-red-sata0 {
		label = "dart:red:sata0";
		gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
		};
		red-sata1 {
		led-red-sata1 {
		label = "dart:red:sata1";
		gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
		};

arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ button-usb {
		gpio-leds {
		compatible = "gpio-leds";

		red-sata0 {
		led-red-sata0 {
		label = "cumulus:red:sata0";
		gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
		default-state = "off";