| From 7d0ff64bb221d198ac545bac7eabc4002714d362 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 17 Jun 2015 10:38:53 +0200 |
| Subject: [PATCH 332/337] staging: board: kzm9d: Translate hwirq numbers to |
| virq numbers |
| |
| As of commit 9a1091ef0017c40a ("irqchip: gic: Support hierarchy irq |
| domain."), GIC IRQ numbers are virtual, breaking hardcoded hardware IRQ |
| numbers in platform device resources. |
| |
| Translate the hardware IRQ numbers to virtual IRQ numbers to fix this. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit a85890883e18d9b1ab6e500584ee5a4db7d1e39f) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/staging/board/kzm9d.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/staging/board/kzm9d.c b/drivers/staging/board/kzm9d.c |
| index 533f3026e17a..8d1eb09bc66e 100644 |
| --- a/drivers/staging/board/kzm9d.c |
| +++ b/drivers/staging/board/kzm9d.c |
| @@ -4,16 +4,22 @@ |
| #include <linux/platform_device.h> |
| #include "board.h" |
| |
| -static const struct resource usbs1_res[] __initconst = { |
| +static struct resource usbs1_res[] __initdata = { |
| DEFINE_RES_MEM(0xe2800000, 0x2000), |
| DEFINE_RES_IRQ(159), |
| }; |
| |
| static void __init kzm9d_init(void) |
| { |
| - if (!board_staging_dt_node_available(usbs1_res, ARRAY_SIZE(usbs1_res))) |
| + board_staging_gic_setup_xlate("arm,cortex-a9-gic", 32); |
| + |
| + if (!board_staging_dt_node_available(usbs1_res, |
| + ARRAY_SIZE(usbs1_res))) { |
| + board_staging_gic_fixup_resources(usbs1_res, |
| + ARRAY_SIZE(usbs1_res)); |
| platform_device_register_simple("emxx_udc", -1, usbs1_res, |
| ARRAY_SIZE(usbs1_res)); |
| + } |
| } |
| |
| board_staging("renesas,kzm9d", kzm9d_init); |
| -- |
| 2.6.2 |
| |
