Make sure the base address and length of the Raspberry Pi miniuart set
in the ACPI tables match those in the official device tree. This will be
useful for adding ACPI support to the miniuart Linux driver.

Signed-off-by: Adrien Thierry <athierry@redhat.com>
---
 .../RaspberryPi/Library/DualSerialPortLib/DualSerialPortLib.h | 2 +-
 Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortLib.h b/Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortLib.h
index 24c0e5fd56..65e8aeb17c 100644
--- a/Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortLib.h
+++ b/Platform/RaspberryPi/Library/DualSerialPortLib/DualSerialPortLib.h
@@ -17,7 +17,7 @@
 #include <IndustryStandard/Bcm2836Gpio.h>

 

 #define PL011_UART_REGISTER_BASE      BCM2836_PL011_UART_BASE_ADDRESS

-#define MINI_UART_REGISTER_BASE       (BCM2836_MINI_UART_BASE_ADDRESS + 0x40)

+#define MINI_UART_REGISTER_BASE       BCM2836_MINI_UART_BASE_ADDRESS

 

 //

 // 16550 UART register offsets and bitfields

diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
index a930c64af3..f34dddd58d 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836.h
@@ -81,9 +81,9 @@
 #define BCM2836_PL011_UART_BASE_ADDRESS                     (BCM2836_SOC_REGISTERS + BCM2836_PL011_UART_OFFSET)

 #define BCM2836_PL011_UART_LENGTH                           0x00001000

 

-#define BCM2836_MINI_UART_OFFSET                            0x00215000

+#define BCM2836_MINI_UART_OFFSET                            0x00215040

 #define BCM2836_MINI_UART_BASE_ADDRESS                      (BCM2836_SOC_REGISTERS + BCM2836_MINI_UART_OFFSET)

-#define BCM2836_MINI_UART_LENGTH                            0x00000070

+#define BCM2836_MINI_UART_LENGTH                            0x00000040

 

 #define BCM2836_I2C0_OFFSET                                 0x00205000

 #define BCM2836_I2C0_BASE_ADDRESS                           (BCM2836_SOC_REGISTERS + BCM2836_I2C0_OFFSET)

-- 
2.31.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84349): https://edk2.groups.io/g/devel/message/84349
Mute This Topic: https://groups.io/mt/87501357/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-