patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

arm: beetle: Use device tree for IRQs

Browse source 
Get the IRQs for the devices we define in the device tree from the dts
file.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2018-10-03 09:08:36 -05:00 committed by Kumar Gala
parent ca8aea1a62
commit de78ecd79c
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
boards/arm/v2m_beetle/v2m_beetle.dts
View file

@ -1,7 +1,6 @@
/dts-v1/;
#include <arm/armv7-m.dtsi>
#include "arm/beetle/soc_irq.h"
/ {
compatible = "arm,beetle";
@ -38,25 +37,25 @@
timer0: timer@40000000 {
compatible = "arm,cmsdk-timer";
reg = <0x40000000 0x1000>;
interrupts = <IRQ_TIMER0 3>;
interrupts = <8 3>;
};
timer1: timer@40001000 {
compatible = "arm,cmsdk-timer";
reg = <0x40001000 0x1000>;
interrupts = <IRQ_TIMER1 3>;
interrupts = <9 3>;
};
dtimer0: dtimer@40002000 {
compatible = "arm,cmsdk-dtimer";
reg = <0x40000000 0x1000>;
interrupts = <IRQ_DUALTIMER 3>;
interrupts = <10 3>;
};
uart0: uart@40004000 {
compatible = "arm,cmsdk-uart";
reg = <0x40004000 0x1000>;
interrupts = <IRQ_UART0 3>;
interrupts = <0 3>;
current-speed = <115200>;
label = "UART_0";
};
@ -64,7 +63,7 @@
uart1: uart@40005000 {
compatible = "arm,cmsdk-uart";
reg = <0x40005000 0x1000>;
interrupts = <IRQ_UART1 3>;
interrupts = <1 3>;
current-speed = <115200>;
label = "UART_1";
};
@ -77,25 +76,25 @@
gpio0: gpio@40010000 {
compatible = "arm,cmsdk-gpio";
reg = <0x40010000 0x1000>;
interrupts = <IRQ_PORT0_ALL 3>;
interrupts = <6 3>;
};
gpio1: gpio@40011000 {
compatible = "arm,cmsdk-gpio";
reg = <0x40011000 0x1000>;
interrupts = <IRQ_PORT1_ALL 3>;
interrupts = <7 3>;
};
gpio2: gpio@40012000 {
compatible = "arm,cmsdk-gpio";
reg = <0x40012000 0x1000>;
interrupts = <IRQ_PORT2_ALL 3>;
interrupts = <42 3>;
};
gpio3: gpio@40013000 {
compatible = "arm,cmsdk-gpio";
reg = <0x40013000 0x1000>;
interrupts = <IRQ_PORT3_ALL 3>;
interrupts = <43 3>;
};
};
};

4
soc/arm/arm/beetle/dts.fixup
View file

@ -31,11 +31,15 @@
/* CMSDK AHB General Purpose Input/Output (GPIO) */
#define CMSDK_AHB_GPIO0 ARM_CMSDK_GPIO_40010000_BASE_ADDRESS
#define IRQ_PORT0_ALL ARM_CMSDK_GPIO_40010000_IRQ_0
#define CMSDK_AHB_GPIO1 ARM_CMSDK_GPIO_40011000_BASE_ADDRESS
#define IRQ_PORT1_ALL ARM_CMSDK_GPIO_40011000_IRQ_0
#define CMSDK_AHB_GPIO2 ARM_CMSDK_GPIO_40012000_BASE_ADDRESS
#define IRQ_PORT2_ALL ARM_CMSDK_GPIO_40012000_IRQ_0
#define CMSDK_AHB_GPIO3 ARM_CMSDK_GPIO_40013000_BASE_ADDRESS
#define IRQ_PORT3_ALL ARM_CMSDK_GPIO_40013000_IRQ_0
/* End of SoC Level DTS fixup file */

9
soc/arm/arm/beetle/soc_irq.h
View file

@ -11,17 +11,10 @@
#define _ARM_BEETLE_SOC_IRQ_H_
/* IRQ Numbers */
#define IRQ_UART0 0 /* UART 0 RX and TX Combined Interrupt */
#define IRQ_SPARE 1 /* Undefined */
#define IRQ_UART1 2 /* UART 1 RX and TX Combined Interrupt */
#define IRQ_I2C0 3 /* I2C 0 Interrupt */
#define IRQ_I2C1 4 /* I2C 1 Interrupt */
#define IRQ_RTC 5 /* RTC Interrupt */
#define IRQ_PORT0_ALL 6 /* GPIO Port 0 combined Interrupt */
#define IRQ_PORT1_ALL 7 /* GPIO Port 1 combined Interrupt */
#define IRQ_TIMER0 8 /* TIMER 0 Interrupt */
#define IRQ_TIMER1 9 /* TIMER 1 Interrupt */
#define IRQ_DUALTIMER 10 /* Dual Timer Interrupt */
#define IRQ_SPI0 11 /* SPI 0 Interrupt */
#define IRQ_UARTOVF 12 /* Common UART Overflow Interrupt */
#define IRQ_SPI1 13 /* SPI 1 Interrupt */
@ -53,8 +46,6 @@
#define IRQ_LLCC_RXEVT_VALID 39 /* Cordio */
#define IRQ_LLCC_RXDMAH_DONE 40 /* Cordio */
#define IRQ_LLCC_RXDMAL_DONE 41 /* Cordio */
#define IRQ_PORT2_ALL 42 /* GPIO Port 2 combined Interrupt */
#define IRQ_PORT3_ALL 43 /* GPIO Port 3 combined Interrupt */
#define IRQ_TRNG 44 /* Random number generator Interrupt */
#endif /* _ARM_BEETLE_SOC_IRQ_H_ */