commit 7b6b243600e9319356fb4f2c5faf46ed9d1a659e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 29 23:50:05 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 29 23:50:05 2024 +0000
tree dc5556b6f4b85c6a5e2d70bad504bb0684c9a812
parent 2c3945cb08d92e0f0bdf588bb1bc8604d9240265
parent 1ba9b4ade8becd5f75ff54c8249f11ea958afddc

Merge "Serial devices follows the legacy order" into main

pvmfw/platform.dts

diff --git a/pvmfw/platform.dts b/pvmfw/platform.dts
index 68acf13..99ecf8f 100644
--- a/pvmfw/platform.dts
+++ b/pvmfw/platform.dts
@@ -308,11 +308,11 @@
 			      GIC_PPI 0xa IRQ_TYPE_LEVEL_LOW>;
 	};
 
-	uart@2e8 {
+	uart@3f8 {
 		compatible = "ns16550a";
-		reg = <0x00 0x2e8 0x00 0x8>;
+		reg = <0x00 0x3f8 0x00 0x8>;
 		clock-frequency = <0x1c2000>;
-		interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>;
+		interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
 	};
 
 	uart@2f8 {
@@ -329,11 +329,11 @@
 		interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
 	};
 
-	uart@3f8 {
+	uart@2e8 {
 		compatible = "ns16550a";
-		reg = <0x00 0x3f8 0x00 0x8>;
+		reg = <0x00 0x2e8 0x00 0x8>;
 		clock-frequency = <0x1c2000>;
-		interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
+		interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>;
 	};
 
 	psci {