Commit 6c0274cb authored Aug 22, 2012 by Kuninori Morimoto Committed by Rafael J. Wysocki Aug 22, 2012

ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_desc



sh73a0 :: intca_irq_pins_desc irq table had conflict
from irq 552 to irq 557 before.
But the second controller was simply trampling the
first one by way of the -EEXIST case from irq_alloc_desc_at().

But now, we have irqdomain support from
1d6a21b0
(sh: intc: initial irqdomain support)

The irqdomain code has simply tightened down the sanity checks and
error path. So, sh73a0 CPU board got some WARNING when booting now.
This patch fixup RELOC_BASE to solve this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

parent d9875690

arch/arm/mach-shmobile/intc-sh73a0.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -259,9 +259,9 @@ static int sh73a0_set_wake(struct irq_data *data, unsigned int on)
	return 0; /* always allow wakeup */		return 0; /* always allow wakeup */
	}		}

	#define RELOC_BASE 0x1000		#define RELOC_BASE 0x1200

	/* INTCA IRQ pins at INTCS + 0x1000 to make space for GIC+INTC handling */		/* INTCA IRQ pins at INTCS + RELOC_BASE to make space for GIC+INTC handling */
	#define INTCS_VECT_RELOC(n, vect) INTCS_VECT((n), (vect) + RELOC_BASE)		#define INTCS_VECT_RELOC(n, vect) INTCS_VECT((n), (vect) + RELOC_BASE)

	INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,		INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000,