[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>

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 813eb5811eb454b31b9c785131a57afbb66a63cf..0b1b52168bb705204dc91dc04c3a9c2246eaf694 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -68,37 +68,36 @@ mpc86xx_hpcn_init_irq(void)
 {
        struct mpic *mpic1;
        struct device_node *np;
-       phys_addr_t openpic_paddr;
+       struct resource res;
 #ifdef CONFIG_PCI
        struct device_node *cascade_node = NULL;
        int cascade_irq;
 #endif
 
+       /* Determine PIC address. */
        np = of_find_node_by_type(NULL, "open-pic");
        if (np == NULL)
                return;
-
-       /* Determine the Physical Address of the OpenPIC regs */
-       openpic_paddr = get_immrbase() + MPC86xx_OPENPIC_OFFSET;
+       of_address_to_resource(np, 0, &res);
 
        /* 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,
                        16, NR_IRQS - 4,
                        " MPIC     ");
        BUG_ON(mpic1 == NULL);
 
-       mpic_assign_isu(mpic1, 0, openpic_paddr + 0x10000);
+       mpic_assign_isu(mpic1, 0, res.start + 0x10000);
 
        /* 48 Internal Interrupts */
-       mpic_assign_isu(mpic1, 1, openpic_paddr + 0x10200);
-       mpic_assign_isu(mpic1, 2, openpic_paddr + 0x10400);
-       mpic_assign_isu(mpic1, 3, openpic_paddr + 0x10600);
+       mpic_assign_isu(mpic1, 1, res.start + 0x10200);
+       mpic_assign_isu(mpic1, 2, res.start + 0x10400);
+       mpic_assign_isu(mpic1, 3, res.start + 0x10600);
 
        /* 16 External interrupts
         * 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);
 

diff --git a/include/asm-powerpc/mpc86xx.h b/include/asm-powerpc/mpc86xx.h
index 2d6ad859df7f58148f2e55de8d557a0bfe4ddc6f..b85df45b1a84dcbfc37b93ee74365eaa3fcc8b31 100644 (file)
--- a/include/asm-powerpc/mpc86xx.h
+++ b/include/asm-powerpc/mpc86xx.h
@@ -31,7 +31,6 @@
 #define MCM_PORT_CONFIG_OFFSET 0x1010
 
 /* Offset from CCSRBAR */
-#define MPC86xx_OPENPIC_OFFSET (0x40000)
 #define MPC86xx_MCM_OFFSET      (0x00000)
 #define MPC86xx_MCM_SIZE        (0x02000)