Unverified Commit 88bcc6fa authored Jan 16, 2023 by Arnd Bergmann

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

Merge tag 'mvebu-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes

mvebu fixes for 6.2 (part 1)

Fix regression for gpio support on Armada 38x and Armada 38x

Fix address for UART1 on AC5/AC5X

* tag 'mvebu-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: AC5/AC5X: Fix address for UART1
  Revert "ARM: dts: armada-39x: Fix compatible string for gpios"
  Revert "ARM: dts: armada-38x: Fix compatible string for gpios"

Link: https://lore.kernel.org/r/87mt6mg08k.fsf@BL-laptop


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 45c73481 80502ffa

arch/arm/boot/dts/armada-38x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ spdif_pins: spdif-pins {
		};

		gpio0: gpio@18100 {
		compatible = "marvell,armadaxp-gpio",
		compatible = "marvell,armada-370-gpio",
		"marvell,orion-gpio";
		reg = <0x18100 0x40>, <0x181c0 0x08>;
		reg-names = "gpio", "pwm";
		@@ -323,7 +323,7 @@ gpio0: gpio@18100 {
		};

		gpio1: gpio@18140 {
		compatible = "marvell,armadaxp-gpio",
		compatible = "marvell,armada-370-gpio",
		"marvell,orion-gpio";
		reg = <0x18140 0x40>, <0x181c8 0x08>;
		reg-names = "gpio", "pwm";

arch/arm/boot/dts/armada-39x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ nand_pins: nand-pins {
		};

		gpio0: gpio@18100 {
		compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
		compatible = "marvell,orion-gpio";
		reg = <0x18100 0x40>;
		ngpios = <32>;
		gpio-controller;
		@@ -227,7 +227,7 @@ gpio0: gpio@18100 {
		};

		gpio1: gpio@18140 {
		compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
		compatible = "marvell,orion-gpio";
		reg = <0x18140 0x40>;
		ngpios = <28>;
		gpio-controller;

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ uart0: serial@12000 {

		uart1: serial@12100 {
		compatible = "snps,dw-apb-uart";
		reg = <0x11000 0x100>;
		reg = <0x12100 0x100>;
		reg-shift = <2>;
		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
		reg-io-width = <1>;