summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2016-09-03 14:04:16 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2016-09-07 20:29:39 +0200
commit40f49d11cf555433f13a0827c0f7f6c5bdd40265 (patch)
tree6c8fe99006aa64a2cf09830cc17ee040140c4f21
parentarm/raspberrypi: basic BCM2836 SMP implementation. (diff)
downloadrtems-40f49d11cf555433f13a0827c0f7f6c5bdd40265.tar.bz2
arm/raspberrypi: correct and extend definitions for GPU timer.
-rw-r--r--c/src/lib/libbsp/arm/raspberrypi/include/irq.h5
-rw-r--r--c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h18
2 files changed, 16 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h b/c/src/lib/libbsp/arm/raspberrypi/include/irq.h
index 3bc204aefe..4600534171 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h
+++ b/c/src/lib/libbsp/arm/raspberrypi/include/irq.h
@@ -36,6 +36,11 @@
#define BCM2835_INTC_TOTAL_IRQ 64 + 8
+#define BCM2835_IRQ_ID_GPU_TIMER_M0 0
+#define BCM2835_IRQ_ID_GPU_TIMER_M1 1
+#define BCM2835_IRQ_ID_GPU_TIMER_M2 2
+#define BCM2835_IRQ_ID_GPU_TIMER_M3 3
+
#define BCM2835_IRQ_ID_USB 9
#define BCM2835_IRQ_ID_AUX 29
#define BCM2835_IRQ_ID_SPI_SLAVE 43
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
index 2f42731b35..e442d5fca5 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
+++ b/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
@@ -264,13 +264,17 @@
*/
#define BCM2835_GPU_TIMER_BASE (RPI_PERIPHERAL_BASE + 0x3000)
-#define BCM2835_GPU_TIMER_CS (BCM2835_TIMER_BASE + 0x00)
-#define BCM2835_GPU_TIMER_CLO (BCM2835_TIMER_BASE + 0x04)
-#define BCM2835_GPU_TIMER_CHI (BCM2835_TIMER_BASE + 0x08)
-#define BCM2835_GPU_TIMER_C0 (BCM2835_TIMER_BASE + 0x0C)
-#define BCM2835_GPU_TIMER_C1 (BCM2835_TIMER_BASE + 0x10)
-#define BCM2835_GPU_TIMER_C2 (BCM2835_TIMER_BASE + 0x14)
-#define BCM2835_GPU_TIMER_C3 (BCM2835_TIMER_BASE + 0x18)
+#define BCM2835_GPU_TIMER_CS (BCM2835_GPU_TIMER_BASE + 0x00)
+#define BCM2835_GPU_TIMER_CS_M0 0x00000001
+#define BCM2835_GPU_TIMER_CS_M1 0x00000002
+#define BCM2835_GPU_TIMER_CS_M2 0x00000004
+#define BCM2835_GPU_TIMER_CS_M3 0x00000008
+#define BCM2835_GPU_TIMER_CLO (BCM2835_GPU_TIMER_BASE + 0x04)
+#define BCM2835_GPU_TIMER_CHI (BCM2835_GPU_TIMER_BASE + 0x08)
+#define BCM2835_GPU_TIMER_C0 (BCM2835_GPU_TIMER_BASE + 0x0C)
+#define BCM2835_GPU_TIMER_C1 (BCM2835_GPU_TIMER_BASE + 0x10)
+#define BCM2835_GPU_TIMER_C2 (BCM2835_GPU_TIMER_BASE + 0x14)
+#define BCM2835_GPU_TIMER_C3 (BCM2835_GPU_TIMER_BASE + 0x18)
/** @} */