[PATCH] inmates: arm, arm64: Pull out common TIMER_IRQ definition

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

So far, all SoCs provide us IRQ 27 as timer interrupt. Let's see if
there will ever be a difference, but it will remain the minority for
quite a while then.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
inmates/lib/arm/include/mach.h | 10 +++-------
inmates/lib/arm64/include/mach.h | 13 ++++---------
2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h
index a255947a..a8561be4 100644
--- a/inmates/lib/arm/include/mach.h
+++ b/inmates/lib/arm/include/mach.h
@@ -24,8 +24,6 @@
#define GICD_V2_BASE ((void *)0x50041000)
#define GICC_V2_BASE ((void *)0x50042000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_BANANAPI)
#define CON_TYPE "8250"
#define CON_BASE 0x01c29c00
@@ -37,8 +35,6 @@
#define GICD_V2_BASE ((void *)0x01c81000)
#define GICC_V2_BASE ((void *)0x01c82000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_ORANGEPI0)
#define CON_TYPE "8250"
#define CON_BASE 0x01c28000
@@ -46,8 +42,6 @@
#define GICD_V2_BASE ((void *)0x01c81000)
#define GICC_V2_BASE ((void *)0x01c82000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_VEXPRESS)
#define CON_TYPE "PL011"
#define CON_BASE 0x1c090000
@@ -58,6 +52,8 @@
#define GICD_V3_BASE ((void *)0x2f000000)
#define GICR_V3_BASE ((void *)0x2f100000)

-#define TIMER_IRQ 27
+#endif

+#ifndef TIMER_IRQ
+#define TIMER_IRQ 27
#endif
diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h
index af4f0126..c315ba37 100644
--- a/inmates/lib/arm64/include/mach.h
+++ b/inmates/lib/arm64/include/mach.h
@@ -19,8 +19,6 @@
#define GICD_V2_BASE ((void *)0xe1110000)
#define GICC_V2_BASE ((void *)0xe112f000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_FOUNDATION_V8)
#define CON_TYPE "PL011"
#define CON_BASE 0x1c090000
@@ -28,8 +26,6 @@
#define GICD_V2_BASE ((void *)0x2c001000)
#define GICC_V2_BASE ((void *)0x2c002000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_HIKEY)
#define CON_TYPE "PL011"
#define CON_BASE 0xf7113000
@@ -37,8 +33,6 @@
#define GICD_V2_BASE ((void *)0xf6801000)
#define GICC_V2_BASE ((void *)0xf6802000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_JETSON_TX1)
#define CON_TYPE "8250"
#define CON_BASE 0x70006000
@@ -46,8 +40,6 @@
#define GICD_V2_BASE ((void *)0x50041000)
#define GICC_V2_BASE ((void *)0x50042000)

-#define TIMER_IRQ 27
-
#elif defined(CONFIG_MACH_ZYNQMP_ZCU102)
#define CON_TYPE "XUARTPS"
#define CON_BASE 0xff010000
@@ -55,6 +47,9 @@
#define GICD_V2_BASE ((void *)0xf9010000)
#define GICC_V2_BASE ((void *)0xf902f000)

-#define TIMER_IRQ 27

#endif
+
+#ifndef TIMER_IRQ
+#define TIMER_IRQ 27
+#endif
--
2.12.3