diff --git a/arch/arm/soc/arm/beetle/soc.h b/arch/arm/soc/arm/beetle/soc.h index f66049ecb39..2ddc19454e7 100644 --- a/arch/arm/soc/arm/beetle/soc.h +++ b/arch/arm/soc/arm/beetle/soc.h @@ -113,10 +113,6 @@ /* CMSDK APB Dual Timer */ #define CMSDK_APB_DTIMER _BEETLE_DTIMER_BASE -/* CMSDK APB Universal Asynchronous Receiver-Transmitter (UART) */ -#define CMSDK_APB_UART0 _BEETLE_UART0_BASE -#define CMSDK_APB_UART1 _BEETLE_UART1_BASE - /* CMSDK APB Watchdog */ #define CMSDK_APB_WDOG _BEETLE_WDOG_BASE diff --git a/arch/arm/soc/arm/beetle/soc_irq.h b/arch/arm/soc/arm/beetle/soc_irq.h index 771d5ed2b27..566621258b7 100644 --- a/arch/arm/soc/arm/beetle/soc_irq.h +++ b/arch/arm/soc/arm/beetle/soc_irq.h @@ -57,12 +57,6 @@ #define IRQ_PORT3_ALL 43 /* GPIO Port 3 combined Interrupt */ #define IRQ_TRNG 44 /* Random number generator Interrupt */ -#ifndef CONFIG_HAS_DTS -/* CMSDK APB Universal Asynchronous Receiver-Transmitter (UART) */ -#define CMSDK_APB_UART_0_IRQ IRQ_UART0 -#define CMSDK_APB_UART_1_IRQ IRQ_UART1 -#endif - /* CMSDK APB Timers */ #define CMSDK_APB_TIMER_0_IRQ IRQ_TIMER0 #define CMSDK_APB_TIMER_1_IRQ IRQ_TIMER1 diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts index 13150cb669f..e72f60827f3 100644 --- a/dts/arm/v2m_beetle.dts +++ b/dts/arm/v2m_beetle.dts @@ -32,14 +32,14 @@ soc { uart0: uart@40004000 { compatible = "arm,cmsdk-uart"; - reg = <0x40004000 0x14>; + reg = <0x40004000 0x1000>; interrupts = ; current-speed = <115200>; }; uart1: uart@40005000 { compatible = "arm,cmsdk-uart"; - reg = <0x40005000 0x14>; + reg = <0x40005000 0x1000>; interrupts = ; current-speed = <115200>; }; diff --git a/dts/arm/v2m_beetle.fixup b/dts/arm/v2m_beetle.fixup index 4fa75f4e65b..f810397fba9 100644 --- a/dts/arm/v2m_beetle.fixup +++ b/dts/arm/v2m_beetle.fixup @@ -1,9 +1,12 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +/* CMSDK APB Universal Asynchronous Receiver-Transmitter (UART) */ +#define CMSDK_APB_UART0 ARM_CMSDK_UART_40004000_BASE_ADDRESS_0 #define CMSDK_APB_UART_0_IRQ ARM_CMSDK_UART_40004000_IRQ_0 #define CONFIG_UART_CMSDK_APB_PORT0_IRQ_PRI ARM_CMSDK_UART_40004000_IRQ_0_PRIORITY #define CONFIG_UART_CMSDK_APB_PORT0_BAUD_RATE ARM_CMSDK_UART_40004000_CURRENT_SPEED +#define CMSDK_APB_UART1 ARM_CMSDK_UART_40005000_BASE_ADDRESS_0 #define CMSDK_APB_UART_1_IRQ ARM_CMSDK_UART_40005000_IRQ_0 #define CONFIG_UART_CMSDK_APB_PORT1_IRQ_PRI ARM_CMSDK_UART_40005000_IRQ_0_PRIORITY #define CONFIG_UART_CMSDK_APB_PORT1_BAUD_RATE ARM_CMSDK_UART_40005000_CURRENT_SPEED