From 7e195e66c751523d7f2bcf0b45f7d6823d87ca97 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 28 Sep 2017 09:29:38 +0200
Subject: bsp/imx: Add imx_get_irq_of_node()

Update #3090.
---
 c/src/lib/libbsp/arm/imx/console/console-config.c |  7 +-----
 c/src/lib/libbsp/arm/imx/include/bsp.h            |  6 +++++
 c/src/lib/libbsp/arm/imx/startup/bspstart.c       | 30 +++++++++++++++++------
 c/src/lib/libbsp/shared/include/fatal.h           |  3 +--
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/c/src/lib/libbsp/arm/imx/console/console-config.c b/c/src/lib/libbsp/arm/imx/console/console-config.c
index 4c089a39f8..cdb4d12fae 100644
--- a/c/src/lib/libbsp/arm/imx/console/console-config.c
+++ b/c/src/lib/libbsp/arm/imx/console/console-config.c
@@ -84,12 +84,7 @@ static void imx_uart_init_context(
   }
 
 #ifdef CONSOLE_USE_INTERRUPTS
-  val = fdt_getprop(fdt, node, "interrupts", &len);
-  if (val != NULL && len >= 8) {
-    uint32_t cpu_val[2];
-    cpu_val[1] = fdt32_to_cpu(val[1]);
-    ctx->irq = bsp_fdt_map_intr(cpu_val, 2);
-  }
+  ctx->irq = imx_get_irq_of_node(fdt, node, 0);
 #endif
 }
 
diff --git a/c/src/lib/libbsp/arm/imx/include/bsp.h b/c/src/lib/libbsp/arm/imx/include/bsp.h
index d0d9dc74b9..3bde27547c 100644
--- a/c/src/lib/libbsp/arm/imx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/imx/include/bsp.h
@@ -41,6 +41,12 @@ extern "C" {
 
 void arm_generic_timer_get_config(uint32_t *frequency, uint32_t *irq);
 
+rtems_vector_number imx_get_irq_of_node(
+  const void *fdt,
+  int node,
+  size_t index
+);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstart.c b/c/src/lib/libbsp/arm/imx/startup/bspstart.c
index f715726fb0..167dc9c8d5 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/imx/startup/bspstart.c
@@ -21,9 +21,28 @@
 
 #include <libfdt.h>
 
+#define MAGIC_IRQ_OFFSET 32
+
+rtems_vector_number imx_get_irq_of_node(
+  const void *fdt,
+  int node,
+  size_t index
+)
+{
+  int len;
+  const uint32_t *val;
+
+  val = fdt_getprop(fdt, node, "interrupts", &len);
+  if (val == NULL || len < (int) ((index + 1) * 12)) {
+    return UINT32_MAX;
+  }
+
+  return fdt32_to_cpu(val[index * 3 + 1]) + MAGIC_IRQ_OFFSET;
+}
+
 uint32_t bsp_fdt_map_intr(const uint32_t *intr, size_t icells)
 {
-  return intr[1] + 32;
+  return intr[1] + MAGIC_IRQ_OFFSET;
 }
 
 void arm_generic_timer_get_config(
@@ -46,13 +65,8 @@ void arm_generic_timer_get_config(
     bsp_fatal(IMX_FATAL_GENERIC_TIMER_FREQUENCY);
   }
 
-  val = fdt_getprop(fdt, node, "interrupts", &len);
-  if (val != NULL && len >= 8) {
-    /* FIXME: Figure out how Linux gets a proper IRQ number */
-    *irq = 16 + fdt32_to_cpu(val[1]);
-  } else {
-    bsp_fatal(IMX_FATAL_GENERIC_TIMER_IRQ);
-  }
+  /* FIXME: Figure out how Linux gets a proper IRQ number */
+  *irq = imx_get_irq_of_node(fdt, node, 0) - 16;
 }
 
 void bsp_start(void)
diff --git a/c/src/lib/libbsp/shared/include/fatal.h b/c/src/lib/libbsp/shared/include/fatal.h
index cc303fa1f5..ca2e39aba8 100644
--- a/c/src/lib/libbsp/shared/include/fatal.h
+++ b/c/src/lib/libbsp/shared/include/fatal.h
@@ -137,8 +137,7 @@ typedef enum {
   ATSAM_FATAL_PIO_CONFIGURE_IT,
 
   /* i.MX fatal codes */
-  IMX_FATAL_GENERIC_TIMER_FREQUENCY = BSP_FATAL_CODE_BLOCK(12),
-  IMX_FATAL_GENERIC_TIMER_IRQ
+  IMX_FATAL_GENERIC_TIMER_FREQUENCY = BSP_FATAL_CODE_BLOCK(12)
 } bsp_fatal_code;
 
 RTEMS_NO_RETURN static inline void
-- 
cgit v1.2.3