[POWERPC] Use mpc8641hpcn PIC base address from dev tree.
After going through the trouble of setting up the PIC base address in the pic@40000 device tree node, use it instead of the obsolete hard-coded value. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
5dc599c206
commit
c85c41ad73
|
@ -68,37 +68,36 @@ mpc86xx_hpcn_init_irq(void)
|
||||||
{
|
{
|
||||||
struct mpic *mpic1;
|
struct mpic *mpic1;
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
phys_addr_t openpic_paddr;
|
struct resource res;
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
struct device_node *cascade_node = NULL;
|
struct device_node *cascade_node = NULL;
|
||||||
int cascade_irq;
|
int cascade_irq;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Determine PIC address. */
|
||||||
np = of_find_node_by_type(NULL, "open-pic");
|
np = of_find_node_by_type(NULL, "open-pic");
|
||||||
if (np == NULL)
|
if (np == NULL)
|
||||||
return;
|
return;
|
||||||
|
of_address_to_resource(np, 0, &res);
|
||||||
/* Determine the Physical Address of the OpenPIC regs */
|
|
||||||
openpic_paddr = get_immrbase() + MPC86xx_OPENPIC_OFFSET;
|
|
||||||
|
|
||||||
/* Alloc mpic structure and per isu has 16 INT entries. */
|
/* Alloc mpic structure and per isu has 16 INT entries. */
|
||||||
mpic1 = mpic_alloc(np, openpic_paddr,
|
mpic1 = mpic_alloc(np, res.start,
|
||||||
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
|
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
|
||||||
16, NR_IRQS - 4,
|
16, NR_IRQS - 4,
|
||||||
" MPIC ");
|
" MPIC ");
|
||||||
BUG_ON(mpic1 == NULL);
|
BUG_ON(mpic1 == NULL);
|
||||||
|
|
||||||
mpic_assign_isu(mpic1, 0, openpic_paddr + 0x10000);
|
mpic_assign_isu(mpic1, 0, res.start + 0x10000);
|
||||||
|
|
||||||
/* 48 Internal Interrupts */
|
/* 48 Internal Interrupts */
|
||||||
mpic_assign_isu(mpic1, 1, openpic_paddr + 0x10200);
|
mpic_assign_isu(mpic1, 1, res.start + 0x10200);
|
||||||
mpic_assign_isu(mpic1, 2, openpic_paddr + 0x10400);
|
mpic_assign_isu(mpic1, 2, res.start + 0x10400);
|
||||||
mpic_assign_isu(mpic1, 3, openpic_paddr + 0x10600);
|
mpic_assign_isu(mpic1, 3, res.start + 0x10600);
|
||||||
|
|
||||||
/* 16 External interrupts
|
/* 16 External interrupts
|
||||||
* Moving them from [0 - 15] to [64 - 79]
|
* Moving them from [0 - 15] to [64 - 79]
|
||||||
*/
|
*/
|
||||||
mpic_assign_isu(mpic1, 4, openpic_paddr + 0x10000);
|
mpic_assign_isu(mpic1, 4, res.start + 0x10000);
|
||||||
|
|
||||||
mpic_init(mpic1);
|
mpic_init(mpic1);
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#define MCM_PORT_CONFIG_OFFSET 0x1010
|
#define MCM_PORT_CONFIG_OFFSET 0x1010
|
||||||
|
|
||||||
/* Offset from CCSRBAR */
|
/* Offset from CCSRBAR */
|
||||||
#define MPC86xx_OPENPIC_OFFSET (0x40000)
|
|
||||||
#define MPC86xx_MCM_OFFSET (0x00000)
|
#define MPC86xx_MCM_OFFSET (0x00000)
|
||||||
#define MPC86xx_MCM_SIZE (0x02000)
|
#define MPC86xx_MCM_SIZE (0x02000)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue