diff --git a/boards/arm/mps2_an385/mps2_an385.dts b/boards/arm/mps2_an385/mps2_an385.dts index ed5a8339acf..b97a58124aa 100644 --- a/boards/arm/mps2_an385/mps2_an385.dts +++ b/boards/arm/mps2_an385/mps2_an385.dts @@ -41,18 +41,21 @@ compatible = "arm,cmsdk-timer"; reg = <0x40000000 0x1000>; interrupts = <8 3>; + label = "TIMER_0"; }; timer1: timer@40001000 { compatible = "arm,cmsdk-timer"; reg = <0x40001000 0x1000>; interrupts = <9 3>; + label = "TIMER_1"; }; dtimer0: dtimer@40002000 { compatible = "arm,cmsdk-dtimer"; reg = <0x40002000 0x1000>; interrupts = <10 3>; + label = "DTIMER_0"; }; uart0: uart@40004000 { diff --git a/boards/arm/v2m_beetle/v2m_beetle.dts b/boards/arm/v2m_beetle/v2m_beetle.dts index 9432e2cf9e2..ef8d4bfd842 100644 --- a/boards/arm/v2m_beetle/v2m_beetle.dts +++ b/boards/arm/v2m_beetle/v2m_beetle.dts @@ -39,18 +39,21 @@ compatible = "arm,cmsdk-timer"; reg = <0x40000000 0x1000>; interrupts = <8 3>; + label = "TIMER_0"; }; timer1: timer@40001000 { compatible = "arm,cmsdk-timer"; reg = <0x40001000 0x1000>; interrupts = <9 3>; + label = "TIMER_1"; }; dtimer0: dtimer@40002000 { compatible = "arm,cmsdk-dtimer"; reg = <0x40002000 0x1000>; interrupts = <10 3>; + label = "DTIMER_0"; }; uart0: uart@40004000 { diff --git a/boards/arm/v2m_musca/v2m_musca-common.dtsi b/boards/arm/v2m_musca/v2m_musca-common.dtsi index c919cbe72d4..736d4454ef5 100644 --- a/boards/arm/v2m_musca/v2m_musca-common.dtsi +++ b/boards/arm/v2m_musca/v2m_musca-common.dtsi @@ -8,18 +8,21 @@ timer0: timer@0 { compatible = "arm,cmsdk-timer"; reg = <0x0 0x1000>; interrupts = <3 3>; + label = "TIMER_0"; }; timer1: timer@1000 { compatible = "arm,cmsdk-timer"; reg = <0x1000 0x1000>; interrupts = <4 3>; + label = "TIMER_1"; }; dtimer0: dtimer@2000 { compatible = "arm,cmsdk-dtimer"; reg = <0x2000 0x1000>; interrupts = <5 3>; + label = "DTIMER_0"; }; wdog0: wdog@81000 { diff --git a/dts/bindings/timer/arm,cmsdk-dtimer.yaml b/dts/bindings/timer/arm,cmsdk-dtimer.yaml index 4f9add72c18..3da97a99b89 100644 --- a/dts/bindings/timer/arm,cmsdk-dtimer.yaml +++ b/dts/bindings/timer/arm,cmsdk-dtimer.yaml @@ -24,4 +24,10 @@ properties: category: required description: required interrupts generation: define + + label: + type: string + category: required + description: Human readable string describing the device (used by Zephyr for API name) + generation: define ... diff --git a/dts/bindings/timer/arm,cmsdk-timer.yaml b/dts/bindings/timer/arm,cmsdk-timer.yaml index ab4cc145df5..22be92a63fc 100644 --- a/dts/bindings/timer/arm,cmsdk-timer.yaml +++ b/dts/bindings/timer/arm,cmsdk-timer.yaml @@ -24,4 +24,10 @@ properties: category: required description: required interrupts generation: define + + label: + type: string + category: required + description: Human readable string describing the device (used by Zephyr for API name) + generation: define ... diff --git a/soc/arm/arm/beetle/dts_fixup.h b/soc/arm/arm/beetle/dts_fixup.h index b982c83184c..d9c95ab275b 100644 --- a/soc/arm/arm/beetle/dts_fixup.h +++ b/soc/arm/arm/beetle/dts_fixup.h @@ -5,13 +5,16 @@ /* CMSDK APB Timers */ #define DT_CMSDK_APB_TIMER0 DT_ARM_CMSDK_TIMER_40000000_BASE_ADDRESS #define DT_CMSDK_APB_TIMER_0_IRQ DT_ARM_CMSDK_TIMER_40000000_IRQ_0 +#define DT_CMSDK_APB_TIMER0_LABEL DT_ARM_CMSDK_TIMER_40000000_LABEL #define DT_CMSDK_APB_TIMER1 DT_ARM_CMSDK_TIMER_40001000_BASE_ADDRESS #define DT_CMSDK_APB_TIMER_1_IRQ DT_ARM_CMSDK_TIMER_40001000_IRQ_0 +#define DT_CMSDK_APB_TIMER1_LABEL DT_ARM_CMSDK_TIMER_40001000_LABEL /* CMSDK APB Dual Timer */ #define DT_CMSDK_APB_DTIMER DT_ARM_CMSDK_DTIMER_40002000_BASE_ADDRESS #define DT_CMSDK_APB_DUALTIMER_IRQ DT_ARM_CMSDK_DTIMER_40002000_IRQ_0 +#define DT_CMSDK_APB_DTIMER0_LABEL DT_ARM_CMSDK_DTIMER_40002000_LABEL /* CMSDK AHB General Purpose Input/Output (GPIO) */ #define DT_CMSDK_AHB_GPIO0 DT_ARM_CMSDK_GPIO_40010000_BASE_ADDRESS