[PATCH 09/10] arm/raspberrypi: correct and extend definitions for GPU timer.

[pisa at cmp.felk.cvut.cz]

From: Pavel Pisa <pisa at cmp.felk.cvut.cz>

---
 c/src/lib/libbsp/arm/raspberrypi/include/irq.h         |  5 +++++
 c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h | 18 +++++++++++-------
 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 3bc204a..4600534 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 2f42731..e442d5f 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)
 
 /** @} */
 
-- 
1.9.1