Merge "Serial devices follows the legacy order" into main am: 7b6b243600
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3106177
Change-Id: I8e948f72a9ac95c8112a0d833dd8ae5c208a2c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 {