tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+5
-5
+2
-2
arch/arm/boot/dts/armada-38x.dtsi
+2
-2
arch/arm/boot/dts/armada-38x.dtsi
···
304
304
};
305
305
306
306
gpio0: gpio@18100 {
307
-
compatible = "marvell,armadaxp-gpio",
307
+
compatible = "marvell,armada-370-gpio",
308
308
"marvell,orion-gpio";
309
309
reg = <0x18100 0x40>, <0x181c0 0x08>;
310
310
reg-names = "gpio", "pwm";
···
323
323
};
324
324
325
325
gpio1: gpio@18140 {
326
-
compatible = "marvell,armadaxp-gpio",
326
+
compatible = "marvell,armada-370-gpio",
327
327
"marvell,orion-gpio";
328
328
reg = <0x18140 0x40>, <0x181c8 0x08>;
329
329
reg-names = "gpio", "pwm";
+2
-2
arch/arm/boot/dts/armada-39x.dtsi
+2
-2
arch/arm/boot/dts/armada-39x.dtsi
···
213
213
};
214
214
215
215
gpio0: gpio@18100 {
216
-
compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
216
+
compatible = "marvell,orion-gpio";
217
217
reg = <0x18100 0x40>;
218
218
ngpios = <32>;
219
219
gpio-controller;
···
227
227
};
228
228
229
229
gpio1: gpio@18140 {
230
-
compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
230
+
compatible = "marvell,orion-gpio";
231
231
reg = <0x18140 0x40>;
232
232
ngpios = <28>;
233
233
gpio-controller;